summaryrefslogtreecommitdiff
path: root/qa/qa.rb
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2018-01-25 19:52:07 +0800
committerLin Jen-Shin <godfat@godfat.org>2018-01-25 19:52:07 +0800
commit209c4c5e3ef0f6f0fe1c0c0cd2271e450d8790bc (patch)
treea30f215b28095ee4b0d457ee1cb916023fbee139 /qa/qa.rb
parentca7e1058e8d91a01157ac7d9170423e16a732850 (diff)
parentf9b946c1c9756533fd95c8735803d7b54d6dd204 (diff)
downloadgitlab-ce-209c4c5e3ef0f6f0fe1c0c0cd2271e450d8790bc.tar.gz
Merge remote-tracking branch 'upstream/master' into qa-secret-variables-scenario
* upstream/master: (136 commits) Revert "Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'" Add modal for deleting a milestone Revert "Merge branch 'remove-rugged-walk' into 'master'" Resolve "Link to Clusters in Auto DevOps instead of Kubernetes service" Update CHANGELOG.md for 10.4.1 Add a gRPC health check to ensure Gitaly is up Add formatted_data attribute to Git::WikiPage Avoid array indices to fixtures in JS specs Migrate .batch_lfs_pointers to Gitaly Updates `Revert this merge request` text Work around a bug in DatabaseCleaner when using the deletion strategy on MySQL Use the DatabaseCleaner 'deletion' strategy instead of 'truncation' Workaround a recaptcha pop-up that cannot be tested Uses sprite icon to render verified commit badge and uniforms css colors Moves more mr widget components into vue files Adds i18n Adds better test coverage Execute system hooks after-commit when executing project hooks Remove one Spinach job and add one RSpec job Remove callback as we already update accordingly on services Fix typo in `.gitlab-ci.yml` heading Migrate repository bundling to Gitaly ...
Diffstat (limited to 'qa/qa.rb')
-rw-r--r--qa/qa.rb27
1 files changed, 23 insertions, 4 deletions
diff --git a/qa/qa.rb b/qa/qa.rb
index ac082cfe9a0..dfb0594eebe 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -11,6 +11,8 @@ module QA
autoload :Scenario, 'qa/runtime/scenario'
autoload :Browser, 'qa/runtime/browser'
autoload :Env, 'qa/runtime/env'
+ autoload :Address, 'qa/runtime/address'
+ autoload :API, 'qa/runtime/api'
end
##
@@ -27,6 +29,8 @@ module QA
autoload :Project, 'qa/factory/resource/project'
autoload :DeployKey, 'qa/factory/resource/deploy_key'
autoload :SecretVariable, 'qa/factory/resource/secret_variable'
+ autoload :Runner, 'qa/factory/resource/runner'
+ autoload :PersonalAccessToken, 'qa/factory/resource/personal_access_token'
end
module Repository
@@ -47,7 +51,7 @@ module QA
#
autoload :Bootable, 'qa/scenario/bootable'
autoload :Actable, 'qa/scenario/actable'
- autoload :Entrypoint, 'qa/scenario/entrypoint'
+ autoload :Taggable, 'qa/scenario/taggable'
autoload :Template, 'qa/scenario/template'
##
@@ -86,6 +90,7 @@ module QA
autoload :Main, 'qa/page/menu/main'
autoload :Side, 'qa/page/menu/side'
autoload :Admin, 'qa/page/menu/admin'
+ autoload :Profile, 'qa/page/menu/profile'
end
module Dashboard
@@ -105,10 +110,21 @@ module QA
module Settings
autoload :Common, 'qa/page/project/settings/common'
autoload :Repository, 'qa/page/project/settings/repository'
+ autoload :CICD, 'qa/page/project/settings/ci_cd'
autoload :DeployKeys, 'qa/page/project/settings/deploy_keys'
autoload :CICD, 'qa/page/project/settings/cicd'
autoload :SecretVariables, 'qa/page/project/settings/secret_variables'
+ autoload :Runners, 'qa/page/project/settings/runners'
end
+
+ module Pipeline
+ autoload :Index, 'qa/page/project/pipeline/index'
+ autoload :Show, 'qa/page/project/pipeline/show'
+ end
+ end
+
+ module Profile
+ autoload :PersonalAccessTokens, 'qa/page/profile/personal_access_tokens'
end
module Admin
@@ -129,10 +145,13 @@ module QA
end
##
- # Classes describing shell interaction with GitLab
+ # Classes describing services being part of GitLab and how we can interact
+ # with these services, like through the shell.
#
- module Shell
- autoload :Omnibus, 'qa/shell/omnibus'
+ module Service
+ autoload :Shellout, 'qa/service/shellout'
+ autoload :Omnibus, 'qa/service/omnibus'
+ autoload :Runner, 'qa/service/runner'
end
##