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
This commit is contained in:
commit
cc1b03545c
|
|
@ -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
|
||||
|
||||
##
|
||||
|
|
|
|||
Loading…
Reference in New Issue