summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-02-08 18:24:28 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-02-08 18:24:28 +0000
commit66f9476a3740167c28a3fcf55f89c76653d829a4 (patch)
treefb6b4de07fa85946562fb1f3a6c49e22937ebf28
parent8d443c0179c6f2b40a894dc69b78f06617172d86 (diff)
parent211b35c2d0b25cf479bfe22829aa2712c3deac86 (diff)
downloadgitlab-ce-66f9476a3740167c28a3fcf55f89c76653d829a4.tar.gz
Merge branch 'widget-spec-failure' into 'master'
Fixed random merge request widget failure Closes #27806 See merge request !9068
-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')