Rename SSL to TLS
This commit is contained in:
parent
d67be3aa20
commit
f49034ba49
|
@ -80,8 +80,8 @@ Naming/FileName:
|
||||||
- 'locale/unfound_translations.rb'
|
- 'locale/unfound_translations.rb'
|
||||||
- 'ee/locale/unfound_translations.rb'
|
- 'ee/locale/unfound_translations.rb'
|
||||||
- 'ee/lib/generators/**/*'
|
- 'ee/lib/generators/**/*'
|
||||||
- 'qa/qa/scenario/test/integration/ldap_no_ssl.rb'
|
- 'qa/qa/scenario/test/integration/ldap_no_tls.rb'
|
||||||
- 'qa/qa/scenario/test/integration/ldap_ssl.rb'
|
- 'qa/qa/scenario/test/integration/ldap_tls.rb'
|
||||||
|
|
||||||
IgnoreExecutableScripts: true
|
IgnoreExecutableScripts: true
|
||||||
AllowedAcronyms:
|
AllowedAcronyms:
|
||||||
|
|
4
qa/qa.rb
4
qa/qa.rb
|
@ -100,8 +100,8 @@ module QA
|
||||||
|
|
||||||
module Integration
|
module Integration
|
||||||
autoload :Github, 'qa/scenario/test/integration/github'
|
autoload :Github, 'qa/scenario/test/integration/github'
|
||||||
autoload :LDAPNoSSL, 'qa/scenario/test/integration/ldap_no_ssl'
|
autoload :LDAPNoTLS, 'qa/scenario/test/integration/ldap_no_tls'
|
||||||
autoload :LDAPSSL, 'qa/scenario/test/integration/ldap_ssl'
|
autoload :LDAPTLS, 'qa/scenario/test/integration/ldap_tls'
|
||||||
autoload :InstanceSAML, 'qa/scenario/test/integration/instance_saml'
|
autoload :InstanceSAML, 'qa/scenario/test/integration/instance_saml'
|
||||||
autoload :Kubernetes, 'qa/scenario/test/integration/kubernetes'
|
autoload :Kubernetes, 'qa/scenario/test/integration/kubernetes'
|
||||||
autoload :Mattermost, 'qa/scenario/test/integration/mattermost'
|
autoload :Mattermost, 'qa/scenario/test/integration/mattermost'
|
||||||
|
|
|
@ -2,8 +2,8 @@ module QA
|
||||||
module Scenario
|
module Scenario
|
||||||
module Test
|
module Test
|
||||||
module Integration
|
module Integration
|
||||||
class LDAPNoSSL < Test::Instance::All
|
class LDAPNoTLS < Test::Instance::All
|
||||||
tags :ldap_no_ssl
|
tags :ldap_no_tls
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
|
@ -2,8 +2,8 @@ module QA
|
||||||
module Scenario
|
module Scenario
|
||||||
module Test
|
module Test
|
||||||
module Integration
|
module Integration
|
||||||
class LDAPSSL < Test::Instance::All
|
class LDAPTLS < Test::Instance::All
|
||||||
tags :ldap_ssl
|
tags :ldap_tls
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
|
@ -1,7 +1,7 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
module QA
|
module QA
|
||||||
context 'Manage', :orchestrated, :ldap_no_ssl, :ldap_ssl do
|
context 'Manage', :orchestrated, :ldap_no_tls, :ldap_tls do
|
||||||
describe 'LDAP login' do
|
describe 'LDAP login' do
|
||||||
it 'user logs into GitLab using LDAP credentials' do
|
it 'user logs into GitLab using LDAP credentials' do
|
||||||
Runtime::Browser.visit(:gitlab, Page::Main::Login)
|
Runtime::Browser.visit(:gitlab, Page::Main::Login)
|
||||||
|
|
|
@ -22,7 +22,7 @@ module QA
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'Manage', :orchestrated, :ldap_no_ssl, :skip_signup_disabled do
|
context 'Manage', :orchestrated, :ldap_no_tls, :skip_signup_disabled do
|
||||||
describe 'while LDAP is enabled' do
|
describe 'while LDAP is enabled' do
|
||||||
it_behaves_like 'registration and login'
|
it_behaves_like 'registration and login'
|
||||||
end
|
end
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
module QA
|
module QA
|
||||||
context 'Create' do
|
context 'Create' do
|
||||||
describe 'Git clone over HTTP', :ldap_no_ssl do
|
describe 'Git clone over HTTP', :ldap_no_tls do
|
||||||
let(:location) do
|
let(:location) do
|
||||||
Page::Project::Show.act do
|
Page::Project::Show.act do
|
||||||
choose_repository_clone_http
|
choose_repository_clone_http
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
module QA
|
module QA
|
||||||
context 'Create' do
|
context 'Create' do
|
||||||
describe 'Git push over HTTP', :ldap_no_ssl do
|
describe 'Git push over HTTP', :ldap_no_tls do
|
||||||
it 'user pushes code to the repository' do
|
it 'user pushes code to the repository' do
|
||||||
Runtime::Browser.visit(:gitlab, Page::Main::Login)
|
Runtime::Browser.visit(:gitlab, Page::Main::Login)
|
||||||
Page::Main::Login.act { sign_in_using_credentials }
|
Page::Main::Login.act { sign_in_using_credentials }
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
module QA
|
module QA
|
||||||
context 'Create' do
|
context 'Create' do
|
||||||
describe 'Protected branch support', :ldap_no_ssl do
|
describe 'Protected branch support', :ldap_no_tls do
|
||||||
let(:branch_name) { 'protected-branch' }
|
let(:branch_name) { 'protected-branch' }
|
||||||
let(:commit_message) { 'Protected push commit message' }
|
let(:commit_message) { 'Protected push commit message' }
|
||||||
let(:project) do
|
let(:project) do
|
||||||
|
|
|
@ -1,17 +1,17 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
describe QA::Scenario::Test::Integration::LDAPNoSSL do
|
describe QA::Scenario::Test::Integration::LDAPNoTLS do
|
||||||
context '#perform' do
|
context '#perform' do
|
||||||
it_behaves_like 'a QA scenario class' do
|
it_behaves_like 'a QA scenario class' do
|
||||||
let(:tags) { [:ldap_no_ssl] }
|
let(:tags) { [:ldap_no_tls] }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe QA::Scenario::Test::Integration::LDAPSSL do
|
describe QA::Scenario::Test::Integration::LDAPTLS do
|
||||||
context '#perform' do
|
context '#perform' do
|
||||||
it_behaves_like 'a QA scenario class' do
|
it_behaves_like 'a QA scenario class' do
|
||||||
let(:tags) { [:ldap_ssl] }
|
let(:tags) { [:ldap_tls] }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue