1 files changed, 10 insertions, 2 deletions
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index 4a4b037d0b1..53a90cdb26f 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -37,12 +37,20 @@ RSpec.configure do |config|
     $capybara_server_already_started = true
   end
 
-  config.after(:each, :js) do
+  config.before(:example, :js) do
+    allow(Gitlab::Application.routes).to receive(:default_url_options).and_return(
+      host: Capybara.current_session.server.host,
+      port: Capybara.current_session.server.port,
+      protocol: 'http')
+  end
+
+  config.after(:example, :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