diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-02-18 13:01:04 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-02-18 16:24:03 +0300 |
| commit | 87e312d5481661d2ebe023e2eaf32d4324525676 (patch) | |
| tree | a6189684cb283ca282b19cd17f3f7b9371439484 | |
| parent | 9cb4fc900657d423c0498cfb0a08d54b3838858a (diff) | |
Merge branch 'qa-ml-add-label-selector' into 'master'
Fix failing e2e test: qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb
Closes gitlab-org/quality/staging#38
See merge request gitlab-org/gitlab-ce!25304
(cherry picked from commit 250bde53e22406ebd101a34bfc52dd8886dedba9)
18d5541c Fix failing e2e labels test
| -rw-r--r-- | app/views/shared/empty_states/_priority_labels.html.haml | 2 | ||||
| -rw-r--r-- | qa/qa/page/label/index.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/shared/empty_states/_priority_labels.html.haml b/app/views/shared/empty_states/_priority_labels.html.haml index 555cb4f4af9..bba3475d244 100644 --- a/app/views/shared/empty_states/_priority_labels.html.haml +++ b/app/views/shared/empty_states/_priority_labels.html.haml @@ -1,4 +1,4 @@ .text-center - .svg-content + .svg-content.qa-label-svg = image_tag 'illustrations/priority_labels.svg' %p Star labels to start sorting by priority diff --git a/qa/qa/page/label/index.rb b/qa/qa/page/label/index.rb index f0d323ca3b4..de0cfa9f293 100644 --- a/qa/qa/page/label/index.rb +++ b/qa/qa/page/label/index.rb @@ -14,6 +14,10 @@ module QA element :label_svg end + view 'app/views/shared/empty_states/_priority_labels.html.haml' do + element :label_svg + end + def go_to_new_label # The 'labels.svg' takes a fraction of a second to load after which the "New label" button shifts up a bit # This can cause webdriver to miss the hit so we wait for the svg to load (implicitly with has_element?) |