Automatic merge of gitlab-org/gitlab-ce master

spec/requests/api/internal_spec.rb

@@ -998,15 +998,13 @@ describe API::Internal do
 
       context 'when the feature is disabled' do
         it 'does not invoke MergeRequests::PushOptionsHandlerService' do
-          Feature.disable(:mr_push_options)
+          stub_feature_flags(mr_push_options: false)
 
-          expect(MergeRequests::PushOptionsHandlerService).to receive(:new)
+          expect(MergeRequests::PushOptionsHandlerService).not_to receive(:new)
 
           expect do
             post api('/internal/post_receive'), params: valid_params
           end.not_to change { MergeRequest.count }
-
-          Feature.enable(:mr_push_options)
         end
       end
     end