Skip to content
代码片段 群组 项目
未验证 提交 ff1c04d4 编辑于 作者: Andrejs Cunskis's avatar Andrejs Cunskis 提交者: GitLab
浏览文件

Merge branch 'hm-dequarantine-login-register-spec' into 'master'

Dequarantine and add tag to exclude from airgapped

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/144698



Merged-by: default avatarAndrejs Cunskis <acunskis@gitlab.com>
Approved-by: default avatarAndrejs Cunskis <acunskis@gitlab.com>
Co-authored-by: default avatarhmuralidhar <hmuralidhar@gitlab.com>
No related branches found
No related tags found
无相关合并请求
...@@ -17,12 +17,7 @@ module QA ...@@ -17,12 +17,7 @@ module QA
RSpec.describe 'Govern', :skip_signup_disabled, :requires_admin, product_group: :authentication do RSpec.describe 'Govern', :skip_signup_disabled, :requires_admin, product_group: :authentication do
describe 'while LDAP is enabled', :orchestrated, :ldap_no_tls, describe 'while LDAP is enabled', :orchestrated, :ldap_no_tls,
testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347934', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347934' do
quarantine: {
only: { job: 'airgapped' },
issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/414247',
type: :investigating
} do
let!(:personal_access_token) { Runtime::Env.personal_access_token } let!(:personal_access_token) { Runtime::Env.personal_access_token }
before do before do
...@@ -48,13 +43,9 @@ module QA ...@@ -48,13 +43,9 @@ module QA
it_behaves_like 'registration and login' it_behaves_like 'registration and login'
end end
describe 'standard', :reliable, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347867' do describe 'standard', :reliable, :external_api_calls,
context 'when admin approval is not required', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347867' do
quarantine: { context 'when admin approval is not required' do
only: { job: 'airgapped' },
issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/414247',
type: :investigating
} do
before(:all) do before(:all) do
set_require_admin_approval_after_user_signup(false) set_require_admin_approval_after_user_signup(false)
end end
...@@ -96,7 +87,7 @@ module QA ...@@ -96,7 +87,7 @@ module QA
end end
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 testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347868' do
expect(Page::Main::Menu.perform(&:signed_in?)).to be_falsy expect(Page::Main::Menu.perform(&:signed_in?)).to be_falsy
...@@ -111,13 +102,8 @@ module QA ...@@ -111,13 +102,8 @@ module QA
end end
end end
context 'when admin approval is required', context 'when admin approval is required', :external_api_calls,
testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347871', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347871' do
quarantine: {
only: { job: 'airgapped' },
issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/414247',
type: :investigating
} do
let(:signed_up_waiting_approval_text) do let(:signed_up_waiting_approval_text) do
'You have signed up successfully. However, we could not sign you in because your account ' \ 'You have signed up successfully. However, we could not sign you in because your account ' \
'is awaiting approval from your GitLab administrator.' 'is awaiting approval from your GitLab administrator.'
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册