summaryrefslogtreecommitdiff
path: root/qa/qa.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-10-11 14:17:51 +0000
committerRémy Coutable <remy@rymai.me>2018-10-11 14:17:51 +0000
commit5b6b2871dfc8f2159103df7f2803459b2cee1647 (patch)
treedd76fd6c88b5f7a9224ff9bbffb8cba5895c0bc5 /qa/qa.rb
parent681df101d0d0c5ba078249dfc840c7f3c0cfab23 (diff)
parent154ce29d05a7f5dc9058b518b889ae98a8833b78 (diff)
downloadgitlab-ce-5b6b2871dfc8f2159103df7f2803459b2cee1647.tar.gz
Merge branch 'qa-257-instance-wide-saml-sso' into 'master'
Instance SAML SSO e2e test Closes gitlab-qa#257 See merge request gitlab-org/gitlab-ce!22271
Diffstat (limited to 'qa/qa.rb')
-rw-r--r--qa/qa.rb13
1 files changed, 13 insertions, 0 deletions
diff --git a/qa/qa.rb b/qa/qa.rb
index a7b40fe08f8..e1737a16622 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -97,6 +97,7 @@ module QA
module Integration
autoload :Github, 'qa/scenario/test/integration/github'
autoload :LDAP, 'qa/scenario/test/integration/ldap'
+ autoload :InstanceSAML, 'qa/scenario/test/integration/instance_saml'
autoload :Kubernetes, 'qa/scenario/test/integration/kubernetes'
autoload :Mattermost, 'qa/scenario/test/integration/mattermost'
autoload :ObjectStorage, 'qa/scenario/test/integration/object_storage'
@@ -302,6 +303,18 @@ module QA
autoload :Config, 'qa/specs/config'
autoload :Runner, 'qa/specs/runner'
end
+
+ ##
+ # Classes that describe the structure of vendor/third party application pages
+ #
+ module Vendor
+ module SAMLIdp
+ module Page
+ autoload :Base, 'qa/vendor/saml_idp/page/base'
+ autoload :Login, 'qa/vendor/saml_idp/page/login'
+ end
+ end
+ end
end
QA::Runtime::Release.extend_autoloads!