diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-18 12:07:58 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-18 12:07:58 +0300 |
| commit | c342fdcb83651ba047ec9fd30264b53a4a0f5626 (patch) | |
| tree | f16b38726eed01e402e987241e6e8b9134775021 /qa | |
| parent | 7134f4d4948700af6a8d477b3fbd43f46471a96b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/qa/resource/group_base.rb | 4 | ||||
| -rw-r--r-- | qa/qa/specs/features/api/1_manage/user_access_termination_spec.rb | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/qa/qa/resource/group_base.rb b/qa/qa/resource/group_base.rb index 889197a0373..bda72703906 100644 --- a/qa/qa/resource/group_base.rb +++ b/qa/qa/resource/group_base.rb @@ -64,10 +64,6 @@ module QA end end - def marked_for_deletion? - reload!.api_response[:marked_for_deletion_on].present? - end - # Get group badges # # @return [Array<QA::Resource::GroupBadge>] diff --git a/qa/qa/specs/features/api/1_manage/user_access_termination_spec.rb b/qa/qa/specs/features/api/1_manage/user_access_termination_spec.rb index fe6c89f4ee4..e518bbfc6f7 100644 --- a/qa/qa/specs/features/api/1_manage/user_access_termination_spec.rb +++ b/qa/qa/specs/features/api/1_manage/user_access_termination_spec.rb @@ -2,7 +2,7 @@ module QA RSpec.describe 'Manage' do - describe 'User', :requires_admin do + describe 'User', :requires_admin, :reliable do before(:all) do admin_api_client = Runtime::API::Client.as_admin |