Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 2 deletions

diff --git a/spec/features/merge_request/user_merges_only_if_pipeline_succeeds_spec.rb b/spec/features/merge_request/user_merges_only_if_pipeline_succeeds_spec.rb
index 4afbf30ece4..419f741d0ea 100644
--- a/spec/features/merge_request/user_merges_only_if_pipeline_succeeds_spec.rb
+++ b/spec/features/merge_request/user_merges_only_if_pipeline_succeeds_spec.rb
@@ -89,12 +89,12 @@ describe 'Merge request > User merges only if pipeline succeeds', :js do
       context 'when CI skipped' do
         let(:status) { :skipped }
 
-        it 'allows MR to be merged' do
+        it 'does not allow MR to be merged' do
           visit project_merge_request_path(project, merge_request)
 
           wait_for_requests
 
-          expect(page).to have_button 'Merge'
+          expect(page).not_to have_button 'Merge'
         end
       end
     end