summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Knox <psimyn@gmail.com>2017-02-22 13:48:22 +1100
committerSimon Knox <psimyn@gmail.com>2017-02-22 13:54:17 +1100
commit6eb162ac184a09f3bc8f1939f3d4c63439eb5b7f (patch)
tree9ef5e65692fad51f72caf204a1e2cce1f0601872
parent459a97d46812fecc59c973bad356935422c7f60e (diff)
downloadgitlab-ce-transient-spec-failure.tar.gz
fix transient test failure - wait for dropdown contents to be visible before clickingtransient-spec-failure
-rw-r--r--spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb b/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb
index f2f8f11ab28..3f6d2640abb 100644
--- a/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb
+++ b/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb
@@ -32,7 +32,7 @@ feature 'Merge immediately', :feature, :js do
page.within '.mr-widget-body' do
find('.dropdown-toggle').click
- click_link 'Merge Immediately'
+ find('a', text: 'Merge Immediately').click
expect(find('.js-merge-button')).to have_content('Merge in progress')
end