1 files changed, 9 insertions, 2 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 1e8b9b6b60b..a385e8a5fd0 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
@@ -18,6 +18,10 @@ RSpec.describe 'Resolving all open threads in a merge request from an issue', :j
     end
   end
 
+  before do
+    stub_feature_flags(moved_mr_sidebar: false)
+  end
+
   describe 'as a user with access to the project' do
     before do
       project.add_maintainer(user)
@@ -26,14 +30,16 @@ 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
+
       within('.discussions-counter') do
-        expect(page).to have_selector resolve_all_discussions_link_selector( title: "Create issue to resolve all threads" )
+        expect(page).to have_link(_("Create issue to resolve all threads"), href: new_project_issue_path(project, merge_request_to_resolve_discussions_of: merge_request.iid))
       end
     end
 
     context 'resolving the thread' do
       before do
-        find('button[data-qa-selector="resolve_discussion_button"]').click # rubocop:disable QA/SelectorUsage
+        find('button[data-testid="resolve-discussion-button"]').click
       end
 
       it 'hides the link for creating a new issue' do
@@ -44,6 +50,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(resolve_all_discussions_link_selector).click
       end