Leave it up to the driver to make sure that resetting is synchronous

I think that this was a futile attempt to resolve problems with restting sessions which should be much better handled by the addition of `wait_for_pending_requests`.

Closes #1670
This commit is contained in:
Jonas Nicklas 2016-03-30 20:27:29 +02:00 committed by Thomas Walpole
parent 4e23b61041
commit 8d5a7e18ad
4 changed files with 5 additions and 18 deletions

View File

@ -91,8 +91,8 @@ class Capybara::Driver::Base
def no_such_window_error
raise Capybara::NotSupportedByDriverError, 'Capybara::Driver::Base#no_such_window_error'
end
##
#
# Execute the block, and then accept the modal opened.
@ -134,8 +134,4 @@ class Capybara::Driver::Base
def needs_server?
false
end
def browser_initialized?
true
end
end

View File

@ -66,11 +66,11 @@ class Capybara::RackTest::Driver < Capybara::Driver::Base
def find_xpath(selector)
browser.find(:xpath, selector)
end
def find_css(selector)
browser.find(:css,selector)
end
def html
browser.html
end
@ -78,7 +78,7 @@ class Capybara::RackTest::Driver < Capybara::Driver::Base
def dom
browser.dom
end
def title
browser.title
end
@ -87,10 +87,6 @@ class Capybara::RackTest::Driver < Capybara::Driver::Base
@browser = nil
end
def browser_initialized?
!@browser.nil?
end
def get(*args, &block); browser.get(*args, &block); end
def post(*args, &block); browser.post(*args, &block); end
def put(*args, &block); browser.put(*args, &block); end

View File

@ -248,10 +248,6 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
Selenium::WebDriver::Error::NoSuchWindowError
end
def browser_initialized?
!@browser.nil?
end
private
def within_given_window(handle)

View File

@ -107,7 +107,6 @@ module Capybara
def reset!
if @touched
driver.reset!
assert_no_selector :xpath, "/html/body/*" if driver.browser_initialized?
@touched = false
end
@server.wait_for_pending_requests if @server