3 files changed, 35 insertions, 81 deletions
diff --git a/spec/models/members/group_member_spec.rb b/spec/models/members/group_member_spec.rb
index 94032146f51..c6266f15340 100644
--- a/spec/models/members/group_member_spec.rb
+++ b/spec/models/members/group_member_spec.rb
@@ -165,78 +165,28 @@ RSpec.describe GroupMember do
     let_it_be(:project_b) { create(:project, group: group) }
     let_it_be(:project_c) { create(:project, group: group) }
     let_it_be(:user) { create(:user) }
-    let_it_be(:affected_project_ids) { Project.id_in([project_a, project_b, project_c]).ids }
 
-    before do
-      stub_const(
-        "#{described_class.name}::THRESHOLD_FOR_REFRESHING_AUTHORIZATIONS_VIA_PROJECTS",
-        affected_project_ids.size - 1)
-    end
-
-    shared_examples_for 'calls UserProjectAccessChangedService to recalculate authorizations' do
-      it 'calls UserProjectAccessChangedService to recalculate authorizations' do
-        expect_next_instance_of(UserProjectAccessChangedService, user.id) do |service|
-          expect(service).to receive(:execute).with(blocking: blocking)
-        end
+    shared_examples_for 'calls AuthorizedProjectsWorker inline to recalculate authorizations' do
+      # this is inline with the overridden behaviour in stubbed_member.rb
+      it 'calls AuthorizedProjectsWorker inline to recalculate authorizations' do
+        worker_instance = AuthorizedProjectsWorker.new
+        expect(AuthorizedProjectsWorker).to receive(:new).and_return(worker_instance)
+        expect(worker_instance).to receive(:perform).with(user.id)
 
         action
       end
     end
 
-    shared_examples_for 'tries to update permissions via refreshing authorizations for the affected projects' do
-      context 'when the number of affected projects exceeds the set threshold' do
-        it 'updates permissions via refreshing authorizations for the affected projects asynchronously' do
-          expect_next_instance_of(
-            AuthorizedProjectUpdate::ProjectAccessChangedService, affected_project_ids
-          ) do |service|
-            expect(service).to receive(:execute).with(blocking: false)
-          end
-
-          action
-        end
-
-        it 'calls AuthorizedProjectUpdate::UserRefreshFromReplicaWorker with a delay as a safety net' do
-          expect(AuthorizedProjectUpdate::UserRefreshFromReplicaWorker).to(
-            receive(:bulk_perform_in)
-              .with(1.hour,
-                    [[user.id]],
-                    batch_delay: 30.seconds, batch_size: 100)
-          )
-
-          action
-        end
-      end
-
-      context 'when the number of affected projects does not exceed the set threshold' do
-        before do
-          stub_const(
-            "#{described_class.name}::THRESHOLD_FOR_REFRESHING_AUTHORIZATIONS_VIA_PROJECTS",
-            affected_project_ids.size + 1)
-        end
-
-        it_behaves_like 'calls UserProjectAccessChangedService to recalculate authorizations'
-      end
-    end
-
     context 'on create' do
       let(:action) { group.add_member(user, Gitlab::Access::GUEST) }
-      let(:blocking) { true }
 
-      it 'changes access level', :sidekiq_inline do
+      it 'changes access level' do
         expect { action }.to change { user.can?(:guest_access, project_a) }.from(false).to(true)
           .and change { user.can?(:guest_access, project_b) }.from(false).to(true)
           .and change { user.can?(:guest_access, project_c) }.from(false).to(true)
       end
 
-      it_behaves_like 'tries to update permissions via refreshing authorizations for the affected projects'
-
-      context 'when the feature flag `refresh_authorizations_via_affected_projects_on_group_membership` is disabled' do
-        before do
-          stub_feature_flags(refresh_authorizations_via_affected_projects_on_group_membership: false)
-        end
-
-        it_behaves_like 'calls UserProjectAccessChangedService to recalculate authorizations'
-      end
+      it_behaves_like 'calls AuthorizedProjectsWorker inline to recalculate authorizations'
     end
 
     context 'on update' do
@@ -245,23 +195,14 @@ RSpec.describe GroupMember do
       end
 
       let(:action) { group.members.find_by(user: user).update!(access_level: Gitlab::Access::DEVELOPER) }
-      let(:blocking) { true }
 
-      it 'changes access level', :sidekiq_inline do
+      it 'changes access level' do
         expect { action }.to change { user.can?(:developer_access, project_a) }.from(false).to(true)
           .and change { user.can?(:developer_access, project_b) }.from(false).to(true)
           .and change { user.can?(:developer_access, project_c) }.from(false).to(true)
       end
 
-      it_behaves_like 'tries to update permissions via refreshing authorizations for the affected projects'
-
-      context 'when the feature flag `refresh_authorizations_via_affected_projects_on_group_membership` is disabled' do
-        before do
-          stub_feature_flags(refresh_authorizations_via_affected_projects_on_group_membership: false)
-        end
-
-        it_behaves_like 'calls UserProjectAccessChangedService to recalculate authorizations'
-      end
+      it_behaves_like 'calls AuthorizedProjectsWorker inline to recalculate authorizations'
     end
 
     context 'on destroy' do
@@ -270,7 +211,6 @@ RSpec.describe GroupMember do
       end
 
       let(:action) { group.members.find_by(user: user).destroy! }
-      let(:blocking) { false }
 
       it 'changes access level', :sidekiq_inline do
         expect { action }.to change { user.can?(:guest_access, project_a) }.from(true).to(false)
@@ -278,14 +218,10 @@ RSpec.describe GroupMember do
           .and change { user.can?(:guest_access, project_c) }.from(true).to(false)
       end
 
-      it_behaves_like 'tries to update permissions via refreshing authorizations for the affected projects'
+      it 'schedules an AuthorizedProjectsWorker job to recalculate authorizations' do
+        expect(AuthorizedProjectsWorker).to receive(:bulk_perform_async).with([[user.id]])
 
-      context 'when the feature flag `refresh_authorizations_via_affected_projects_on_group_membership` is disabled' do
-        before do
-          stub_feature_flags(refresh_authorizations_via_affected_projects_on_group_membership: false)
-        end
-
-        it_behaves_like 'calls UserProjectAccessChangedService to recalculate authorizations'
+        action
       end
     end
   end
diff --git a/spec/models/members/member_role_spec.rb b/spec/models/members/member_role_spec.rb
new file mode 100644
index 00000000000..e8993491918
--- /dev/null
+++ b/spec/models/members/member_role_spec.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe MemberRole do
+  describe 'associations' do
+    it { is_expected.to belong_to(:namespace) }
+    it { is_expected.to have_many(:members) }
+  end
+
+  describe 'validation' do
+    subject { described_class.new }
+
+    it { is_expected.to validate_presence_of(:namespace_id) }
+    it { is_expected.to validate_presence_of(:base_access_level) }
+  end
+end
diff --git a/spec/models/members/project_member_spec.rb b/spec/models/members/project_member_spec.rb
index 39d9d25a98c..99fc5dc14df 100644
--- a/spec/models/members/project_member_spec.rb
+++ b/spec/models/members/project_member_spec.rb
@@ -213,10 +213,11 @@ RSpec.describe ProjectMember do
     let_it_be(:user) { create(:user) }
 
     shared_examples_for 'calls AuthorizedProjectUpdate::ProjectRecalculatePerUserWorker inline to recalculate authorizations' do
-      it 'calls AuthorizedProjectUpdate::ProjectRecalculatePerUserWorker' do
-        expect(AuthorizedProjectUpdate::ProjectRecalculatePerUserWorker).to receive(:bulk_perform_and_wait).with(
-          [[project.id, user.id]]
-        )
+      # this is inline with the overridden behaviour in stubbed_member.rb
+      it 'calls AuthorizedProjectUpdate::ProjectRecalculatePerUserWorker inline' do
+        worker_instance = AuthorizedProjectUpdate::ProjectRecalculatePerUserWorker.new
+        expect(AuthorizedProjectUpdate::ProjectRecalculatePerUserWorker).to receive(:new).and_return(worker_instance)
+        expect(worker_instance).to receive(:perform).with(project.id, user.id)
 
         action
       end