Add latest changes from gitlab-org/gitlab@16-2-stable-eev16.2.0-rc42

1 files changed, 5 insertions, 5 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 7f6a044a575..d35f037247d 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
@@ -12,9 +12,9 @@ RSpec.describe 'Resolving all open threads in a merge request from an issue', :j
     url = new_project_issue_path(project, merge_request_to_resolve_discussions_of: merge_request.iid)
 
     if title.empty?
-      %Q{a[href="#{url}"]}
+      %{a[href="#{url}"]}
     else
-      %Q{a[title="#{title}"][href="#{url}"]}
+      %{a[title="#{title}"][href="#{url}"]}
     end
   end
 
@@ -30,7 +30,7 @@ RSpec.describe 'Resolving all open threads in a merge request from an issue', :j
     end
 
     it 'shows a button to resolve all threads by creating a new issue' do
-      find('.discussions-counter .dropdown-toggle').click
+      find('.discussions-counter .gl-new-dropdown-toggle').click
 
       within('.discussions-counter') 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))
@@ -49,7 +49,7 @@ RSpec.describe 'Resolving all open threads in a merge request from an issue', :j
 
     context 'creating an issue for threads' do
       before do
-        find('.discussions-counter .dropdown-toggle').click
+        find('.discussions-counter .gl-new-dropdown-toggle').click
         find(resolve_all_discussions_link_selector).click
       end
 
@@ -65,7 +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
+          find('.discussions-counter .gl-new-dropdown-toggle').click
         end
 
         it 'does not show a link to create a new issue' do