Commit 7983c798 authored by Sanad Liaquat's avatar Sanad Liaquat
Browse files

Renamed to ldap_no_ssl and ldap_ssl

parent 38a6ecbe
......@@ -100,7 +100,7 @@ module Instance
module Integration
autoload :Github, 'qa/scenario/test/integration/github'
autoload :LDAP, 'qa/scenario/test/integration/ldap'
autoload :LDAPNoSSL, 'qa/scenario/test/integration/ldap_no_ssl'
autoload :LDAPSSL, 'qa/scenario/test/integration/ldap_ssl'
autoload :InstanceSAML, 'qa/scenario/test/integration/instance_saml'
autoload :Kubernetes, 'qa/scenario/test/integration/kubernetes'
......
......@@ -2,8 +2,8 @@ module QA
module Scenario
module Test
module Integration
class LDAP < Test::Instance::All
tags :ldap
class LDAPNoSSL < Test::Instance::All
tags :ldap_no_ssl
end
end
end
......
# frozen_string_literal: true
module QA
context 'Manage', :orchestrated, :ldap, :ldap_ssl do
context 'Manage', :orchestrated, :ldap_no_ssl, :ldap_ssl 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_ssl, :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_ssl 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_ssl 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_ssl 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::LDAPNoSSL do
context '#perform' do
it_behaves_like 'a QA scenario class' do
let(:tags) { [:ldap] }
let(:tags) { [:ldap_no_ssl] }
end
end
end
describe QA::Scenario::Test::Integration::LDAPSSL do
context '#perform' do
it_behaves_like 'a QA scenario class' do
let(:tags) { [:ldap_ssl] }
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