Update within_testid and find_by_testid helper to include context

ee/spec/features/projects/google_cloud_platform/artifact_registry_spec.rb

@@ -21,9 +21,7 @@
 
     wait_for_requests
 
-    # rubocop:disable Capybara/TestidFinders -- Helper within_testid doesn't cover use case
-    expect(page).to be_axe_clean.within('[data-testid="artifact-registry-list-page"]')
-    # rubocop:enable Capybara/TestidFinders
+    expect(page).to be_axe_clean.within('[data-testid="artifact-registry-list-page"]') # rubocop:todo Capybara/TestidFinders -- Doesn't cover use case, see https://gitlab.com/gitlab-org/gitlab/-/issues/442224
   end
 
   it 'has a page title set' do

ee/spec/features/projects/settings/packages_spec.rb

@@ -22,10 +22,8 @@
 
       wait_for_requests
 
-      # rubocop:disable Capybara/TestidFinders -- Helper within_testid doesn't cover use case
-      expect(page).to be_axe_clean.within('[data-testid="packages-and-registries-project-settings"]')
+      expect(page).to be_axe_clean.within('[data-testid="packages-and-registries-project-settings"]') # rubocop:todo Capybara/TestidFinders -- Doesn't cover use case, see https://gitlab.com/gitlab-org/gitlab/-/issues/442224
                                   .skipping :'heading-order'
-      # rubocop:enable Capybara/TestidFinders
     end
 
     it 'shows available section' do

spec/features/groups/settings/packages_and_registries_spec.rb

@@ -65,10 +65,8 @@
 
       wait_for_requests
 
-      # rubocop:disable Capybara/TestidFinders -- Helper within_testid doesn't cover use case
-      expect(page).to be_axe_clean.within('[data-testid="packages-and-registries-group-settings"]')
+      expect(page).to be_axe_clean.within('[data-testid="packages-and-registries-group-settings"]') # rubocop:todo Capybara/TestidFinders -- Doesn't cover use case, see https://gitlab.com/gitlab-org/gitlab/-/issues/442224
                                   .skipping :'link-in-text-block', :'heading-order'
-      # rubocop:enable Capybara/TestidFinders
     end
 
     it 'has a Duplicate packages section', :js do

spec/features/issues/discussion_lock_spec.rb

@@ -110,12 +110,10 @@
     visit project_issue_path(project, issue)
     wait_for_all_requests
 
-    # rubocop:disable Capybara/TestidFinders -- within_testid does not work here
     expect(page).to be_axe_clean.within(locked_badge)
     expect(page).to be_axe_clean.within(issuable_note_warning)
 
     more_dropdown.click
-    expect(page).to be_axe_clean.within('[data-testid="lock-issue-toggle"] button')
-    # rubocop:enable Capybara/TestidFinders
+    expect(page).to be_axe_clean.within('[data-testid="lock-issue-toggle"] button') # rubocop:todo Capybara/TestidFinders -- Doesn't cover use case, see https://gitlab.com/gitlab-org/gitlab/-/issues/442224
   end
 end

spec/features/nav/pinned_nav_items_spec.rb

@@ -221,34 +221,28 @@ def add_pin(nav_item_title)
     nav_item = find_by_testid('nav-item', text: nav_item_title)
     scroll_to(nav_item)
     nav_item.hover
-    within(nav_item) do
-      pin_button = find_by_testid('nav-item-pin')
-      pin_button.click
-      wait_for_requests
-    end
+    find_by_testid('nav-item-pin', context: nav_item).click
+
+    wait_for_requests
   end
 
   def remove_pin(nav_item_title)
     nav_item = find_by_testid('nav-item', text: nav_item_title)
     scroll_to(nav_item)
     nav_item.hover
-    within(nav_item) do
-      unpin_button = find_by_testid('nav-item-unpin')
-      unpin_button.click
-      wait_for_requests
-    end
+    find_by_testid('nav-item-unpin', context: nav_item).click
+
+    wait_for_requests
   end
 
   def drag_item(item, to:)
     item.hover
-    within(item) do
-      drag_handle = find_by_testid('grip-icon')
-
-      # Reduce delay to make it less likely for draggables to
-      # change position during drag operation, which reduces
-      # flakiness.
-      drag_handle.drag_to(to, delay: 0.01)
-      wait_for_requests
-    end
+
+    # Reduce delay to make it less likely for draggables to
+    # change position during drag operation, which reduces
+    # flakiness.
+    find_by_testid('grip-icon', context: item).drag_to(to, delay: 0.01)
+
+    wait_for_requests
   end
 end

spec/support/helpers/features/dom_helpers.rb

@@ -2,16 +2,16 @@
 
 module Features
   module DomHelpers
-    def has_testid?(testid, **kwargs)
-      page.has_selector?("[data-testid='#{testid}']", **kwargs)
+    def has_testid?(testid, context: page, **kwargs)
+      context.has_selector?("[data-testid='#{testid}']", **kwargs)
     end
 
-    def find_by_testid(testid, **kwargs)
-      page.find("[data-testid='#{testid}']", **kwargs)
+    def find_by_testid(testid, context: page, **kwargs)
+      context.find("[data-testid='#{testid}']", **kwargs)
     end
 
-    def within_testid(testid, **kwargs, &block)
-      page.within("[data-testid='#{testid}']", **kwargs, &block)
+    def within_testid(testid, context: page, **kwargs, &block)
+      context.within("[data-testid='#{testid}']", **kwargs, &block)
     end
   end
 end