diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 09:09:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 09:09:21 +0300 |
| commit | c8df22c555ab707a705e57c4257fd3ed1ce7c3b0 (patch) | |
| tree | 009fb7c1ff12a6192921212cae404b790fd7d66b /spec/support | |
| parent | 9345f69894862e02f3491ea3136c3ed2b23fd5b8 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/capybara.rb | 6 | ||||
| -rw-r--r-- | spec/support/helpers/test_env.rb | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb index 5d8779ec782..90adfb1a2ee 100644 --- a/spec/support/capybara.rb +++ b/spec/support/capybara.rb @@ -126,6 +126,12 @@ RSpec.configure do |config| Capybara.raise_server_errors = false example.run + + if example.metadata[:screenshot] + screenshot = example.metadata[:screenshot][:image] || example.metadata[:screenshot][:html] + example.metadata[:stdout] = %{[[ATTACHMENT|#{screenshot}]]} + end + ensure Capybara.raise_server_errors = true end diff --git a/spec/support/helpers/test_env.rb b/spec/support/helpers/test_env.rb index 613535b6da5..66c2faac2dd 100644 --- a/spec/support/helpers/test_env.rb +++ b/spec/support/helpers/test_env.rb @@ -61,6 +61,11 @@ module TestEnv 'merge-commit-analyze-before' => '1adbdef', 'merge-commit-analyze-side-branch' => '8a99451', 'merge-commit-analyze-after' => '646ece5', + 'snippet/single-file' => '43e4080', + 'snippet/multiple-files' => 'b80faa8', + 'snippet/rename-and-edit-file' => '220a1e4', + 'snippet/edit-file' => 'c2f074f', + 'snippet/no-files' => '671aaa8', '2-mb-file' => 'bf12d25', 'before-create-delete-modify-move' => '845009f', 'between-create-delete-modify-move' => '3f5f443', |