Commit cc1b0354 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'qa-clear-session-only-if-block-given-and-no-errors' into 'master'

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
parents 28504273 11a19e64
...@@ -102,19 +102,7 @@ module QA ...@@ -102,19 +102,7 @@ module QA
def perform(&block) def perform(&block)
visit(url) visit(url)
yield if block_given? yield.tap { clear! } 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?
end end
## ##
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment