Add latest changes from gitlab-org/gitlab@master

14 files changed, 64 insertions, 74 deletions

diff --git a/qa/qa/page/element.rb b/qa/qa/page/element.rb
index 6bfdf98587b..db2f2153560 100644
--- a/qa/qa/page/element.rb
+++ b/qa/qa/page/element.rb
@@ -13,9 +13,7 @@ module QA
         @attributes[:pattern] ||= selector
 
         options.each do |option|
-          if option.is_a?(String) || option.is_a?(Regexp)
-            @attributes[:pattern] = option
-          end
+          @attributes[:pattern] = option if option.is_a?(String) || option.is_a?(Regexp)
         end
       end
 
@@ -28,7 +26,7 @@ module QA
       end
 
       def selector_css
-        %Q([data-qa-selector="#{@name}"]#{additional_selectors},.#{selector})
+        %(#{qa_selector}#{additional_selectors},.#{selector})
       end
 
       def expression
@@ -40,14 +38,26 @@ module QA
       end
 
       def matches?(line)
-        !!(line =~ /["']#{name}['"]|#{expression}/)
+        !!(line =~ /["']#{name}['"]|["']#{convert_to_kebabcase(name)}['"]|#{expression}/)
       end
 
       private
 
+      def convert_to_kebabcase(text)
+        text.to_s.tr('_', '-')
+      end
+
+      def qa_selector
+        [
+          %([data-testid="#{name}"]#{additional_selectors}),
+          %([data-testid="#{convert_to_kebabcase(name)}"]#{additional_selectors}),
+          %([data-qa-selector="#{name}"]#{additional_selectors})
+        ].join(',')
+      end
+
       def additional_selectors
         @attributes.dup.delete_if { |attr| attr == :pattern || attr == :required }.map do |key, value|
-          %Q([data-qa-#{key.to_s.tr('_', '-')}="#{value}"])
+          %([data-qa-#{key.to_s.tr('_', '-')}="#{value}"])
         end.join
       end
     end
diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb
index d5d8c52a0e3..9eb55989ea8 100644
--- a/qa/qa/page/merge_request/show.rb
+++ b/qa/qa/page/merge_request/show.rb
@@ -118,7 +118,7 @@ module QA
         end
 
         view 'app/views/projects/merge_requests/_mr_title.html.haml' do
-          element :edit_button
+          element :edit_title_button
           element :title_content, required: true
         end
 
@@ -211,7 +211,7 @@ module QA
           # Click by JS is needed to bypass the Moved MR actions popover
           # Change back to regular click_element when moved_mr_sidebar FF is removed
           # Rollout issue: https://gitlab.com/gitlab-org/gitlab/-/issues/385460
-          click_by_javascript(find_element(:edit_button))
+          click_by_javascript(find_element(:edit_title_button))
         end
 
         def fast_forward_not_possible?
diff --git a/qa/qa/page/project/secure/configuration_form.rb b/qa/qa/page/project/secure/configuration_form.rb
index 493ec08d023..70eff31bfa9 100644
--- a/qa/qa/page/project/secure/configuration_form.rb
+++ b/qa/qa/page/project/secure/configuration_form.rb
@@ -9,15 +9,13 @@ module QA
 
           view 'app/assets/javascripts/security_configuration/components/app.vue' do
             element :security_configuration_container
-            element :security_configuration_history_link
+            element :security_view_history_link
           end
 
           view 'app/assets/javascripts/security_configuration/components/feature_card.vue' do
-            element :dependency_scanning_status, "`${feature.type}_status`" # rubocop:disable QA/ElementWithPattern
-            element :sast_status, "`${feature.type}_status`" # rubocop:disable QA/ElementWithPattern
+            element :feature_status
             element :sast_enable_button, "`${feature.type}_enable_button`" # rubocop:disable QA/ElementWithPattern
             element :dependency_scanning_mr_button, "`${feature.type}_mr_button`" # rubocop:disable QA/ElementWithPattern
-            element :license_scanning_status, "`${feature.type}_status`" # rubocop:disable QA/ElementWithPattern
           end
 
           view 'app/assets/javascripts/security_configuration/components/auto_dev_ops_alert.vue' do
@@ -25,15 +23,15 @@ module QA
           end
 
           def has_security_configuration_history_link?
-            has_element?(:security_configuration_history_link)
+            has_element?(:security_view_history_link)
           end
 
           def has_no_security_configuration_history_link?
-            has_no_element?(:security_configuration_history_link)
+            has_no_element?(:security_view_history_link)
           end
 
           def click_security_configuration_history_link
-            click_element(:security_configuration_history_link)
+            click_element(:security_view_history_link)
           end
 
           def click_sast_enable_button
@@ -44,40 +42,20 @@ module QA
             click_element(:dependency_scanning_mr_button)
           end
 
-          def has_sast_status?(status_text)
-            within_element(:sast_status) do
-              has_text?(status_text)
-            end
-          end
-
-          def has_no_sast_status?(status_text)
-            within_element(:sast_status) do
-              has_no_text?(status_text)
-            end
-          end
-
-          def has_dependency_scanning_status?(status_text)
-            within_element(:dependency_scanning_status) do
-              has_text?(status_text)
-            end
+          def has_true_sast_status?
+            has_element?(:feature_status, feature: 'sast_true_status')
           end
 
-          def has_no_dependency_scanning_status?(status_text)
-            within_element(:dependency_scanning_status) do
-              has_no_text?(status_text)
-            end
+          def has_false_sast_status?
+            has_element?(:feature_status, feature: 'sast_false_status')
           end
 
-          def has_license_compliance_status?(status_text)
-            within_element(:license_scanning_status) do
-              has_text?(status_text)
-            end
+          def has_true_dependency_scanning_status?
+            has_element?(:feature_status, feature: 'dependency_scanning_true_status')
           end
 
-          def has_no_license_compliance_status?(status_text)
-            within_element(:license_scanning_status) do
-              has_no_text?(status_text)
-            end
+          def has_false_dependency_scanning_status?
+            has_element?(:feature_status, feature: 'dependency_scanning_false_status')
           end
 
           def has_auto_devops_container?
diff --git a/qa/qa/page/project/settings/protected_branches.rb b/qa/qa/page/project/settings/protected_branches.rb
index 3eddd0fd33a..e6b13ed77a0 100644
--- a/qa/qa/page/project/settings/protected_branches.rb
+++ b/qa/qa/page/project/settings/protected_branches.rb
@@ -11,9 +11,9 @@ module QA
           end
 
           view 'app/views/protected_branches/_create_protected_branch.html.haml' do
-            element :allowed_to_push_dropdown
+            element :select_allowed_to_push_dropdown
             element :allowed_to_push_dropdown_content
-            element :allowed_to_merge_dropdown
+            element :select_allowed_to_merge_dropdown
             element :allowed_to_merge_dropdown_content
           end
 
@@ -45,7 +45,7 @@ module QA
           private
 
           def select_allowed(action, allowed)
-            click_element :"allowed_to_#{action}_dropdown"
+            click_element :"select_allowed_to_#{action}_dropdown"
 
             allowed[:roles] = Resource::ProtectedBranch::Roles::NO_ONE unless allowed.key?(:roles)
 
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb
index fd818c3797b..b2dca4fc312 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb
@@ -43,7 +43,7 @@ module QA
       end
 
       it 'mentions another user in an issue',
-testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347988' do
+        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347988' do
         Page::Project::Issue::Show.perform do |show|
           at_username = "@#{user.username}"
 
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/push_http_private_token_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/push_http_private_token_spec.rb
index 0ec231ed66e..41ef38d2d66 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/push_http_private_token_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_http_private_token_spec.rb
@@ -4,7 +4,7 @@ module QA
   RSpec.describe 'Create' do
     describe 'Git push over HTTP', :smoke, :skip_fips_env, product_group: :source_code do
       it 'user using a personal access token pushes code to the repository',
-testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347749' do
+        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347749' do
         Flow::Login.sign_in
 
         access_token = Resource::PersonalAccessToken.fabricate!.token
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb
index efa1f9fe2c9..edc85849356 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb
@@ -4,7 +4,7 @@ module QA
   RSpec.describe 'Create' do
     describe 'Git push over HTTP', product_group: :source_code do
       it 'user pushes code to the repository', :smoke, :skip_fips_env,
-          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347747' do
+        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347747' do
         Flow::Login.sign_in
 
         Resource::Repository::ProjectPush.fabricate! do |push|
@@ -20,7 +20,7 @@ module QA
       end
 
       it 'pushes to a project using a specific Praefect repository storage', :smoke, :skip_fips_env, :requires_admin,
-          :requires_praefect, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347789' do
+        :requires_praefect, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347789' do
         Flow::Login.sign_in_as_admin
 
         project = Resource::Project.fabricate_via_api! do |storage_project|
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/push_over_ssh_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/push_over_ssh_spec.rb
index f281f441e8a..dcee723a1c4 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/push_over_ssh_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_over_ssh_spec.rb
@@ -27,7 +27,7 @@ module QA
       end
 
       it 'pushes code to the repository via SSH', :smoke, :skip_fips_env,
-          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347825' do
+        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347825' do
         Resource::Repository::ProjectPush.fabricate! do |push|
           push.project = project
           push.ssh_key = @key
@@ -43,7 +43,7 @@ module QA
       end
 
       it 'pushes multiple branches and tags together', :smoke, :skip_fips_env,
-          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347826' do
+        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347826' do
         branches = []
         tags = []
         Git::Repository.perform do |repository|
diff --git a/qa/qa/specs/features/browser_ui/3_create/source_editor/source_editor_toolbar_spec.rb b/qa/qa/specs/features/browser_ui/3_create/source_editor/source_editor_toolbar_spec.rb
index ffe340eb0dd..9b1df337065 100644
--- a/qa/qa/specs/features/browser_ui/3_create/source_editor/source_editor_toolbar_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/source_editor/source_editor_toolbar_spec.rb
@@ -17,7 +17,7 @@ module QA
       end
 
       it 'can preview markdown side-by-side while editing',
-      testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/367749' do
+        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/367749' do
         project.visit!
         Page::Project::Show.perform do |project|
           project.click_file('README.md')
diff --git a/qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_with_image_pull_policy_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_with_image_pull_policy_spec.rb
index aaaa11ef867..c693a57605e 100644
--- a/qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_with_image_pull_policy_spec.rb
+++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_with_image_pull_policy_spec.rb
@@ -71,10 +71,10 @@ module QA
 
             if pull_image
               expect(job_log).to have_content(message),
-                                 "Expected to find #{message} in #{job_log}, but didn't."
+                "Expected to find #{message} in #{job_log}, but didn't."
             else
               expect(job_log).not_to have_content(message),
-                                 "Found #{message} in #{job_log}, but didn't expect to."
+                "Found #{message} in #{job_log}, but didn't expect to."
             end
           end
         end
@@ -96,7 +96,7 @@ module QA
           visit_job
 
           expect(job_log).to include(text1, text2),
-                             "Expected to find contents #{text1} and #{text2} in #{job_log}, but didn't."
+            "Expected to find contents #{text1} and #{text2} in #{job_log}, but didn't."
         end
       end
 
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/maven/maven_project_level_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/maven/maven_project_level_spec.rb
index 27bca6c17a2..908585c8423 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/maven/maven_project_level_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/maven/maven_project_level_spec.rb
@@ -2,10 +2,10 @@
 
 module QA
   RSpec.describe 'Package', :orchestrated, :requires_admin, :packages, :object_storage, :reliable,
-  feature_flag: {
-    name: 'maven_central_request_forwarding',
-    scope: :global
-  } do
+    feature_flag: {
+      name: 'maven_central_request_forwarding',
+      scope: :global
+    } do
     describe 'Maven project level endpoint', product_group: :package_registry do
       include Runtime::Fixtures
       include Support::Helpers::MaskToken
@@ -218,16 +218,14 @@ module QA
       ) do
         Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
           Resource::Repository::Commit.fabricate_via_api! do |commit|
-            gitlab_ci_yaml = ERB.new(read_fixture('package_managers/maven/project/request_forwarding',
-                                                  'gitlab_ci.yaml.erb'
-                                                 )
-                                    )
-                                    .result(binding)
-            settings_xml = ERB.new(read_fixture('package_managers/maven/project/request_forwarding',
-                                                'settings.xml.erb'
-                                               )
-                                  )
-                                  .result(binding)
+            gitlab_ci_yaml = ERB.new(read_fixture(
+              'package_managers/maven/project/request_forwarding',
+              'gitlab_ci.yaml.erb'
+            )).result(binding)
+            settings_xml = ERB.new(read_fixture(
+              'package_managers/maven/project/request_forwarding',
+              'settings.xml.erb'
+            )).result(binding)
 
             commit.project = imported_project
             commit.commit_message = 'Add files'
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/nuget/nuget_project_level_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/nuget/nuget_project_level_spec.rb
index ad5835d8c9d..adb299eaab5 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/nuget/nuget_project_level_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/nuget/nuget_project_level_spec.rb
@@ -2,7 +2,7 @@
 
 module QA
   RSpec.describe 'Package', :skip_live_env, :orchestrated, :packages, :object_storage,
-product_group: :package_registry do
+    product_group: :package_registry do
     describe 'NuGet project level endpoint' do
       include Support::Helpers::MaskToken
 
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/rubygems_registry_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/rubygems_registry_spec.rb
index 1af1fc7c231..374111b3498 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/rubygems_registry_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/rubygems_registry_spec.rb
@@ -2,7 +2,7 @@
 
 module QA
   RSpec.describe 'Package', :orchestrated, :packages, :object_storage,
-                            feature_flag: { name: 'rubygem_packages', scope: :project } do
+    feature_flag: { name: 'rubygem_packages', scope: :project } do
     describe 'RubyGems Repository', product_group: :package_registry do
       include Runtime::Fixtures
 
diff --git a/qa/spec/page/element_spec.rb b/qa/spec/page/element_spec.rb
index fbf58b5e18a..da1fd224564 100644
--- a/qa/spec/page/element_spec.rb
+++ b/qa/spec/page/element_spec.rb
@@ -73,7 +73,7 @@ RSpec.describe QA::Page::Element do
       subject { described_class.new(:something, /link_to 'something'/) }
 
       it 'has an attribute[pattern] of the pattern' do
-        expect(subject.attributes[:pattern]).to eq /link_to 'something'/
+        expect(subject.attributes[:pattern]).to eq(/link_to 'something'/)
       end
 
       it 'is not required by default' do
@@ -98,7 +98,7 @@ RSpec.describe QA::Page::Element do
       subject { described_class.new(:something, /link_to 'something_else_entirely'/, required: true) }
 
       it 'has an attribute[pattern] of the passed pattern' do
-        expect(subject.attributes[:pattern]).to eq /link_to 'something_else_entirely'/
+        expect(subject.attributes[:pattern]).to eq(/link_to 'something_else_entirely'/)
       end
 
       it 'is required' do
@@ -118,6 +118,10 @@ RSpec.describe QA::Page::Element do
       expect(subject.selector_css).to include(%q([data-qa-selector="my_element"]))
     end
 
+    it 'properly translates to a data-testid' do
+      expect(subject.selector_css).to include(%q([data-testid="my_element"]))
+    end
+
     context 'additional selectors' do
       let(:element) { described_class.new(:my_element, index: 3, another_match: 'something') }
       let(:required_element) { described_class.new(:my_element, required: true, index: 3) }