diff options
author | Robert Speicher <robert@gitlab.com> | 2017-06-16 17:38:22 +0000 |
---|---|---|
committer | kushalpandya <kushal@gitlab.com> | 2017-06-17 12:39:05 +0530 |
commit | 6309253f71127216f7c6a69986266f2db50d7598 (patch) | |
tree | 6d321eaeccd4fbc6c4790fd28deb7fb4d9723de6 /spec | |
parent | 6956535d8854fbe795db9938516b8b485bb6df06 (diff) | |
download | gitlab-ce-6309253f71127216f7c6a69986266f2db50d7598.tar.gz |
Merge branch '33779-reset-session-before-blocking-requests' into 'master'
Call Capybara.reset_sessions! before block_and_wait_for_requests_complete
Closes #33779
See merge request !12224
Diffstat (limited to 'spec')
-rw-r--r-- | spec/support/capybara.rb | 9 | ||||
-rw-r--r-- | spec/support/wait_for_requests.rb | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb index c34e76fa72f..4aa81a03558 100644 --- a/spec/support/capybara.rb +++ b/spec/support/capybara.rb @@ -35,4 +35,13 @@ RSpec.configure do |config| TestEnv.eager_load_driver_server $capybara_server_already_started = true end + + config.after(:each, :js) do + # capybara/rspec already calls Capybara.reset_sessions! in an `after` hook, + # but `block_and_wait_for_requests_complete` is called before it so by + # calling it explicitely here, we prevent any new requests from being fired + # See https://github.com/teamcapybara/capybara/blob/ffb41cfad620de1961bb49b1562a9fa9b28c0903/lib/capybara/rspec.rb#L20-L25 + Capybara.reset_sessions! + block_and_wait_for_requests_complete + end end diff --git a/spec/support/wait_for_requests.rb b/spec/support/wait_for_requests.rb index 1cbe609c0e0..b5c3c0f55b8 100644 --- a/spec/support/wait_for_requests.rb +++ b/spec/support/wait_for_requests.rb @@ -53,9 +53,3 @@ module WaitForRequests Capybara.current_driver == Capybara.javascript_driver end end - -RSpec.configure do |config| - config.after(:each, :js) do - block_and_wait_for_requests_complete - end -end |