From 180cd023a11c0eb413ad0de124d9758ea25672bd Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 22 Jan 2020 15:08:48 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 qa/qa/runtime/browser.rb | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'qa')

diff --git a/qa/qa/runtime/browser.rb b/qa/qa/runtime/browser.rb
index 340f6dc0356..ec78759f6c8 100644
--- a/qa/qa/runtime/browser.rb
+++ b/qa/qa/runtime/browser.rb
@@ -66,14 +66,23 @@ module QA
             metadata[:type] = :feature
           end
 
-          config.before do
+          config.before(:suite) do
             unless browser.rspec_configured
               browser.rspec_configured = true
 
               ##
               # Perform before hooks, which are different for CE and EE
               #
-              Runtime::Release.perform_before_hooks
+              begin
+                Runtime::Release.perform_before_hooks
+              rescue
+                saved = Capybara::Screenshot.screenshot_and_save_page
+
+                QA::Runtime::Logger.error("Screenshot: #{saved[:image]}") if saved&.key?(:image)
+                QA::Runtime::Logger.error("HTML capture: #{saved[:html]}") if saved&.key?(:html)
+
+                raise
+              end
             end
           end
         end
-- 
cgit v1.2.1