Add latest changes from gitlab-org/gitlab@master

1 files changed, 23 insertions, 3 deletions

diff --git a/spec/services/members/create_service_spec.rb b/spec/services/members/create_service_spec.rb
index af151f93dc7..c08b40e9528 100644
--- a/spec/services/members/create_service_spec.rb
+++ b/spec/services/members/create_service_spec.rb
@@ -119,14 +119,34 @@ RSpec.describe Members::CreateService, :aggregate_failures, :clean_gitlab_redis_
       before do
         # validations will fail because we try to invite them to the project as a guest
         source.group.add_developer(member)
+        allow(Gitlab::EventStore).to receive(:publish)
       end
 
-      it 'triggers the members added and authorizations changed events' do
+      it 'triggers the authorizations changed events' do
         expect(Gitlab::EventStore)
-          .to receive(:publish)
-                .with(an_instance_of(ProjectAuthorizations::AuthorizationsChangedEvent))
+          .to receive(:publish_group)
+                .with(array_including(an_instance_of(ProjectAuthorizations::AuthorizationsAddedEvent)))
                 .and_call_original
 
+        execute_service
+      end
+
+      context 'when feature flag "add_policy_approvers_to_rules" is disabled' do
+        before do
+          stub_feature_flags(add_policy_approvers_to_rules: false)
+        end
+
+        it 'triggers the authorizations changed event' do
+          expect(Gitlab::EventStore)
+            .to receive(:publish)
+                  .with(an_instance_of(ProjectAuthorizations::AuthorizationsChangedEvent))
+                  .and_call_original
+
+          execute_service
+        end
+      end
+
+      it 'triggers the members added event' do
         expect(Gitlab::EventStore)
           .to receive(:publish)
           .with(an_instance_of(Members::MembersAddedEvent))