mirror of
https://github.com/teampoltergeist/poltergeist.git
synced 2022-11-09 12:05:00 -05:00
Rename raise_errors -> js_errors
Resolves an ambiguity
This commit is contained in:
parent
fd8441ca69
commit
7d6cde7f42
4 changed files with 10 additions and 10 deletions
|
@ -158,7 +158,7 @@ end
|
|||
when communicating with PhantomJS. `nil` means wait forever. Default
|
||||
is 30.
|
||||
* `:inspector` (Boolean, String) - See 'Remote Debugging', above.
|
||||
* `:raise_errors` (Boolean) - When false, Javascript errors do not get re-raised in Ruby.
|
||||
* `:js_errors` (Boolean) - When false, Javascript errors do not get re-raised in Ruby.
|
||||
|
||||
## Bugs ##
|
||||
|
||||
|
@ -186,7 +186,7 @@ makes debugging easier). Running `rake autocompile` will watch the
|
|||
|
||||
#### Features ####
|
||||
|
||||
* Added an option ":raise_errors", allowing poltergeist to continue
|
||||
* Added an option ":js_errors", allowing poltergeist to continue
|
||||
running after JS errors. (John Griffin & Tom Stuart) [Issue #62] [Issue #69]
|
||||
|
||||
### 0.6.0 ###
|
||||
|
|
|
@ -2,13 +2,13 @@ require 'multi_json'
|
|||
|
||||
module Capybara::Poltergeist
|
||||
class Browser
|
||||
attr_reader :server, :client, :logger, :raise_errors
|
||||
attr_reader :server, :client, :logger, :js_errors
|
||||
|
||||
def initialize(server, client, logger = nil, raise_errors = true)
|
||||
def initialize(server, client, logger = nil, js_errors = true)
|
||||
@server = server
|
||||
@client = client
|
||||
@logger = logger
|
||||
@raise_errors = raise_errors
|
||||
@js_errors = js_errors
|
||||
end
|
||||
|
||||
def restart
|
||||
|
@ -125,7 +125,7 @@ module Capybara::Poltergeist
|
|||
if json['error']
|
||||
if json['error']['name'] == 'Poltergeist.JavascriptError'
|
||||
error = JavascriptError.new(json['error'])
|
||||
if raise_errors
|
||||
if js_errors
|
||||
raise error
|
||||
else
|
||||
log error
|
||||
|
|
|
@ -17,7 +17,7 @@ module Capybara::Poltergeist
|
|||
end
|
||||
|
||||
def browser
|
||||
@browser ||= Browser.new(server, client, logger, raise_errors)
|
||||
@browser ||= Browser.new(server, client, logger, js_errors)
|
||||
end
|
||||
|
||||
def inspector
|
||||
|
@ -58,8 +58,8 @@ module Capybara::Poltergeist
|
|||
options[:logger] || (options[:debug] && STDERR)
|
||||
end
|
||||
|
||||
def raise_errors
|
||||
options.fetch(:raise_errors, true)
|
||||
def js_errors
|
||||
options.fetch(:js_errors, true)
|
||||
end
|
||||
|
||||
def visit(path)
|
||||
|
|
|
@ -162,7 +162,7 @@ module Capybara::Poltergeist
|
|||
end
|
||||
|
||||
it "doesn't propagate a Javascript error to ruby if error raising disabled" do
|
||||
driver = Capybara::Poltergeist::Driver.new(nil, :raise_errors => false)
|
||||
driver = Capybara::Poltergeist::Driver.new(nil, :js_errors => false)
|
||||
driver.execute_script "setTimeout(function() { omg }, 0)"
|
||||
sleep 0.01
|
||||
expect { driver.execute_script "" }.to_not raise_error(JavascriptError)
|
||||
|
|
Loading…
Add table
Reference in a new issue