Add latest changes from gitlab-org/gitlab@master

2 files changed, 38 insertions, 18 deletions

diff --git a/qa/qa/resource/group_deploy_token.rb b/qa/qa/resource/group_deploy_token.rb
index 410a7e6253f..c1d6be6547a 100644
--- a/qa/qa/resource/group_deploy_token.rb
+++ b/qa/qa/resource/group_deploy_token.rb
@@ -4,18 +4,11 @@ module QA
   module Resource
     class GroupDeployToken < Base
       attr_accessor :name, :expires_at
+      attr_writer :scopes
 
-      attribute :username do
-        Page::Group::Settings::Repository.perform do |repository_page|
-          repository_page.expand_deploy_tokens(&:token_username)
-        end
-      end
-
-      attribute :password do
-        Page::Group::Settings::Repository.perform do |repository_page|
-          repository_page.expand_deploy_tokens(&:token_password)
-        end
-      end
+      attribute :id
+      attribute :token
+      attribute :username
 
       attribute :group do
         Group.fabricate! do |resource|
@@ -24,11 +17,33 @@ module QA
         end
       end
 
-      attribute :project do
-        Project.fabricate! do |resource|
-          resource.name = 'project-to-deploy'
-          resource.description = 'project for adding deploy token test'
-        end
+      def fabricate_via_api!
+        super
+      end
+
+      def api_get_path
+        "/groups/#{group.id}/deploy_tokens"
+      end
+
+      def api_post_path
+        api_get_path
+      end
+
+      def api_post_body
+        {
+          name: @name,
+          scopes: @scopes
+        }
+      end
+
+      def api_delete_path
+        "/groups/#{group.id}/deploy_tokens/#{id}"
+      end
+
+      def resource_web_url(resource)
+        super
+      rescue ResourceURLMissingError
+        # this particular resource does not expose a web_url property
       end
 
       def fabricate!
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/nuget_repository_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/nuget_repository_spec.rb
index 0b4825715c1..42d43dac33c 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/nuget_repository_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/nuget_repository_spec.rb
@@ -21,9 +21,14 @@ module QA
       end
 
       let(:group_deploy_token) do
-        Resource::GroupDeployToken.fabricate_via_browser_ui! do |deploy_token|
+        Resource::GroupDeployToken.fabricate_via_api! do |deploy_token|
           deploy_token.name = 'nuget-group-deploy-token'
           deploy_token.group = project.group
+          deploy_token.scopes = %w[
+            read_repository
+            read_package_registry
+            write_package_registry
+          ]
         end
       end
 
@@ -70,7 +75,7 @@ module QA
           when :ci_job_token
             '${CI_JOB_TOKEN}'
           when :group_deploy_token
-            "\"#{group_deploy_token.password}\""
+            "\"#{group_deploy_token.token}\""
           end
         end