Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42

4 files changed, 67 insertions, 23 deletions

diff --git a/spec/services/groups/destroy_service_spec.rb b/spec/services/groups/destroy_service_spec.rb
index 628943e40ff..57a151efda6 100644
--- a/spec/services/groups/destroy_service_spec.rb
+++ b/spec/services/groups/destroy_service_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Groups::DestroyService do
   let(:remove_path)  { group.path + "+#{group.id}+deleted" }
 
   before do
-    group.add_user(user, Gitlab::Access::OWNER)
+    group.add_member(user, Gitlab::Access::OWNER)
   end
 
   def destroy_group(group, user, async)
@@ -168,8 +168,8 @@ RSpec.describe Groups::DestroyService do
       let(:group2_user) { create(:user) }
 
       before do
-        group1.add_user(group1_user, Gitlab::Access::OWNER)
-        group2.add_user(group2_user, Gitlab::Access::OWNER)
+        group1.add_member(group1_user, Gitlab::Access::OWNER)
+        group2.add_member(group2_user, Gitlab::Access::OWNER)
       end
 
       context 'when a project is shared with a group' do
@@ -203,7 +203,7 @@ RSpec.describe Groups::DestroyService do
           let(:group3_user) { create(:user) }
 
           before do
-            group3.add_user(group3_user, Gitlab::Access::OWNER)
+            group3.add_member(group3_user, Gitlab::Access::OWNER)
 
             create(:group_group_link, shared_group: group2, shared_with_group: group3)
             group3.refresh_members_authorized_projects
@@ -290,7 +290,7 @@ RSpec.describe Groups::DestroyService do
       let!(:shared_with_group_user) { create(:user) }
 
       before do
-        shared_with_group.add_user(shared_with_group_user, Gitlab::Access::MAINTAINER)
+        shared_with_group.add_member(shared_with_group_user, Gitlab::Access::MAINTAINER)
 
         create(:group_group_link, shared_group: shared_group, shared_with_group: shared_with_group)
         shared_with_group.refresh_members_authorized_projects
diff --git a/spec/services/groups/group_links/destroy_service_spec.rb b/spec/services/groups/group_links/destroy_service_spec.rb
index 6aaf5f45069..03de7175edd 100644
--- a/spec/services/groups/group_links/destroy_service_spec.rb
+++ b/spec/services/groups/group_links/destroy_service_spec.rb
@@ -24,11 +24,29 @@ RSpec.describe Groups::GroupLinks::DestroyService, '#execute' do
         expect { subject.execute(link) }.to change { shared_group.shared_with_group_links.count }.from(1).to(0)
       end
 
-      it 'revokes project authorization', :sidekiq_inline do
-        group.add_developer(user)
+      context 'with skip_group_share_unlink_auth_refresh feature flag disabled' do
+        before do
+          stub_feature_flags(skip_group_share_unlink_auth_refresh: false)
+        end
 
-        expect { subject.execute(link) }.to(
-          change { Ability.allowed?(user, :read_project, project) }.from(true).to(false))
+        it 'revokes project authorization', :sidekiq_inline do
+          group.add_developer(user)
+
+          expect { subject.execute(link) }.to(
+            change { Ability.allowed?(user, :read_project, project) }.from(true).to(false))
+        end
+      end
+
+      context 'with skip_group_share_unlink_auth_refresh feature flag enabled' do
+        before do
+          stub_feature_flags(skip_group_share_unlink_auth_refresh: true)
+        end
+
+        it 'maintains project authorization', :sidekiq_inline do
+          group.add_developer(user)
+
+          expect(Ability.allowed?(user, :read_project, project)).to be_truthy
+        end
       end
     end
 
@@ -45,12 +63,32 @@ RSpec.describe Groups::GroupLinks::DestroyService, '#execute' do
         ]
       end
 
-      it 'updates project authorization once per group' do
-        expect(GroupGroupLink).to receive(:delete).and_call_original
-        expect(group).to receive(:refresh_members_authorized_projects).with(direct_members_only: true, blocking: false).once
-        expect(another_group).to receive(:refresh_members_authorized_projects).with(direct_members_only: true, blocking: false).once
+      context 'with skip_group_share_unlink_auth_refresh feature flag disabled' do
+        before do
+          stub_feature_flags(skip_group_share_unlink_auth_refresh: false)
+        end
+
+        it 'updates project authorization once per group' do
+          expect(GroupGroupLink).to receive(:delete).and_call_original
+          expect(group).to receive(:refresh_members_authorized_projects).with(direct_members_only: true, blocking: false).once
+          expect(another_group).to receive(:refresh_members_authorized_projects).with(direct_members_only: true, blocking: false).once
+
+          subject.execute(links)
+        end
+      end
+
+      context 'with skip_group_share_unlink_auth_refresh feature flag enabled' do
+        before do
+          stub_feature_flags(skip_group_share_unlink_auth_refresh: true)
+        end
+
+        it 'does not update project authorization once per group' do
+          expect(GroupGroupLink).to receive(:delete).and_call_original
+          expect(group).not_to receive(:refresh_members_authorized_projects)
+          expect(another_group).not_to receive(:refresh_members_authorized_projects)
 
-        subject.execute(links)
+          subject.execute(links)
+        end
       end
     end
   end
diff --git a/spec/services/groups/transfer_service_spec.rb b/spec/services/groups/transfer_service_spec.rb
index 20ea8b2bf1b..fbcca215282 100644
--- a/spec/services/groups/transfer_service_spec.rb
+++ b/spec/services/groups/transfer_service_spec.rb
@@ -439,6 +439,7 @@ RSpec.describe Groups::TransferService, :sidekiq_inline do
         before do
           TestEnv.clean_test_path
           create(:group_member, :owner, group: new_parent_group, user: user)
+          allow(transfer_service).to receive(:update_project_settings)
           transfer_service.execute(new_parent_group)
         end
 
@@ -478,6 +479,11 @@ RSpec.describe Groups::TransferService, :sidekiq_inline do
             end
           end
 
+          it 'invokes #update_project_settings' do
+            expect(transfer_service).to have_received(:update_project_settings)
+                                          .with(group.projects.pluck(:id))
+          end
+
           it_behaves_like 'project namespace path is in sync with project path' do
             let(:group_full_path) { "#{new_parent_group.path}/#{group.path}" }
             let(:projects_with_project_namespace) { [project1, project2] }
@@ -601,8 +607,8 @@ RSpec.describe Groups::TransferService, :sidekiq_inline do
             }.from(0).to(1)
           end
 
-          it 'performs authorizations job immediately' do
-            expect(AuthorizedProjectUpdate::ProjectRecalculateWorker).to receive(:bulk_perform_inline)
+          it 'performs authorizations job' do
+            expect(AuthorizedProjectUpdate::ProjectRecalculateWorker).to receive(:bulk_perform_async)
 
             transfer_service.execute(new_parent_group)
           end
@@ -659,7 +665,7 @@ RSpec.describe Groups::TransferService, :sidekiq_inline do
 
             it 'schedules authorizations job' do
               expect(AuthorizedProjectUpdate::ProjectRecalculateWorker).to receive(:bulk_perform_async)
-                .with(array_including(group.all_projects.ids.map { |id| [id, anything] }))
+                .with(array_including(group.all_projects.ids.map { |id| [id] }))
 
               transfer_service.execute(new_parent_group)
             end
diff --git a/spec/services/groups/update_service_spec.rb b/spec/services/groups/update_service_spec.rb
index 46c5e2a9818..c0e1691fe26 100644
--- a/spec/services/groups/update_service_spec.rb
+++ b/spec/services/groups/update_service_spec.rb
@@ -58,7 +58,7 @@ RSpec.describe Groups::UpdateService do
         let!(:service) { described_class.new(public_group, user, visibility_level: Gitlab::VisibilityLevel::INTERNAL) }
 
         before do
-          public_group.add_user(user, Gitlab::Access::OWNER)
+          public_group.add_member(user, Gitlab::Access::OWNER)
           create(:project, :public, group: public_group)
 
           expect(TodosDestroyer::GroupPrivateWorker).not_to receive(:perform_in)
@@ -119,7 +119,7 @@ RSpec.describe Groups::UpdateService do
         let!(:service) { described_class.new(internal_group, user, visibility_level: Gitlab::VisibilityLevel::PRIVATE) }
 
         before do
-          internal_group.add_user(user, Gitlab::Access::OWNER)
+          internal_group.add_member(user, Gitlab::Access::OWNER)
           create(:project, :internal, group: internal_group)
 
           expect(TodosDestroyer::GroupPrivateWorker).not_to receive(:perform_in)
@@ -135,7 +135,7 @@ RSpec.describe Groups::UpdateService do
         let!(:service) { described_class.new(internal_group, user, visibility_level: Gitlab::VisibilityLevel::PRIVATE) }
 
         before do
-          internal_group.add_user(user, Gitlab::Access::OWNER)
+          internal_group.add_member(user, Gitlab::Access::OWNER)
           create(:project, :private, group: internal_group)
 
           expect(TodosDestroyer::GroupPrivateWorker).to receive(:perform_in)
@@ -233,7 +233,7 @@ RSpec.describe Groups::UpdateService do
     let!(:service) { described_class.new(internal_group, user, visibility_level: 99) }
 
     before do
-      internal_group.add_user(user, Gitlab::Access::MAINTAINER)
+      internal_group.add_member(user, Gitlab::Access::MAINTAINER)
     end
 
     it "does not change permission level" do
@@ -246,7 +246,7 @@ RSpec.describe Groups::UpdateService do
     let(:service) { described_class.new(internal_group, user, emails_disabled: true) }
 
     it 'updates the attribute' do
-      internal_group.add_user(user, Gitlab::Access::OWNER)
+      internal_group.add_member(user, Gitlab::Access::OWNER)
 
       expect { service.execute }.to change { internal_group.emails_disabled }.to(true)
     end
@@ -280,7 +280,7 @@ RSpec.describe Groups::UpdateService do
     let!(:service) { described_class.new(internal_group, user, path: SecureRandom.hex) }
 
     before do
-      internal_group.add_user(user, Gitlab::Access::MAINTAINER)
+      internal_group.add_member(user, Gitlab::Access::MAINTAINER)
       create(:project, :internal, group: internal_group)
     end