1 files changed, 8 insertions, 25 deletions
diff --git a/spec/features/merge_request/user_closes_reopens_merge_request_state_spec.rb b/spec/features/merge_request/user_closes_reopens_merge_request_state_spec.rb
index ab3ef7c1ac0..70951982c22 100644
--- a/spec/features/merge_request/user_closes_reopens_merge_request_state_spec.rb
+++ b/spec/features/merge_request/user_closes_reopens_merge_request_state_spec.rb
@@ -12,15 +12,9 @@ RSpec.describe 'User closes/reopens a merge request', :js, quarantine: 'https://
   end
 
   describe 'when open' do
-    let(:open_merge_request) { create(:merge_request, source_project: project, target_project: project) }
-
-    it_behaves_like 'page with comment and close button', 'Close merge request' do
-      def setup
-        visit merge_request_path(open_merge_request)
-      end
-    end
-
     context 'when clicking the top `Close merge request` link', :aggregate_failures do
+      let(:open_merge_request) { create(:merge_request, source_project: project, target_project: project) }
+
       before do
         visit merge_request_path(open_merge_request)
       end
@@ -40,8 +34,9 @@ RSpec.describe 'User closes/reopens a merge request', :js, quarantine: 'https://
     end
 
     context 'when clicking the bottom `Close merge request` button', :aggregate_failures do
+      let(:open_merge_request) { create(:merge_request, source_project: project, target_project: project) }
+
       before do
-        stub_feature_flags(remove_comment_close_reopen: false)
         visit merge_request_path(open_merge_request)
       end
 
@@ -61,22 +56,9 @@ RSpec.describe 'User closes/reopens a merge request', :js, quarantine: 'https://
   end
 
   describe 'when closed' do
-    let(:closed_merge_request) { create(:merge_request, source_project: project, target_project: project, state: 'closed') }
-
-    it_behaves_like 'page with comment and close button', 'Close merge request' do
-      def setup
-        visit merge_request_path(closed_merge_request)
-
-        within '.detail-page-header' do
-          click_button 'Toggle dropdown'
-          click_link 'Reopen merge request'
-        end
-
-        wait_for_requests
-      end
-    end
-
     context 'when clicking the top `Reopen merge request` link', :aggregate_failures do
+      let(:closed_merge_request) { create(:merge_request, source_project: project, target_project: project, state: 'closed') }
+
       before do
         visit merge_request_path(closed_merge_request)
       end
@@ -96,8 +78,9 @@ RSpec.describe 'User closes/reopens a merge request', :js, quarantine: 'https://
     end
 
     context 'when clicking the bottom `Reopen merge request` button', :aggregate_failures do
+      let(:closed_merge_request) { create(:merge_request, source_project: project, target_project: project, state: 'closed') }
+
       before do
-        stub_feature_flags(remove_comment_close_reopen: false)
         visit merge_request_path(closed_merge_request)
       end