Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

10 files changed, 49 insertions, 44 deletions

diff --git a/qa/qa/page/project/settings/ci_cd.rb b/qa/qa/page/project/settings/ci_cd.rb
index 7224fdae10e..c537db34a51 100644
--- a/qa/qa/page/project/settings/ci_cd.rb
+++ b/qa/qa/page/project/settings/ci_cd.rb
@@ -43,4 +43,4 @@ module QA
   end
 end
 
-QA::Page::Project::Settings::CICD.prepend_if_ee("QA::EE::Page::Project::Settings::CICD")
+QA::Page::Project::Settings::CICD.prepend_mod_with("Page::Project::Settings::CICD", namespace: QA)
diff --git a/qa/qa/page/project/settings/deploy_keys.rb b/qa/qa/page/project/settings/deploy_keys.rb
index 8d655b0684e..467799a14fb 100644
--- a/qa/qa/page/project/settings/deploy_keys.rb
+++ b/qa/qa/page/project/settings/deploy_keys.rb
@@ -6,59 +6,64 @@ module QA
       module Settings
         class DeployKeys < Page::Base
           view 'app/views/shared/deploy_keys/_form.html.haml' do
-            element :deploy_key_title, 'text_field :title' # rubocop:disable QA/ElementWithPattern
-            element :deploy_key_key, 'text_area :key' # rubocop:disable QA/ElementWithPattern
+            element :deploy_key_title_field
+            element :deploy_key_field
+          end
+
+          view 'app/views/shared/deploy_keys/_project_group_form.html.haml' do
+            element :deploy_key_title_field
+            element :deploy_key_field
+            element :add_deploy_key_button
           end
 
           view 'app/assets/javascripts/deploy_keys/components/app.vue' do
-            element :deploy_keys_section, /class=".*deploy\-keys.*"/ # rubocop:disable QA/ElementWithPattern
-            element :project_deploy_keys
+            element :project_deploy_keys_container
           end
 
           view 'app/assets/javascripts/deploy_keys/components/key.vue' do
-            element :key
-            element :key_title
-            element :key_md5_fingerprint
+            element :key_container
+            element :key_title_content
+            element :key_md5_fingerprint_content
           end
 
           def add_key
-            click_on 'Add key'
+            click_element(:add_deploy_key_button)
           end
 
           def fill_key_title(title)
-            fill_in 'deploy_key_title', with: title
+            fill_element(:deploy_key_title_field, title)
           end
 
           def fill_key_value(key)
-            fill_in 'deploy_key_key', with: key
+            fill_element(:deploy_key_field, key)
           end
 
           def find_md5_fingerprint(title)
             within_project_deploy_keys do
-              find_element(:key, text: title)
-                .find(element_selector_css(:key_md5_fingerprint)).text.delete_prefix('MD5:')
+              find_element(:key_container, text: title)
+                .find(element_selector_css(:key_md5_fingerprint_content)).text.delete_prefix('MD5:')
             end
           end
 
           def has_key?(title, md5_fingerprint)
             within_project_deploy_keys do
-              find_element(:key, text: title)
-                .has_css?(element_selector_css(:key_md5_fingerprint), text: "MD5:#{md5_fingerprint}")
+              find_element(:key_container, text: title)
+                .has_css?(element_selector_css(:key_md5_fingerprint_content), text: "MD5:#{md5_fingerprint}")
             end
           end
 
           def key_title
             within_project_deploy_keys do
-              find_element(:key_title).text
+              find_element(:key_title_content).text
             end
           end
 
           private
 
           def within_project_deploy_keys
-            has_element?(:project_deploy_keys, wait: QA::Support::Repeater::DEFAULT_MAX_WAIT_TIME)
+            has_element?(:project_deploy_keys_container, wait: QA::Support::Repeater::DEFAULT_MAX_WAIT_TIME)
 
-            within_element(:project_deploy_keys) do
+            within_element(:project_deploy_keys_container) do
               yield
             end
           end
diff --git a/qa/qa/page/project/settings/deploy_tokens.rb b/qa/qa/page/project/settings/deploy_tokens.rb
index 3c3ed4f8716..b26cae86d8b 100644
--- a/qa/qa/page/project/settings/deploy_tokens.rb
+++ b/qa/qa/page/project/settings/deploy_tokens.rb
@@ -6,54 +6,54 @@ module QA
       module Settings
         class DeployTokens < Page::Base
           view 'app/views/shared/deploy_tokens/_form.html.haml' do
-            element :deploy_token_name
-            element :deploy_token_expires_at
-            element :deploy_token_read_repository
-            element :deploy_token_read_registry
-            element :create_deploy_token
+            element :deploy_token_name_field
+            element :deploy_token_expires_at_field
+            element :deploy_token_read_repository_checkbox
+            element :deploy_token_read_registry_checkbox
+            element :create_deploy_token_button
           end
 
           view 'app/views/shared/deploy_tokens/_new_deploy_token.html.haml' do
-            element :created_deploy_token_section
-            element :deploy_token_user
-            element :deploy_token
+            element :created_deploy_token_container
+            element :deploy_token_user_field
+            element :deploy_token_field
           end
 
           def fill_token_name(name)
-            fill_element :deploy_token_name, name
+            fill_element(:deploy_token_name_field, name)
           end
 
           def fill_token_expires_at(expires_at)
-            fill_element :deploy_token_expires_at, expires_at.to_s + "\n"
+            fill_element(:deploy_token_expires_at_field, expires_at.to_s + "\n")
           end
 
           def fill_scopes(read_repository:, read_registry:)
-            check_element :deploy_token_read_repository if read_repository
-            check_element :deploy_token_read_registry if read_registry
+            check_element(:deploy_token_read_repository_checkbox) if read_repository
+            check_element(:deploy_token_read_registry_checkbox) if read_registry
           end
 
           def add_token
-            click_element :create_deploy_token
+            click_element(:create_deploy_token_button)
           end
 
           def token_username
             within_new_project_deploy_token do
-              find_element(:deploy_token_user).value
+              find_element(:deploy_token_user_field).value
             end
           end
 
           def token_password
             within_new_project_deploy_token do
-              find_element(:deploy_token).value
+              find_element(:deploy_token_field).value
             end
           end
 
           private
 
           def within_new_project_deploy_token
-            has_element?(:created_deploy_token_section, wait: QA::Support::Repeater::DEFAULT_MAX_WAIT_TIME)
+            has_element?(:created_deploy_token_container, wait: QA::Support::Repeater::DEFAULT_MAX_WAIT_TIME)
 
-            within_element(:created_deploy_token_section) do
+            within_element(:created_deploy_token_container) do
               yield
             end
           end
diff --git a/qa/qa/page/project/settings/integrations.rb b/qa/qa/page/project/settings/integrations.rb
index 6f5c50eac52..420dcb63918 100644
--- a/qa/qa/page/project/settings/integrations.rb
+++ b/qa/qa/page/project/settings/integrations.rb
@@ -23,4 +23,4 @@ module QA
   end
 end
 
-QA::Page::Project::Settings::Integrations.prepend_if_ee('QA::EE::Page::Project::Settings::Integrations')
+QA::Page::Project::Settings::Integrations.prepend_mod_with('Page::Project::Settings::Integrations', namespace: QA)
diff --git a/qa/qa/page/project/settings/main.rb b/qa/qa/page/project/settings/main.rb
index 48af635bb79..5efcb7bf23c 100644
--- a/qa/qa/page/project/settings/main.rb
+++ b/qa/qa/page/project/settings/main.rb
@@ -57,4 +57,4 @@ module QA
   end
 end
 
-QA::Page::Project::Settings::Main.prepend_if_ee("QA::EE::Page::Project::Settings::Main")
+QA::Page::Project::Settings::Main.prepend_mod_with("Page::Project::Settings::Main", namespace: QA)
diff --git a/qa/qa/page/project/settings/merge_request.rb b/qa/qa/page/project/settings/merge_request.rb
index 0b4a12dbb2e..dbe804bfdd0 100644
--- a/qa/qa/page/project/settings/merge_request.rb
+++ b/qa/qa/page/project/settings/merge_request.rb
@@ -12,7 +12,7 @@ module QA
           end
 
           view 'app/views/projects/_merge_request_merge_method_settings.html.haml' do
-            element :merge_ff_radio_button
+            element :merge_ff_radio
           end
 
           view 'app/views/projects/_merge_request_merge_checks_settings.html.haml' do
@@ -24,7 +24,7 @@ module QA
           end
 
           def enable_ff_only
-            click_element(:merge_ff_radio_button)
+            choose_element(:merge_ff_radio)
             click_save_changes
           end
 
@@ -38,4 +38,4 @@ module QA
   end
 end
 
-QA::Page::Project::Settings::MergeRequest.prepend_if_ee("QA::EE::Page::Project::Settings::MergeRequest")
+QA::Page::Project::Settings::MergeRequest.prepend_mod_with("Page::Project::Settings::MergeRequest", namespace: QA)
diff --git a/qa/qa/page/project/settings/mirroring_repositories.rb b/qa/qa/page/project/settings/mirroring_repositories.rb
index ce369c90a9f..5e7b68858c8 100644
--- a/qa/qa/page/project/settings/mirroring_repositories.rb
+++ b/qa/qa/page/project/settings/mirroring_repositories.rb
@@ -129,4 +129,4 @@ module QA
   end
 end
 
-QA::Page::Project::Settings::MirroringRepositories.prepend_if_ee('QA::EE::Page::Project::Settings::MirroringRepositories')
+QA::Page::Project::Settings::MirroringRepositories.prepend_mod_with('Page::Project::Settings::MirroringRepositories', namespace: QA)
diff --git a/qa/qa/page/project/settings/protected_branches.rb b/qa/qa/page/project/settings/protected_branches.rb
index 6616921f34c..308cf6366a7 100644
--- a/qa/qa/page/project/settings/protected_branches.rb
+++ b/qa/qa/page/project/settings/protected_branches.rb
@@ -69,4 +69,4 @@ module QA
   end
 end
 
-QA::Page::Project::Settings::ProtectedBranches.prepend_if_ee('QA::EE::Page::Project::Settings::ProtectedBranches')
+QA::Page::Project::Settings::ProtectedBranches.prepend_mod_with('Page::Project::Settings::ProtectedBranches', namespace: QA)
diff --git a/qa/qa/page/project/settings/protected_tags.rb b/qa/qa/page/project/settings/protected_tags.rb
index bf8f349cfd5..d9f383154f9 100644
--- a/qa/qa/page/project/settings/protected_tags.rb
+++ b/qa/qa/page/project/settings/protected_tags.rb
@@ -43,4 +43,4 @@ module QA
   end
 end
 
-QA::Page::Project::Settings::ProtectedTags.prepend_if_ee('QA::EE::Page::Project::Settings::ProtectedTags')
+QA::Page::Project::Settings::ProtectedTags.prepend_mod_with('Page::Project::Settings::ProtectedTags', namespace: QA)
diff --git a/qa/qa/page/project/settings/repository.rb b/qa/qa/page/project/settings/repository.rb
index 407c131fa73..a02b3d6a7d6 100644
--- a/qa/qa/page/project/settings/repository.rb
+++ b/qa/qa/page/project/settings/repository.rb
@@ -62,4 +62,4 @@ module QA
   end
 end
 
-QA::Page::Project::Settings::Repository.prepend_if_ee('QA::EE::Page::Project::Settings::Repository')
+QA::Page::Project::Settings::Repository.prepend_mod_with('Page::Project::Settings::Repository', namespace: QA)