Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Pass through options to drivers, final puzzle piece!
  • Loading branch information
jnicklas committed Sep 15, 2010
1 parent be6aaa9 commit 4c6c5cd
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Gemfile.lock
Expand Up @@ -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)
Expand Down
5 changes: 3 additions & 2 deletions lib/capybara/driver/celerity_driver.rb
Expand Up @@ -84,10 +84,11 @@ def select_node

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
Expand Down
2 changes: 1 addition & 1 deletion lib/capybara/driver/culerity_driver.rb
Expand Up @@ -14,7 +14,7 @@ def self.server

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
Expand Down
4 changes: 2 additions & 2 deletions lib/capybara/driver/selenium_driver.rb
Expand Up @@ -61,7 +61,7 @@ def tag_name
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
Expand All @@ -83,7 +83,7 @@ def type

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
Expand Down

0 comments on commit 4c6c5cd

Please sign in to comment.