summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSanad Liaquat <sliaquat@gitlab.com>2018-10-24 13:45:09 +0500
committerSanad Liaquat <sliaquat@gitlab.com>2018-10-24 13:45:09 +0500
commit38a6ecbe3ef69273dd05d79947c5422f76aa21e4 (patch)
treee00c844e6f68081c304b070767651cbd48b359b6
parent76dadad6e51d49dd946d526cab5b8bf0133052bc (diff)
downloadgitlab-ce-38a6ecbe3ef69273dd05d79947c5422f76aa21e4.tar.gz
Added ldap_ssl tag to existing test
-rw-r--r--qa/qa.rb1
-rw-r--r--qa/qa/scenario/test/integration/ldap_ssl.rb11
-rw-r--r--qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb2
3 files changed, 13 insertions, 1 deletions
diff --git a/qa/qa.rb b/qa/qa.rb
index 36a37dbb270..1d85b2c96e7 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -101,6 +101,7 @@ module QA
module Integration
autoload :Github, 'qa/scenario/test/integration/github'
autoload :LDAP, 'qa/scenario/test/integration/ldap'
+ autoload :LDAPSSL, 'qa/scenario/test/integration/ldap_ssl'
autoload :InstanceSAML, 'qa/scenario/test/integration/instance_saml'
autoload :Kubernetes, 'qa/scenario/test/integration/kubernetes'
autoload :Mattermost, 'qa/scenario/test/integration/mattermost'
diff --git a/qa/qa/scenario/test/integration/ldap_ssl.rb b/qa/qa/scenario/test/integration/ldap_ssl.rb
new file mode 100644
index 00000000000..5b6286cd336
--- /dev/null
+++ b/qa/qa/scenario/test/integration/ldap_ssl.rb
@@ -0,0 +1,11 @@
+module QA
+ module Scenario
+ module Test
+ module Integration
+ class LDAPSSL < Test::Instance::All
+ tags :ldap_ssl
+ end
+ end
+ end
+ end
+end
diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb
index eb9e0297287..e041b312a4a 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
module QA
- context 'Manage', :orchestrated, :ldap do
+ context 'Manage', :orchestrated, :ldap, :ldap_ssl do
describe 'LDAP login' do
it 'user logs into GitLab using LDAP credentials' do
Runtime::Browser.visit(:gitlab, Page::Main::Login)