Commit 1815aa56 authored by Stan Hu's avatar Stan Hu

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
parents b77ef97b 83d64ed4
......@@ -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
......
......@@ -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'
......
# 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
# 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
......
# 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)
......
......@@ -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
......
......@@ -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
......
......@@ -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 }
......
......@@ -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
......
# 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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment