mirror of
https://github.com/teamcapybara/capybara.git
synced 2022-11-09 12:08:07 -05:00
Pass through options to drivers, final puzzle piece!
This commit is contained in:
parent
be6aaa9f33
commit
4c6c5cd4fa
4 changed files with 7 additions and 6 deletions
|
@ -25,9 +25,9 @@ GEM
|
|||
configuration (>= 0.0.5)
|
||||
rake (>= 0.8.1)
|
||||
mime-types (1.16)
|
||||
nokogiri (1.4.2)
|
||||
nokogiri (1.4.2-java)
|
||||
weakling (>= 0.0.3)
|
||||
nokogiri (1.4.2)
|
||||
rack (1.2.1)
|
||||
rack-test (0.5.4)
|
||||
rack (>= 1.0)
|
||||
|
|
|
@ -84,10 +84,11 @@ class Capybara::Driver::Celerity < Capybara::Driver::Base
|
|||
|
||||
end
|
||||
|
||||
attr_reader :app, :rack_server
|
||||
attr_reader :app, :rack_server, :options
|
||||
|
||||
def initialize(app)
|
||||
def initialize(app, options={})
|
||||
@app = app
|
||||
@options = options
|
||||
@rack_server = Capybara::Server.new(@app)
|
||||
@rack_server.boot if Capybara.run_server
|
||||
end
|
||||
|
|
|
@ -14,7 +14,7 @@ class Capybara::Driver::Culerity < Capybara::Driver::Celerity
|
|||
|
||||
def browser
|
||||
unless @_browser
|
||||
@_browser = ::Culerity::RemoteBrowserProxy.new self.class.server, {:browser => :firefox, :log_level => :off}
|
||||
@_browser = ::Culerity::RemoteBrowserProxy.new self.class.server, options
|
||||
at_exit do
|
||||
@_browser.close
|
||||
@_browser.exit
|
||||
|
|
|
@ -61,7 +61,7 @@ class Capybara::Driver::Selenium < Capybara::Driver::Base
|
|||
def visible?
|
||||
native.displayed? and native.displayed? != "false"
|
||||
end
|
||||
|
||||
|
||||
def find(locator)
|
||||
native.find_elements(:xpath, locator).map { |n| self.class.new(driver, n) }
|
||||
end
|
||||
|
@ -83,7 +83,7 @@ class Capybara::Driver::Selenium < Capybara::Driver::Base
|
|||
|
||||
def browser
|
||||
unless @browser
|
||||
@browser = Selenium::WebDriver.for(options[:browser] || :firefox)
|
||||
@browser = Selenium::WebDriver.for(options.delete(:browser) || :firefox, options)
|
||||
at_exit do
|
||||
@browser.quit
|
||||
end
|
||||
|
|
Loading…
Add table
Reference in a new issue