Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 20 deletions

diff --git a/spec/support/shared_examples/services/merge_request_shared_examples.rb b/spec/support/shared_examples/services/merge_request_shared_examples.rb
index b3ba0a1be93..cfd75d3cfcd 100644
--- a/spec/support/shared_examples/services/merge_request_shared_examples.rb
+++ b/spec/support/shared_examples/services/merge_request_shared_examples.rb
@@ -19,29 +19,13 @@ RSpec.shared_examples 'reviewer_ids filter' do
       let(:reviewer2) { create(:user) }
 
       context 'when the current user can admin the merge_request' do
-        context 'when merge_request_reviewer feature is enabled' do
+        context 'with a reviewer who can read the merge_request' do
           before do
-            stub_feature_flags(merge_request_reviewer: true)
+            project.add_developer(reviewer1)
           end
 
-          context 'with a reviewer who can read the merge_request' do
-            before do
-              project.add_developer(reviewer1)
-            end
-
-            it 'contains reviewers who can read the merge_request' do
-              expect(execute.reviewers).to contain_exactly(reviewer1)
-            end
-          end
-        end
-
-        context 'when merge_request_reviewer feature is disabled' do
-          before do
-            stub_feature_flags(merge_request_reviewer: false)
-          end
-
-          it 'contains no reviewers' do
-            expect(execute.reviewers).to eq []
+          it 'contains reviewers who can read the merge_request' do
+            expect(execute.reviewers).to contain_exactly(reviewer1)
           end
         end
       end