summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-06-22 03:39:40 +0000
committerClement Ho <ClemMakesApps@gmail.com>2017-06-21 22:57:15 -0500
commit261e4fe8d8e6c01d0278a9e3770fe78d75336a07 (patch)
treeeca67dfb3bff2e148f579f7bac69a268b476ddd6
parent99ea71885eeff6b10574bc14f49f272c779c542f (diff)
downloadgitlab-ce-261e4fe8d8e6c01d0278a9e3770fe78d75336a07.tar.gz
Merge branch 'dm-restore-capybara-screenshot' into 'master'
Don't reset the session when the example failed to fix capybara-screenshot See merge request !12370
-rw-r--r--spec/support/capybara.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index 4aa81a03558..3e5d6cf1364 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -36,12 +36,13 @@ RSpec.configure do |config|
$capybara_server_already_started = true
end
- config.after(:each, :js) do
+ config.after(:each, :js) do |example|
# 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!
+ # We don't reset the session when the example failed, because we need capybara-screenshot to have access to it.
+ Capybara.reset_sessions! unless example.exception
block_and_wait_for_requests_complete
end
end