Automatic merge of gitlab-org/gitlab-ce master

d1faf55b · GitLab Bot · c3ee0fea · ea0b7336 · d1faf55b
Commit d1faf55b authored Jan 16, 2019 by GitLab Bot
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

spec/features/merge_request/user_merges_immediately_spec.rb spec/features/merge_request/user_merges_immediately_spec.rb +2 -0

No files found.
--- a/spec/features/merge_request/user_merges_immediately_spec.rb
+++ b/spec/features/merge_request/user_merges_immediately_spec.rb
@@ -25,6 +25,8 @@ describe 'Merge requests > User merges immediately', :js do
    end

    it 'enables merge immediately' do
+      wait_for_requests
+
      page.within '.mr-widget-body' do
        find('.dropdown-toggle').click