kotovalexarian-likes-github
/
teamcapybara--capybara
mirror of https://github.com/teamcapybara/capybara.git
1
0
Fork 0
Code Releases Activity

Pass through options to drivers, final puzzle piece!

This commit is contained in:
Jonas Nicklas 2010-09-15 22:38:38 +02:00
parent be6aaa9f33
commit 4c6c5cd4fa
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.lock
View File

@ -25,9 +25,9 @@ GEM
configuration (>= 0.0.5) configuration (>= 0.0.5)
rake (>= 0.8.1) rake (>= 0.8.1)
mime-types (1.16) mime-types (1.16)
nokogiri (1.4.2)
nokogiri (1.4.2-java) nokogiri (1.4.2-java)
weakling (>= 0.0.3) weakling (>= 0.0.3)
nokogiri (1.4.2)
rack (1.2.1) rack (1.2.1)
rack-test (0.5.4) rack-test (0.5.4)
rack (>= 1.0) rack (>= 1.0)

5
lib/capybara/driver/celerity_driver.rb
View File

@ -84,10 +84,11 @@ class Capybara::Driver::Celerity < Capybara::Driver::Base
end end
attr_reader :app, :rack_server attr_reader :app, :rack_server, :options
def initialize(app) def initialize(app, options={})
@app = app @app = app
@options = options
@rack_server = Capybara::Server.new(@app) @rack_server = Capybara::Server.new(@app)
@rack_server.boot if Capybara.run_server @rack_server.boot if Capybara.run_server
end end

2
lib/capybara/driver/culerity_driver.rb
View File

@ -14,7 +14,7 @@ class Capybara::Driver::Culerity < Capybara::Driver::Celerity
def browser def browser
unless @_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 at_exit do
@_browser.close @_browser.close
@_browser.exit @_browser.exit

4
lib/capybara/driver/selenium_driver.rb
View File

@ -61,7 +61,7 @@ class Capybara::Driver::Selenium < Capybara::Driver::Base
def visible? def visible?
native.displayed? and native.displayed? != "false" native.displayed? and native.displayed? != "false"
end end
def find(locator) def find(locator)
native.find_elements(:xpath, locator).map { |n| self.class.new(driver, n) } native.find_elements(:xpath, locator).map { |n| self.class.new(driver, n) }
end end
@ -83,7 +83,7 @@ class Capybara::Driver::Selenium < Capybara::Driver::Base
def browser def browser
unless @browser unless @browser
@browser = Selenium::WebDriver.for(options[:browser] || :firefox) @browser = Selenium::WebDriver.for(options.delete(:browser) || :firefox, options)
at_exit do at_exit do
@browser.quit @browser.quit
end end