Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

1 files changed, 2 insertions, 23 deletions

diff --git a/spec/presenters/merge_request_presenter_spec.rb b/spec/presenters/merge_request_presenter_spec.rb
index 798bee70e42..31aa4778d3c 100644
--- a/spec/presenters/merge_request_presenter_spec.rb
+++ b/spec/presenters/merge_request_presenter_spec.rb
@@ -17,29 +17,8 @@ RSpec.describe MergeRequestPresenter do
       allow(resource).to receive(:mergeable_discussions_state?).and_return(discussions_state)
     end
 
-    context 'when change_response_code_merge_status is enabled' do
-      it 'returns the mergeable_discussions_state' do
-        is_expected.to eq(discussions_state)
-      end
-    end
-
-    context 'when change_response_code_merge_status is disabled' do
-      before do
-        stub_feature_flags(change_response_code_merge_status: false)
-      end
-
-      context 'when it is not mergeable' do
-        it 'returns false' do
-          resource.close!
-          is_expected.to eq(false)
-        end
-      end
-
-      context 'when it is mergeable' do
-        it 'returns the mergeable_discussions_state' do
-          is_expected.to eq(discussions_state)
-        end
-      end
+    it 'returns the mergeable_discussions_state' do
+      is_expected.to eq(discussions_state)
     end
   end