Commit fd7a8b30 authored by Dan Davison's avatar Dan Davison

Merge branch 'ml-avoid-nested-examples' into 'master'

Set screenshot in after hook instead of around hook

See merge request gitlab-org/gitlab!28172
parents 85f4e696 6c44ffc8
...@@ -51,9 +51,7 @@ module QA ...@@ -51,9 +51,7 @@ module QA
metadata[:type] = :feature metadata[:type] = :feature
end end
config.around(:each) do |example| config.append_after(:each) do |example|
example.run
if example.metadata[:screenshot] if example.metadata[:screenshot]
screenshot = example.metadata[:screenshot][:image] || example.metadata[:screenshot][:html] screenshot = example.metadata[:screenshot][:image] || example.metadata[:screenshot][:html]
example.metadata[:stdout] = %{[[ATTACHMENT|#{screenshot}]]} example.metadata[:stdout] = %{[[ATTACHMENT|#{screenshot}]]}
......
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