1 files changed, 49 insertions, 50 deletions

diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index 910e1d85a6b..15e7f794795 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -3294,31 +3294,6 @@ RSpec.describe NotificationService, :mailer, feature_category: :team_planning do
         let(:source) { group }
       end
     end
-
-    describe '#new_group_member' do
-      let(:group) { create(:group) }
-
-      it 'sends a notification' do
-        group.add_guest(added_user)
-        should_only_email(added_user)
-      end
-
-      describe 'when notifications are disabled' do
-        before do
-          create_global_setting_for(added_user, :disabled)
-        end
-
-        it 'does not send a notification' do
-          group.add_guest(added_user)
-          should_not_email_anyone
-        end
-      end
-
-      it_behaves_like 'group emails are disabled' do
-        let(:notification_target)  { group }
-        let(:notification_trigger) { group.add_guest(added_user) }
-      end
-    end
   end
 
   describe 'ProjectMember', :deliver_mails_inline do
@@ -3448,29 +3423,6 @@ RSpec.describe NotificationService, :mailer, feature_category: :team_planning do
       end
     end
 
-    describe '#new_project_member' do
-      it do
-        create_member!
-        should_only_email(added_user)
-      end
-
-      it_behaves_like 'project emails are disabled' do
-        let(:notification_target)  { project }
-        let(:notification_trigger) { create_member! }
-      end
-
-      context 'when notifications are disabled' do
-        before do
-          create_global_setting_for(added_user, :disabled)
-        end
-
-        it do
-          create_member!
-          should_not_email_anyone
-        end
-      end
-    end
-
     describe '#member_about_to_expire' do
       let_it_be(:group_member) { create(:group_member, expires_at: 7.days.from_now.to_date) }
       let_it_be(:project_member) { create(:project_member, expires_at: 7.days.from_now.to_date) }
@@ -3491,9 +3443,56 @@ RSpec.describe NotificationService, :mailer, feature_category: :team_planning do
         end
       end
     end
+  end
+
+  describe '#new_member', :deliver_mails_inline do
+    let_it_be(:source) { create(:group) }
+    let_it_be(:added_user) { create(:user) }
+
+    subject(:new_member) { notification.new_member(member) }
+
+    shared_examples_for 'new member added' do |source_type|
+      it 'triggers a notification about about the added access', deliver_mails_inline: false do
+        new_member
 
-    def create_member!
-      create(:project_member, user: added_user, project: project)
+        expect_delivery_jobs_count(1)
+        expect_enqueud_email(source_type, member.id, mail: 'member_access_granted_email')
+      end
+    end
+
+    context 'when source is a Group' do
+      it_behaves_like 'new member added', 'Group' do
+        let_it_be(:member) { create(:group_member, source: source) }
+      end
+
+      it_behaves_like 'group emails are disabled' do
+        let(:notification_target) { source }
+        let(:notification_trigger) { notification_target.add_guest(added_user) }
+      end
+    end
+
+    context 'when source is a Project' do
+      let_it_be(:source) { create(:project) }
+
+      it_behaves_like 'new member added', 'Project' do
+        let_it_be(:member) { create(:project_member, source: project) }
+      end
+
+      it_behaves_like 'project emails are disabled' do
+        let_it_be(:notification_target) { source }
+        let(:notification_trigger) { source.add_guest(added_user) }
+      end
+    end
+
+    context 'when notifications are disabled' do
+      before do
+        create_global_setting_for(added_user, :disabled)
+      end
+
+      it 'does not send a notification' do
+        source.add_guest(added_user)
+        should_not_email_anyone
+      end
     end
   end