summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.rubocop.yml4
-rw-r--r--qa/qa.rb4
-rw-r--r--qa/qa/scenario/test/integration/ldap_no_tls.rb (renamed from qa/qa/scenario/test/integration/ldap_no_ssl.rb)4
-rw-r--r--qa/qa/scenario/test/integration/ldap_tls.rb (renamed from qa/qa/scenario/test/integration/ldap_ssl.rb)4
-rw-r--r--qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb2
-rw-r--r--qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb2
-rw-r--r--qa/qa/specs/features/browser_ui/3_create/repository/clone_spec.rb2
-rw-r--r--qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb2
-rw-r--r--qa/qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb2
-rw-r--r--qa/spec/scenario/test/integration/ldap_spec.rb8
10 files changed, 17 insertions, 17 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 0afe7367b83..dd2d836faae 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -80,8 +80,8 @@ Naming/FileName:
- 'locale/unfound_translations.rb'
- 'ee/locale/unfound_translations.rb'
- 'ee/lib/generators/**/*'
- - 'qa/qa/scenario/test/integration/ldap_no_ssl.rb'
- - 'qa/qa/scenario/test/integration/ldap_ssl.rb'
+ - 'qa/qa/scenario/test/integration/ldap_no_tls.rb'
+ - 'qa/qa/scenario/test/integration/ldap_tls.rb'
IgnoreExecutableScripts: true
AllowedAcronyms:
diff --git a/qa/qa.rb b/qa/qa.rb
index 437ce59eef2..a22a91f8146 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -100,8 +100,8 @@ module QA
module Integration
autoload :Github, 'qa/scenario/test/integration/github'
- autoload :LDAPNoSSL, 'qa/scenario/test/integration/ldap_no_ssl'
- autoload :LDAPSSL, 'qa/scenario/test/integration/ldap_ssl'
+ 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_ssl.rb b/qa/qa/scenario/test/integration/ldap_no_tls.rb
index 581feb59431..3ecc5ccf208 100644
--- a/qa/qa/scenario/test/integration/ldap_no_ssl.rb
+++ b/qa/qa/scenario/test/integration/ldap_no_tls.rb
@@ -2,8 +2,8 @@ module QA
module Scenario
module Test
module Integration
- class LDAPNoSSL < Test::Instance::All
- tags :ldap_no_ssl
+ class LDAPNoTLS < Test::Instance::All
+ tags :ldap_no_tls
end
end
end
diff --git a/qa/qa/scenario/test/integration/ldap_ssl.rb b/qa/qa/scenario/test/integration/ldap_tls.rb
index 5b6286cd336..40d6e4b5b3d 100644
--- a/qa/qa/scenario/test/integration/ldap_ssl.rb
+++ b/qa/qa/scenario/test/integration/ldap_tls.rb
@@ -2,8 +2,8 @@ module QA
module Scenario
module Test
module Integration
- class LDAPSSL < Test::Instance::All
- tags :ldap_ssl
+ 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 92a86569349..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_no_ssl, :ldap_ssl 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 7f9beeec46e..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_no_ssl, :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 5ff35b01783..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_no_ssl 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 09679db5cfb..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_no_ssl 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 8998154dbfd..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_no_ssl 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 9019c6562b6..b6d798bf504 100644
--- a/qa/spec/scenario/test/integration/ldap_spec.rb
+++ b/qa/spec/scenario/test/integration/ldap_spec.rb
@@ -1,17 +1,17 @@
# frozen_string_literal: true
-describe QA::Scenario::Test::Integration::LDAPNoSSL do
+describe QA::Scenario::Test::Integration::LDAPNoTLS do
context '#perform' do
it_behaves_like 'a QA scenario class' do
- let(:tags) { [:ldap_no_ssl] }
+ let(:tags) { [:ldap_no_tls] }
end
end
end
-describe QA::Scenario::Test::Integration::LDAPSSL do
+describe QA::Scenario::Test::Integration::LDAPTLS do
context '#perform' do
it_behaves_like 'a QA scenario class' do
- let(:tags) { [:ldap_ssl] }
+ let(:tags) { [:ldap_tls] }
end
end
end
View Lorry Controller Status