diff options
Diffstat (limited to 'qa/qa/specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb')
-rw-r--r-- | qa/qa/specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/qa/qa/specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb index c136d14c1e5..15d51c14d26 100644 --- a/qa/qa/specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb +++ b/qa/qa/specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb @@ -4,17 +4,16 @@ module QA RSpec.describe 'Manage', :requires_admin do describe 'Bulk group import' do let!(:staging?) { Runtime::Scenario.gitlab_address.include?('staging.gitlab.com') } - - let(:admin_api_client) { Runtime::API::Client.as_admin } - let(:user) do + let!(:admin_api_client) { Runtime::API::Client.as_admin } + let!(:user) do Resource::User.fabricate_via_api! do |usr| usr.api_client = admin_api_client usr.hard_delete_on_api_removal = true end end - let(:api_client) { Runtime::API::Client.new(user: user) } - let(:personal_access_token) { api_client.personal_access_token } + let!(:api_client) { Runtime::API::Client.new(user: user) } + let!(:personal_access_token) { api_client.personal_access_token } let(:sandbox) do Resource::Sandbox.fabricate_via_api! do |group| @@ -23,7 +22,7 @@ module QA end let(:source_group) do - Resource::Sandbox.fabricate_via_api! do |group| + Resource::Sandbox.fabricate! do |group| group.api_client = api_client group.path = "source-group-for-import-#{SecureRandom.hex(4)}" end @@ -38,14 +37,12 @@ module QA end before do - Runtime::Feature.enable(:top_level_group_creation_enabled) if staging? - sandbox.add_member(user, Resource::Members::AccessLevel::MAINTAINER) - # create groups explicitly before connecting gitlab instance + Flow::Login.sign_in(as: user) + source_group - Flow::Login.sign_in(as: user) Page::Main::Menu.perform(&:go_to_create_group) Page::Group::New.perform do |group| group.switch_to_import_tab @@ -53,6 +50,10 @@ module QA end end + after do + user.remove_via_api! + end + it( 'imports group from UI', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1806', @@ -72,12 +73,6 @@ module QA end end end - - after do - user.remove_via_api! - ensure - Runtime::Feature.disable(:top_level_group_creation_enabled) if staging? - end end end end |