From 35617454bb69de83d0e047149357d71c236305dc Mon Sep 17 00:00:00 2001
From: Harsha Muralidhar <hmuralidhar@gitlab.com>
Date: Wed, 14 Feb 2024 05:39:17 +0000
Subject: [PATCH] Dequarantine and add tag to exclude from airgapped
---
.../10_govern/login/register_spec.rb | 28 +++++--------------
1 file changed, 7 insertions(+), 21 deletions(-)
diff --git a/qa/qa/specs/features/browser_ui/10_govern/login/register_spec.rb b/qa/qa/specs/features/browser_ui/10_govern/login/register_spec.rb
index 7ff6e484b1eca..c9a7d0a914f4a 100644
--- a/qa/qa/specs/features/browser_ui/10_govern/login/register_spec.rb
+++ b/qa/qa/specs/features/browser_ui/10_govern/login/register_spec.rb
@@ -17,12 +17,7 @@ module QA
RSpec.describe 'Govern', :skip_signup_disabled, :requires_admin, product_group: :authentication do
describe 'while LDAP is enabled', :orchestrated, :ldap_no_tls,
- testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347934',
- quarantine: {
- only: { job: 'airgapped' },
- issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/414247',
- type: :investigating
- } do
+ testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347934' do
let!(:personal_access_token) { Runtime::Env.personal_access_token }
before do
@@ -48,13 +43,9 @@ module QA
it_behaves_like 'registration and login'
end
- describe 'standard', :reliable, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347867' do
- context 'when admin approval is not required',
- quarantine: {
- only: { job: 'airgapped' },
- issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/414247',
- type: :investigating
- } do
+ describe 'standard', :reliable, :external_api_calls,
+ testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347867' do
+ context 'when admin approval is not required' do
before(:all) do
set_require_admin_approval_after_user_signup(false)
end
@@ -96,7 +87,7 @@ module QA
end
end
- it 'allows recreating with same credentials', :reliable,
+ it 'allows recreating with same credentials', :reliable, :external_api_calls,
testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347868' do
expect(Page::Main::Menu.perform(&:signed_in?)).to be_falsy
@@ -111,13 +102,8 @@ module QA
end
end
- context 'when admin approval is required',
- testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347871',
- quarantine: {
- only: { job: 'airgapped' },
- issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/414247',
- type: :investigating
- } do
+ context 'when admin approval is required', :external_api_calls,
+ testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347871' do
let(:signed_up_waiting_approval_text) do
'You have signed up successfully. However, we could not sign you in because your account ' \
'is awaiting approval from your GitLab administrator.'
--
GitLab