Merge branch 'master' of https://gitlab.com/filipefreire/gitlab-ce into filipefreire_155

3 files changed, 82 insertions, 1 deletions

diff --git a/qa/qa/factory/resource/deploy_key.rb b/qa/qa/factory/resource/deploy_key.rb
index 7c58e70bcc4..ff0b4a46b77 100644
--- a/qa/qa/factory/resource/deploy_key.rb
+++ b/qa/qa/factory/resource/deploy_key.rb
@@ -4,6 +4,18 @@ module QA
       class DeployKey < Factory::Base
         attr_accessor :title, :key
 
+        product :title do
+          Page::Project::Settings::Repository.act do
+            expand_deploy_keys(&:key_title)
+          end
+        end
+
+        product :fingerprint do
+          Page::Project::Settings::Repository.act do
+            expand_deploy_keys(&:key_fingerprint)
+          end
+        end
+
         dependency Factory::Resource::Project, as: :project do |project|
           project.name = 'project-to-deploy'
           project.description = 'project for adding deploy key test'
@@ -13,7 +25,7 @@ module QA
           project.visit!
 
           Page::Menu::Side.act do
-            click_repository_setting
+            click_repository_settings
           end
 
           Page::Project::Settings::Repository.perform do |setting|
diff --git a/qa/qa/factory/resource/personal_access_token.rb b/qa/qa/factory/resource/personal_access_token.rb
new file mode 100644
index 00000000000..514e3615d18
--- /dev/null
+++ b/qa/qa/factory/resource/personal_access_token.rb
@@ -0,0 +1,27 @@
+module QA
+  module Factory
+    module Resource
+      ##
+      # Create a personal access token that can be used by the api
+      #
+      class PersonalAccessToken < Factory::Base
+        attr_accessor :name
+
+        product :access_token do
+          Page::Profile::PersonalAccessTokens.act { created_access_token }
+        end
+
+        def fabricate!
+          Page::Menu::Main.act { go_to_profile_settings }
+          Page::Menu::Profile.act { click_access_tokens }
+
+          Page::Profile::PersonalAccessTokens.perform do |page|
+            page.fill_token_name(name || 'api-test-token')
+            page.check_api
+            page.create_token
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/factory/resource/runner.rb b/qa/qa/factory/resource/runner.rb
new file mode 100644
index 00000000000..5f37f8ac2e9
--- /dev/null
+++ b/qa/qa/factory/resource/runner.rb
@@ -0,0 +1,42 @@
+require 'securerandom'
+
+module QA
+  module Factory
+    module Resource
+      class Runner < Factory::Base
+        attr_writer :name, :tags
+
+        dependency Factory::Resource::Project, as: :project do |project|
+          project.name = 'project-with-ci-cd'
+          project.description = 'Project with CI/CD Pipelines'
+        end
+
+        def name
+          @name || "qa-runner-#{SecureRandom.hex(4)}"
+        end
+
+        def tags
+          @tags || %w[qa e2e]
+        end
+
+        def fabricate!
+          project.visit!
+
+          Page::Menu::Side.act { click_ci_cd_settings }
+
+          Service::Runner.new(name).tap do |runner|
+            Page::Project::Settings::CICD.perform do |settings|
+              settings.expand_runners_settings do |runners|
+                runner.pull
+                runner.token = runners.registration_token
+                runner.address = runners.coordinator_address
+                runner.tags = tags
+                runner.register!
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end