summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-05-03 13:11:37 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-05-03 13:11:37 +0000
commit1d2b2bd989b270412ef4a23b260d5b9f451214ea (patch)
treea5ef111b2bcfefb906c0da5a0f43c57ac13a3950
parentcac04fbd777ff992bbd92e9ae3cded01d45b07d0 (diff)
parentf327bf01e52a7936c3b7fa8aa69eb28bc455f1cd (diff)
downloadgitlab-ce-1d2b2bd989b270412ef4a23b260d5b9f451214ea.tar.gz
Merge branch 'fix-create_new_mr_spec-dropdown-transient-failure' into 'master'
find and match first dropdown before clicking See merge request !11060
-rw-r--r--spec/features/merge_requests/create_new_mr_spec.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/spec/features/merge_requests/create_new_mr_spec.rb b/spec/features/merge_requests/create_new_mr_spec.rb
index f0fec625108..f1b3e7f158c 100644
--- a/spec/features/merge_requests/create_new_mr_spec.rb
+++ b/spec/features/merge_requests/create_new_mr_spec.rb
@@ -20,7 +20,6 @@ feature 'Create New Merge Request', feature: true, js: true do
expect(page).to have_content('Target branch')
first('.js-source-branch').click
- first('.dropdown-source-branch .dropdown-content')
find('.dropdown-source-branch .dropdown-content a', match: :first).click
expect(page).to have_content "b83d6e3"
@@ -35,8 +34,7 @@ feature 'Create New Merge Request', feature: true, js: true do
expect(page).to have_content('Target branch')
first('.js-target-branch').click
- first('.dropdown-target-branch .dropdown-content')
- first('.dropdown-target-branch .dropdown-content a', text: 'v1.1.0').click
+ find('.dropdown-target-branch .dropdown-content a', text: 'v1.1.0', match: :first).click
expect(page).to have_content "b83d6e3"
end