diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 15:08:48 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 15:08:48 +0000 |
commit | 180cd023a11c0eb413ad0de124d9758ea25672bd (patch) | |
tree | 63d77be00a22dc637daa0b6d5b644e230f5f4890 /qa | |
parent | be3e24ea3c9f497efde85900df298ce9bc42fce8 (diff) | |
download | gitlab-ce-180cd023a11c0eb413ad0de124d9758ea25672bd.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
-rw-r--r-- | qa/qa/runtime/browser.rb | 13 |
1 files changed, 11 insertions, 2 deletions
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 |