Add latest changes from gitlab-org/gitlab@master

2 files changed, 16 insertions, 8 deletions

diff --git a/qa/qa/page/group/settings/package_registries.rb b/qa/qa/page/group/settings/package_registries.rb
index 0a606f9a61a..ee5ca849a47 100644
--- a/qa/qa/page/group/settings/package_registries.rb
+++ b/qa/qa/page/group/settings/package_registries.rb
@@ -12,18 +12,28 @@ module QA
           end
 
           view 'app/assets/javascripts/packages_and_registries/settings/group/components/maven_settings.vue' do
-            element :allow_duplicates_checkbox
+            element :allow_duplicates_toggle
+            element :allow_duplicates_label
           end
 
           def set_allow_duplicates_disabled
             expand_content :package_registry_settings_content do
-              uncheck_element :allow_duplicates_checkbox
+              click_element(:allow_duplicates_toggle) if duplicates_enabled?
             end
           end
 
-          def has_allow_duplicates_enabled?
-            expand_content :package_registry_settings_content
-            !find_element(:allow_duplicates_checkbox).checked?
+          def set_allow_duplicates_enabled
+            expand_content :package_registry_settings_content do
+              click_element(:allow_duplicates_toggle) if duplicates_disabled?
+            end
+          end
+
+          def duplicates_enabled?
+            has_element?(:allow_duplicates_label, text: 'Allow duplicates')
+          end
+
+          def duplicates_disabled?
+            has_element?(:allow_duplicates_label, text: 'Do not allow duplicates')
           end
         end
       end
diff --git a/qa/qa/specs/features/browser_ui/5_package/maven_repository_spec.rb b/qa/qa/specs/features/browser_ui/5_package/maven_repository_spec.rb
index b6577dfd17a..2f508d00790 100644
--- a/qa/qa/specs/features/browser_ui/5_package/maven_repository_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/maven_repository_spec.rb
@@ -223,9 +223,7 @@ module QA
           project.group.visit!
 
           Page::Group::Menu.perform(&:go_to_package_settings)
-          Page::Group::Settings::PackageRegistries.perform do |settings|
-            expect(settings).to have_allow_duplicates_enabled
-          end
+          Page::Group::Settings::PackageRegistries.perform(&:set_allow_duplicates_enabled)
         end
 
         it 'allows users to publish duplicate Maven packages at the group level', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1722' do