diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-06-13 16:53:16 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-06-14 12:48:45 +0100 |
| commit | fec8bb5100e1a7c61dacb6095379fce0ac196210 (patch) | |
| tree | 6d940b48d452b9c9a032a12556b24f6be4ea437e | |
| parent | a331fd3a5a08217a495df9e72fd417738985b842 (diff) | |
| download | gitlab-ce-11-0-stable-prepare-rc12.tar.gz | |
Merge branch 'qa-clear-session-only-if-block-given-and-no-errors' into 'master'11-0-stable-prepare-rc12
QA: Only clear the sessions if there's no error with a block
Closes gitlab-qa#197
See merge request gitlab-org/gitlab-ce!19751
| -rw-r--r-- | qa/qa/runtime/browser.rb | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/qa/qa/runtime/browser.rb b/qa/qa/runtime/browser.rb index a12d95683af..ecd273c6db8 100644 --- a/qa/qa/runtime/browser.rb +++ b/qa/qa/runtime/browser.rb @@ -102,19 +102,7 @@ module QA def perform(&block) visit(url) - yield if block_given? - rescue - raise if block.nil? - - # RSpec examples will take care of screenshots on their own - # - unless block.binding.receiver.is_a?(RSpec::Core::ExampleGroup) - screenshot_and_save_page - end - - raise - ensure - clear! if block_given? + yield.tap { clear! } if block_given? end ## |