Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42

1 files changed, 1 insertions, 18 deletions

diff --git a/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb b/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb
index c982052fc0e..7f6a044a575 100644
--- a/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb
+++ b/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb
@@ -20,7 +20,6 @@ RSpec.describe 'Resolving all open threads in a merge request from an issue', :j
 
   before do
     stub_feature_flags(moved_mr_sidebar: false)
-    stub_feature_flags(hide_create_issue_resolve_all: false)
   end
 
   describe 'as a user with access to the project' do
@@ -45,7 +44,6 @@ RSpec.describe 'Resolving all open threads in a merge request from an issue', :j
 
       it 'hides the link for creating a new issue' do
         expect(page).not_to have_selector resolve_all_discussions_link_selector
-        expect(page).not_to have_content "Resolve all with new issue"
       end
     end
 
@@ -67,6 +65,7 @@ RSpec.describe 'Resolving all open threads in a merge request from an issue', :j
         before do
           project.project_feature.update_attribute(:issues_access_level, ProjectFeature::DISABLED)
           visit project_merge_request_path(project, merge_request)
+          find('.discussions-counter .dropdown-toggle').click
         end
 
         it 'does not show a link to create a new issue' do
@@ -82,22 +81,6 @@ RSpec.describe 'Resolving all open threads in a merge request from an issue', :j
         it 'shows a warning that the merge request contains unresolved threads' do
           expect(page).to have_content 'all threads must be resolved'
         end
-
-        it 'has a link to resolve all threads by creating an issue' do
-          expect(page).to have_link 'Resolve all with new issue', href: new_project_issue_path(project, merge_request_to_resolve_discussions_of: merge_request.iid)
-        end
-
-        context 'creating an issue for threads' do
-          before do
-            page.within '.mr-state-widget' do
-              page.click_link 'Resolve all with new issue', href: new_project_issue_path(project, merge_request_to_resolve_discussions_of: merge_request.iid)
-
-              wait_for_all_requests
-            end
-          end
-
-          it_behaves_like 'creating an issue for a thread'
-        end
       end
     end
   end