summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-02-08 17:23:59 +0000
committerPhil Hughes <me@iamphill.com>2017-02-08 17:23:59 +0000
commit211b35c2d0b25cf479bfe22829aa2712c3deac86 (patch)
tree372d29053213cdc83f8ba8fd556dff7432544275
parentebf168d023746c3c458d355c3e6db2c54974a9fa (diff)
downloadgitlab-ce-211b35c2d0b25cf479bfe22829aa2712c3deac86.tar.gz
Fixed random merge request widget failure
-rw-r--r--spec/features/merge_requests/widget_spec.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/spec/features/merge_requests/widget_spec.rb b/spec/features/merge_requests/widget_spec.rb
index fb3a1ae4bd0..957e913bf95 100644
--- a/spec/features/merge_requests/widget_spec.rb
+++ b/spec/features/merge_requests/widget_spec.rb
@@ -29,8 +29,6 @@ describe 'Merge request', :feature, :js do
it 'shows widget status after creating new merge request' do
click_button 'Submit merge request'
- expect(find('.mr-state-widget')).to have_content('Checking ability to merge automatically')
-
wait_for_ajax
expect(page).to have_selector('.accept_merge_request')