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 faaaf3dabb6218714ef9a197331be8e7883154b5..6b22a7f6eeccab7ed1a1d8b0d5af88641b147614 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 @@ -2,12 +2,7 @@ module QA RSpec.shared_examples 'registration and login' do - it 'allows the user to register and login', - quarantine: { - only: { job: 'airgapped' }, - issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/414247', - type: :investigating - } do + it 'allows the user to register and login' do Runtime::Browser.visit(:gitlab, Page::Main::Login) Resource::User.fabricate_via_browser_ui! do |user_resource| @@ -22,7 +17,12 @@ module QA RSpec.describe 'Manage', :skip_signup_disabled, :requires_admin, product_group: :authentication_and_authorization do describe 'while LDAP is enabled', :orchestrated, :ldap_no_tls, - testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347934' do + 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 before do # When LDAP is enabled, a previous test might have created a token for the LDAP 'tanuki' user who is not an admin # So we need to set it to nil in order to create a new token for admin user so that we are able to set_application_settings @@ -48,7 +48,12 @@ module QA end describe 'standard', :reliable, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347867' do - context 'when admin approval is not required' do + context 'when admin approval is not required', + quarantine: { + only: { job: 'airgapped' }, + issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/414247', + type: :investigating + } do before(:all) do set_require_admin_approval_after_user_signup(false) end @@ -80,12 +85,7 @@ module QA end it 'allows recreating with same credentials', :reliable, - testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347868', - 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/347868' do expect(Page::Main::Menu.perform(&:signed_in?)).to be_falsy Flow::Login.sign_in(as: user, skip_page_validation: true) @@ -107,7 +107,13 @@ def admin_api_client end end - context 'when admin approval is required' do + 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 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.' end @@ -131,13 +137,7 @@ def admin_api_client set_require_admin_approval_after_user_signup(false) end - it 'allows user login after approval', - 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 + it 'allows user login after approval' do user # sign up user expect(page).to have_text(signed_up_waiting_approval_text)