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

10 files changed, 37 insertions, 10 deletions

diff --git a/.rubocop.yml b/.rubocop.yml
index 5d2c5c7cf49..a95ded8af1c 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -81,6 +81,9 @@ Naming/FileName:
     - 'locale/unfound_translations.rb'
     - 'ee/locale/unfound_translations.rb'
     - 'ee/lib/generators/**/*'
+    - 'qa/qa/scenario/test/integration/ldap_no_tls.rb'
+    - 'qa/qa/scenario/test/integration/ldap_tls.rb'
+
   IgnoreExecutableScripts: true
   AllowedAcronyms:
     - EE
diff --git a/qa/qa.rb b/qa/qa.rb
index f760dd972a7..968687dab67 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -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'
diff --git a/qa/qa/scenario/test/integration/ldap_no_tls.rb b/qa/qa/scenario/test/integration/ldap_no_tls.rb
new file mode 100644
index 00000000000..bbf4c847f33
--- /dev/null
+++ b/qa/qa/scenario/test/integration/ldap_no_tls.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module QA
+  module Scenario
+    module Test
+      module Integration
+        class LDAPNoTLS < Test::Instance::All
+          tags :ldap_no_tls
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/scenario/test/integration/ldap.rb b/qa/qa/scenario/test/integration/ldap_tls.rb
index 769fa389785..2a767e57bc6 100644
--- a/qa/qa/scenario/test/integration/ldap.rb
+++ b/qa/qa/scenario/test/integration/ldap_tls.rb
@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module QA
   module Scenario
     module Test
       module Integration
-        class LDAP < Test::Instance::All
-          tags :ldap
+        class LDAPTLS < Test::Instance::All
+          tags :ldap_tls
         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..a397df03bd2 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_no_tls, :ldap_tls do
     describe 'LDAP login' do
       it 'user logs into GitLab using LDAP credentials' do
         Runtime::Browser.visit(:gitlab, Page::Main::Login)
diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb
index 45cb5df8252..44071ec3e45 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb
@@ -22,7 +22,7 @@ module QA
     end
   end
 
-  context 'Manage', :orchestrated, :ldap, :skip_signup_disabled do
+  context 'Manage', :orchestrated, :ldap_no_tls, :skip_signup_disabled do
     describe 'while LDAP is enabled' do
       it_behaves_like 'registration and login'
     end
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/clone_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/clone_spec.rb
index 9c64a9a3439..b18dee53cbc 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/clone_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/clone_spec.rb
@@ -2,7 +2,7 @@
 
 module QA
   context 'Create' do
-    describe 'Git clone over HTTP', :ldap do
+    describe 'Git clone over HTTP', :ldap_no_tls do
       let(:location) do
         Page::Project::Show.act do
           choose_repository_clone_http
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb
index b9bed39662f..2f63a07e0c3 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb
@@ -2,7 +2,7 @@
 
 module QA
   context 'Create' do
-    describe 'Git push over HTTP', :ldap do
+    describe 'Git push over HTTP', :ldap_no_tls do
       it 'user pushes code to the repository'  do
         Runtime::Browser.visit(:gitlab, Page::Main::Login)
         Page::Main::Login.act { sign_in_using_credentials }
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb
index 5f42cb00bd3..ac71cf52b6f 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb
@@ -2,7 +2,7 @@
 
 module QA
   context 'Create' do
-    describe 'Protected branch support', :ldap do
+    describe 'Protected branch support', :ldap_no_tls do
       let(:branch_name) { 'protected-branch' }
       let(:commit_message) { 'Protected push commit message' }
       let(:project) do
diff --git a/qa/spec/scenario/test/integration/ldap_spec.rb b/qa/spec/scenario/test/integration/ldap_spec.rb
index 198856aec3f..b6d798bf504 100644
--- a/qa/spec/scenario/test/integration/ldap_spec.rb
+++ b/qa/spec/scenario/test/integration/ldap_spec.rb
@@ -1,9 +1,17 @@
 # frozen_string_literal: true
 
-describe QA::Scenario::Test::Integration::LDAP do
+describe QA::Scenario::Test::Integration::LDAPNoTLS do
   context '#perform' do
     it_behaves_like 'a QA scenario class' do
-      let(:tags) { [:ldap] }
+      let(:tags) { [:ldap_no_tls] }
+    end
+  end
+end
+
+describe QA::Scenario::Test::Integration::LDAPTLS do
+  context '#perform' do
+    it_behaves_like 'a QA scenario class' do
+      let(:tags) { [:ldap_tls] }
     end
   end
 end