Commit 76236248 authored by Sanad Liaquat's avatar Sanad Liaquat

Merge branch 'qa-shl-enable-invite-members-group-modal-at-instance-level' into 'master'

Move enabling of invite members group modal feature flag

See merge request gitlab-org/gitlab!54790
parents 1ee750a7 d1ea3eda
...@@ -5,6 +5,7 @@ module QA ...@@ -5,6 +5,7 @@ module QA
describe 'Add project member' do describe 'Add project member' do
before do before do
Runtime::Feature.enable('vue_project_members_list') Runtime::Feature.enable('vue_project_members_list')
Runtime::Feature.enable(:invite_members_group_modal)
end end
after do after do
Runtime::Feature.disable('vue_project_members_list') Runtime::Feature.disable('vue_project_members_list')
...@@ -19,8 +20,6 @@ module QA ...@@ -19,8 +20,6 @@ module QA
project.name = 'add-member-project' project.name = 'add-member-project'
end end
Runtime::Feature.enable(:invite_members_group_modal)
project.visit! project.visit!
Page::Project::Menu.perform(&:click_members) Page::Project::Menu.perform(&:click_members)
......
...@@ -32,8 +32,7 @@ module QA ...@@ -32,8 +32,7 @@ module QA
end end
before do before do
Runtime::Feature.enable(:invite_members_group_modal, group: source_group_with_members) Runtime::Feature.enable(:invite_members_group_modal)
Runtime::Feature.enable(:invite_members_group_modal, group: target_group_with_project)
source_group_with_members.add_member(maintainer_user, Resource::Members::AccessLevel::MAINTAINER) source_group_with_members.add_member(maintainer_user, Resource::Members::AccessLevel::MAINTAINER)
end end
......
...@@ -6,6 +6,8 @@ module QA ...@@ -6,6 +6,8 @@ module QA
# TODO: Remove :requires_admin meta when the `Runtime::Feature.enable` method call is removed # TODO: Remove :requires_admin meta when the `Runtime::Feature.enable` method call is removed
describe 'using non signed commits', :requires_admin do describe 'using non signed commits', :requires_admin do
before(:context) do before(:context) do
Runtime::Feature.enable(:invite_members_group_modal)
prepare prepare
@file_name_limitation = 'denied_file' @file_name_limitation = 'denied_file'
...@@ -214,8 +216,6 @@ module QA ...@@ -214,8 +216,6 @@ module QA
project.name = 'push_rules' project.name = 'push_rules'
end end
Runtime::Feature.enable(:invite_members_group_modal, project: @project)
Resource::Repository::ProjectPush.fabricate! do |push| Resource::Repository::ProjectPush.fabricate! do |push|
push.project = @project push.project = @project
push.files = standard_file push.files = standard_file
......
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