Permalink
Browse files

Merge pull request #599 from kou/suppress-warnings

Suppress warnings
  • Loading branch information...
2 parents 2a9a968 + ab36126 commit 0fa83acbe8dee139e0dd4066ad371bf5bba17460 @jnicklas committed Jan 8, 2012
Showing with 8 additions and 2 deletions.
  1. +3 −0 lib/capybara.rb
  2. +0 −1 lib/capybara/rack_test/browser.rb
  3. +2 −0 lib/capybara/selector.rb
  4. +3 −1 lib/capybara/selenium/driver.rb
View
3 lib/capybara.rb
@@ -298,6 +298,9 @@ def session_pool
end
end
+ self.default_driver = nil
+ self.current_driver = nil
+
autoload :DSL, 'capybara/dsl'
autoload :Server, 'capybara/server'
autoload :Session, 'capybara/session'
View
1 lib/capybara/rack_test/browser.rb
@@ -43,7 +43,6 @@ def follow_redirects!
def process(method, path, attributes = {})
new_uri = URI.parse(path)
- current_uri = URI.parse(current_url)
method.downcase! unless method.is_a? Symbol
if new_uri.host
View
2 lib/capybara/selector.rb
@@ -20,6 +20,8 @@ def remove(name)
def initialize(name, &block)
@name = name
@custom_filters = {}
+ @match = nil
+ @failure_message = nil
instance_eval(&block)
end
View
4 lib/capybara/selenium/driver.rb
@@ -27,6 +27,8 @@ def browser
def initialize(app, options={})
@app = app
+ @browser = nil
+ @exit_status = nil
@options = DEFAULT_OPTIONS.merge(options)
@rack_server = Capybara::Server.new(@app)
@rack_server.boot if Capybara.run_server
@@ -79,7 +81,7 @@ def reset!
if @browser
begin
@browser.manage.delete_all_cookies
- rescue Selenium::WebDriver::Error::UnhandledError => e
+ rescue Selenium::WebDriver::Error::UnhandledError
# delete_all_cookies fails when we've previously gone
# to about:blank, so we rescue this error and do nothing
# instead.

0 comments on commit 0fa83ac

Please sign in to comment.