Commit e21213af authored by Mark Lapierre's avatar Mark Lapierre

Merge branch 'acunskis-redundant-methods' into 'master'

E2E: Remove redundant staging checks from epics import spec

See merge request gitlab-org/gitlab!68525
parents 9cacc5c3 6a9217a7
...@@ -4,8 +4,6 @@ module QA ...@@ -4,8 +4,6 @@ module QA
# Do not run on staging since another top level group has to be created which doesn't have premium license # Do not run on staging since another top level group has to be created which doesn't have premium license
RSpec.describe 'Manage', :requires_admin, except: { subdomain: :staging } do RSpec.describe 'Manage', :requires_admin, except: { subdomain: :staging } do
describe 'Bulk group import' 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(:admin_api_client) { Runtime::API::Client.as_admin }
let(:api_client) { Runtime::API::Client.new(user: user) } let(:api_client) { Runtime::API::Client.new(user: user) }
let(:author_api_client) { Runtime::API::Client.new(user: author) } let(:author_api_client) { Runtime::API::Client.new(user: author) }
...@@ -58,8 +56,7 @@ module QA ...@@ -58,8 +56,7 @@ module QA
end end
before do before do
Runtime::Feature.enable(:bulk_import) unless staging? Runtime::Feature.enable(:bulk_import)
Runtime::Feature.enable(:top_level_group_creation_enabled) if staging?
sandbox.add_member(user, Resource::Members::AccessLevel::MAINTAINER) sandbox.add_member(user, Resource::Members::AccessLevel::MAINTAINER)
source_group.add_member(author, Resource::Members::AccessLevel::MAINTAINER) source_group.add_member(author, Resource::Members::AccessLevel::MAINTAINER)
...@@ -87,8 +84,7 @@ module QA ...@@ -87,8 +84,7 @@ module QA
user.remove_via_api! user.remove_via_api!
author.remove_via_api! author.remove_via_api!
ensure ensure
Runtime::Feature.disable(:bulk_import) unless staging? Runtime::Feature.disable(:bulk_import)
Runtime::Feature.disable(:top_level_group_creation_enabled) if staging?
end end
it 'imports group epics', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1874' do it 'imports group epics', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1874' do
......
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