1 files changed, 10 insertions, 39 deletions

diff --git a/spec/features/issues/issue_state_spec.rb b/spec/features/issues/issue_state_spec.rb
index 2a8b33183bb..3fe49ff7080 100644
--- a/spec/features/issues/issue_state_spec.rb
+++ b/spec/features/issues/issue_state_spec.rb
@@ -3,8 +3,6 @@
 require 'spec_helper'
 
 RSpec.describe 'issue state', :js, feature_category: :team_planning do
-  include CookieHelper
-
   let_it_be(:group) { create(:group) }
   let_it_be(:project) { create(:project, group: group) }
   let_it_be(:user) { create(:user) }
@@ -12,7 +10,6 @@ RSpec.describe 'issue state', :js, feature_category: :team_planning do
   before do
     project.add_developer(user)
     sign_in(user)
-    set_cookie('new-actions-popover-viewed', 'true')
   end
 
   shared_examples 'issue closed' do |selector|
@@ -47,27 +44,14 @@ RSpec.describe 'issue state', :js, feature_category: :team_planning do
 
   describe 'when open' do
     context 'when clicking the top `Close issue` button', :aggregate_failures do
-      context 'when move_close_into_dropdown FF is disabled' do
-        let(:open_issue) { create(:issue, project: project) }
-
-        before do
-          stub_feature_flags(move_close_into_dropdown: false)
-          visit project_issue_path(project, open_issue)
-        end
+      let(:open_issue) { create(:issue, project: project) }
 
-        it_behaves_like 'issue closed', '.detail-page-header-actions'
+      before do
+        visit project_issue_path(project, open_issue)
+        find('#new-actions-header-dropdown > button').click
       end
 
-      context 'when move_close_into_dropdown FF is enabled' do
-        let(:open_issue) { create(:issue, project: project) }
-
-        before do
-          visit project_issue_path(project, open_issue)
-          find('#new-actions-header-dropdown > button').click
-        end
-
-        it_behaves_like 'issue closed', '.dropdown-menu-right'
-      end
+      it_behaves_like 'issue closed', '.dropdown-menu-right'
     end
 
     context 'when clicking the bottom `Close issue` button', :aggregate_failures do
@@ -83,27 +67,14 @@ RSpec.describe 'issue state', :js, feature_category: :team_planning do
 
   describe 'when closed' do
     context 'when clicking the top `Reopen issue` button', :aggregate_failures do
-      context 'when move_close_into_dropdown FF is disabled' do
-        let(:closed_issue) { create(:issue, project: project, state: 'closed', author: user) }
-
-        before do
-          stub_feature_flags(move_close_into_dropdown: false)
-          visit project_issue_path(project, closed_issue)
-        end
+      let(:closed_issue) { create(:issue, project: project, state: 'closed', author: user) }
 
-        it_behaves_like 'issue reopened', '.detail-page-header-actions'
+      before do
+        visit project_issue_path(project, closed_issue)
+        find('#new-actions-header-dropdown > button').click
       end
 
-      context 'when move_close_into_dropdown FF is enabled' do
-        let(:closed_issue) { create(:issue, project: project, state: 'closed', author: user) }
-
-        before do
-          visit project_issue_path(project, closed_issue)
-          find('#new-actions-header-dropdown > button').click
-        end
-
-        it_behaves_like 'issue reopened', '.dropdown-menu-right'
-      end
+      it_behaves_like 'issue reopened', '.dropdown-menu-right'
     end
 
     context 'when clicking the bottom `Reopen issue` button', :aggregate_failures do