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:
parent
4e23b61041
commit
8d5a7e18ad
|
@ -91,8 +91,8 @@ class Capybara::Driver::Base
|
||||||
def no_such_window_error
|
def no_such_window_error
|
||||||
raise Capybara::NotSupportedByDriverError, 'Capybara::Driver::Base#no_such_window_error'
|
raise Capybara::NotSupportedByDriverError, 'Capybara::Driver::Base#no_such_window_error'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
##
|
##
|
||||||
#
|
#
|
||||||
# Execute the block, and then accept the modal opened.
|
# Execute the block, and then accept the modal opened.
|
||||||
|
@ -134,8 +134,4 @@ class Capybara::Driver::Base
|
||||||
def needs_server?
|
def needs_server?
|
||||||
false
|
false
|
||||||
end
|
end
|
||||||
|
|
||||||
def browser_initialized?
|
|
||||||
true
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -66,11 +66,11 @@ class Capybara::RackTest::Driver < Capybara::Driver::Base
|
||||||
def find_xpath(selector)
|
def find_xpath(selector)
|
||||||
browser.find(:xpath, selector)
|
browser.find(:xpath, selector)
|
||||||
end
|
end
|
||||||
|
|
||||||
def find_css(selector)
|
def find_css(selector)
|
||||||
browser.find(:css,selector)
|
browser.find(:css,selector)
|
||||||
end
|
end
|
||||||
|
|
||||||
def html
|
def html
|
||||||
browser.html
|
browser.html
|
||||||
end
|
end
|
||||||
|
@ -78,7 +78,7 @@ class Capybara::RackTest::Driver < Capybara::Driver::Base
|
||||||
def dom
|
def dom
|
||||||
browser.dom
|
browser.dom
|
||||||
end
|
end
|
||||||
|
|
||||||
def title
|
def title
|
||||||
browser.title
|
browser.title
|
||||||
end
|
end
|
||||||
|
@ -87,10 +87,6 @@ class Capybara::RackTest::Driver < Capybara::Driver::Base
|
||||||
@browser = nil
|
@browser = nil
|
||||||
end
|
end
|
||||||
|
|
||||||
def browser_initialized?
|
|
||||||
!@browser.nil?
|
|
||||||
end
|
|
||||||
|
|
||||||
def get(*args, &block); browser.get(*args, &block); end
|
def get(*args, &block); browser.get(*args, &block); end
|
||||||
def post(*args, &block); browser.post(*args, &block); end
|
def post(*args, &block); browser.post(*args, &block); end
|
||||||
def put(*args, &block); browser.put(*args, &block); end
|
def put(*args, &block); browser.put(*args, &block); end
|
||||||
|
|
|
@ -248,10 +248,6 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
|
||||||
Selenium::WebDriver::Error::NoSuchWindowError
|
Selenium::WebDriver::Error::NoSuchWindowError
|
||||||
end
|
end
|
||||||
|
|
||||||
def browser_initialized?
|
|
||||||
!@browser.nil?
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def within_given_window(handle)
|
def within_given_window(handle)
|
||||||
|
|
|
@ -107,7 +107,6 @@ module Capybara
|
||||||
def reset!
|
def reset!
|
||||||
if @touched
|
if @touched
|
||||||
driver.reset!
|
driver.reset!
|
||||||
assert_no_selector :xpath, "/html/body/*" if driver.browser_initialized?
|
|
||||||
@touched = false
|
@touched = false
|
||||||
end
|
end
|
||||||
@server.wait_for_pending_requests if @server
|
@server.wait_for_pending_requests if @server
|
||||||
|
|
Loading…
Reference in New Issue