Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42

4 files changed, 112 insertions, 1 deletions

diff --git a/qa/qa/page/group/bulk_import.rb b/qa/qa/page/group/bulk_import.rb
index 9ba80abf21c..b9497aeb6e5 100644
--- a/qa/qa/page/group/bulk_import.rb
+++ b/qa/qa/page/group/bulk_import.rb
@@ -7,7 +7,6 @@ module QA
         view "app/assets/javascripts/import_entities/import_groups/components/import_table.vue" do
           element :import_table
           element :import_item
-          element :import_group_button
           element :import_status_indicator
         end
 
@@ -19,6 +18,10 @@ module QA
           element :target_namespace_selector_dropdown
         end
 
+        view "app/assets/javascripts/import_entities/import_groups/components/import_actions_cell.vue" do
+          element :import_group_button
+        end
+
         # Import source group in to target group
         #
         # @param [String] source_group_name
diff --git a/qa/qa/page/group/menu.rb b/qa/qa/page/group/menu.rb
index c997598e25a..be877e56713 100644
--- a/qa/qa/page/group/menu.rb
+++ b/qa/qa/page/group/menu.rb
@@ -68,8 +68,25 @@ module QA
           end
         end
 
+        def go_to_repository_settings
+          hover_group_settings do
+            within_submenu do
+              click_element(:sidebar_menu_item_link, menu_item: 'Repository')
+            end
+          end
+        end
+
         private
 
+        def hover_settings
+          within_sidebar do
+            scroll_to_element(:sidebar_menu_link, menu_item: 'Settings')
+            find_element(:sidebar_menu_link, menu_item: 'Settings').hover
+
+            yield
+          end
+        end
+
         def hover_issues
           within_sidebar do
             scroll_to_element(:sidebar_menu_link, menu_item: 'Issues')
diff --git a/qa/qa/page/group/settings/group_deploy_tokens.rb b/qa/qa/page/group/settings/group_deploy_tokens.rb
new file mode 100644
index 00000000000..65ee3fc72eb
--- /dev/null
+++ b/qa/qa/page/group/settings/group_deploy_tokens.rb
@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module QA
+  module Page
+    module Group
+      module Settings
+        class GroupDeployTokens < Page::Base
+          view 'app/views/shared/deploy_tokens/_form.html.haml' do
+            element :deploy_token_name_field
+            element :deploy_token_expires_at_field
+            element :deploy_token_read_repository_checkbox
+            element :deploy_token_read_package_registry_checkbox
+            element :deploy_token_read_registry_checkbox
+            element :deploy_token_write_package_registry_checkbox
+            element :create_deploy_token_button
+          end
+
+          view 'app/views/shared/deploy_tokens/_new_deploy_token.html.haml' do
+            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_field, name)
+          end
+
+          def fill_token_expires_at(expires_at)
+            fill_element(:deploy_token_expires_at_field, expires_at.to_s + "\n")
+          end
+
+          def fill_scopes(read_repository: false, read_registry: false, read_package_registry: false, write_package_registry: false )
+            check_element(:deploy_token_read_repository_checkbox) if read_repository
+            check_element(:deploy_token_read_package_registry_checkbox) if read_package_registry
+            check_element(:deploy_token_read_registry_checkbox) if read_registry
+            check_element(:deploy_token_write_package_registry_checkbox) if write_package_registry
+          end
+
+          def add_token
+            click_element(:create_deploy_token_button)
+          end
+
+          def token_username
+            within_new_project_deploy_token do
+              find_element(:deploy_token_user_field).value
+            end
+          end
+
+          def token_password
+            within_new_project_deploy_token do
+              find_element(:deploy_token_field).value
+            end
+          end
+
+          private
+
+          def within_new_project_deploy_token
+            has_element?(:created_deploy_token_container, wait: QA::Support::Repeater::DEFAULT_MAX_WAIT_TIME)
+
+            within_element(:created_deploy_token_container) do
+              yield
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/page/group/settings/repository.rb b/qa/qa/page/group/settings/repository.rb
new file mode 100644
index 00000000000..2cc80ef26c6
--- /dev/null
+++ b/qa/qa/page/group/settings/repository.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module QA
+  module Page
+    module Group
+      module Settings
+        class Repository < Page::Base
+          include QA::Page::Settings::Common
+
+          view 'app/views/shared/deploy_tokens/_index.html.haml' do
+            element :deploy_tokens_settings_content
+          end
+
+          def expand_deploy_tokens(&block)
+            expand_content(:deploy_tokens_settings_content) do
+              Settings::GroupDeployTokens.perform(&block)
+            end
+          end
+        end
+      end
+    end
+  end
+end