Commit ffd2b418 authored by Mark Lapierre's avatar Mark Lapierre

Merge branch 'acunskis-fix-group-import-stage' into 'master'

Enable top level group creation for bulk import test

See merge request gitlab-org/gitlab!61592
parents ffb91cfb 03de75e0
# frozen_string_literal: true # frozen_string_literal: true
module QA module QA
RSpec.describe "Manage", :requires_admin do RSpec.describe 'Manage', :requires_admin do
describe "Group bulk import" do describe 'Group bulk import' do
let!(:api_client) { Runtime::API::Client.as_admin } let!(:api_client) { Runtime::API::Client.as_admin }
let!(:user) do let!(:user) do
Resource::User.fabricate_via_api! do |usr| Resource::User.fabricate_via_api! do |usr|
...@@ -52,8 +52,13 @@ module QA ...@@ -52,8 +52,13 @@ module QA
) )
end end
def staging?
Runtime::Scenario.gitlab_address.include?('staging.gitlab.com')
end
before(:all) do before(:all) do
Runtime::Feature.enable(:bulk_import) Runtime::Feature.enable(:bulk_import)
Runtime::Feature.enable(:top_level_group_creation_enabled) if staging?
end end
before do before do
...@@ -66,10 +71,10 @@ module QA ...@@ -66,10 +71,10 @@ module QA
end end
it( it(
"performs bulk group import from another gitlab instance", 'performs bulk group import from another gitlab instance',
testcase: "https://gitlab.com/gitlab-org/quality/testcases/-/issues/1785", testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1785',
# https://gitlab.com/gitlab-org/gitlab/-/issues/330344 # https://gitlab.com/gitlab-org/gitlab/-/issues/330344
exclude: { job: ["ce:relative_url", "ee:relative_url"] } exclude: { job: ['ce:relative_url', 'ee:relative_url'] }
) do ) do
Page::Group::BulkImport.perform do |import_page| Page::Group::BulkImport.perform do |import_page|
import_page.import_group(source_group.path, sandbox.path) import_page.import_group(source_group.path, sandbox.path)
...@@ -88,6 +93,7 @@ module QA ...@@ -88,6 +93,7 @@ module QA
after(:all) do after(:all) do
Runtime::Feature.disable(:bulk_import) Runtime::Feature.disable(:bulk_import)
Runtime::Feature.disable(:top_level_group_creation_enabled) if staging?
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment