mirror of
https://github.com/teampoltergeist/poltergeist.git
synced 2022-11-09 12:05:00 -05:00
Tweak john-griffin's work.
* Don't suppress browser errors, only JS errors * Send exception objects to the log to avoid message-splitting pain
This commit is contained in:
parent
1a53f666eb
commit
ee7f3175bf
1 changed files with 7 additions and 11 deletions
|
@ -124,9 +124,14 @@ module Capybara::Poltergeist
|
||||||
|
|
||||||
if json['error']
|
if json['error']
|
||||||
if json['error']['name'] == 'Poltergeist.JavascriptError'
|
if json['error']['name'] == 'Poltergeist.JavascriptError'
|
||||||
error(JavascriptError, json['error'])
|
error = JavascriptError.new(json['error'])
|
||||||
|
if raise_errors
|
||||||
|
raise error
|
||||||
|
else
|
||||||
|
log error
|
||||||
|
end
|
||||||
else
|
else
|
||||||
error(BrowserError, json['error'])
|
raise BrowserError.new(json['error'])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
json['response']
|
json['response']
|
||||||
|
@ -137,15 +142,6 @@ module Capybara::Poltergeist
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def error(klass, message)
|
|
||||||
if raise_errors
|
|
||||||
raise klass.new(message)
|
|
||||||
else
|
|
||||||
log message
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def log(message)
|
def log(message)
|
||||||
logger.puts message if logger
|
logger.puts message if logger
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Reference in a new issue