diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-10-26 15:59:49 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-10-26 15:59:49 +0000 |
| commit | 1815aa561ac1428cd183a8dc5c662299f9fd19e2 (patch) | |
| tree | 4f09dedcff41772da1709feb6323e8d4195b1979 /qa/qa.rb | |
| parent | b77ef97b347627a4063500c03b5eac12478d0c4a (diff) | |
| parent | 83d64ed40c95c912c5d4c0f6e7d3d23bf7489053 (diff) | |
| download | gitlab-ce-1815aa561ac1428cd183a8dc5c662299f9fd19e2.tar.gz | |
Merge branch 'qa-59-ldap-ssl-scenario' into 'master'
E2E Test - LDAP login with SSL
Closes gitlab-qa#59
See merge request gitlab-org/gitlab-ce!22574
Diffstat (limited to 'qa/qa.rb')
| -rw-r--r-- | qa/qa.rb | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -99,7 +99,8 @@ module QA module Integration autoload :Github, 'qa/scenario/test/integration/github' - autoload :LDAP, 'qa/scenario/test/integration/ldap' + autoload :LDAPNoTLS, 'qa/scenario/test/integration/ldap_no_tls' + autoload :LDAPTLS, 'qa/scenario/test/integration/ldap_tls' autoload :InstanceSAML, 'qa/scenario/test/integration/instance_saml' autoload :Kubernetes, 'qa/scenario/test/integration/kubernetes' autoload :Mattermost, 'qa/scenario/test/integration/mattermost' |