1 files changed, 8 insertions, 64 deletions

diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index 976fe214c95..9df89f84450 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -1059,21 +1059,10 @@ RSpec.describe Notify do
         is_expected.to have_body_text project_member.human_access
         is_expected.to have_body_text 'leave the project'
         is_expected.to have_body_text project_url(project, leave: 1)
-        is_expected.not_to have_body_text 'You were assigned the following tasks:'
-      end
-
-      context 'with tasks to be done present' do
-        let(:project_member) { create(:project_member, project: project, user: user, tasks_to_be_done: [:ci, :code]) }
-
-        it 'contains the assigned tasks to be done' do
-          is_expected.to have_body_text 'You were assigned the following tasks:'
-          is_expected.to have_body_text localized_tasks_to_be_done_choices[:ci]
-          is_expected.to have_body_text localized_tasks_to_be_done_choices[:code]
-        end
       end
     end
 
-    def invite_to_project(project, inviter:, user: nil, tasks_to_be_done: [])
+    def invite_to_project(project, inviter:, user: nil)
       create(
         :project_member,
         :developer,
@@ -1081,8 +1070,7 @@ RSpec.describe Notify do
         invite_token: '1234',
         invite_email: 'toto@example.com',
         user: user,
-        created_by: inviter,
-        tasks_to_be_done: tasks_to_be_done
+        created_by: inviter
       )
     end
 
@@ -1115,7 +1103,6 @@ RSpec.describe Notify do
           is_expected.to have_content("#{inviter.name} invited you to join the")
           is_expected.to have_content('Project details')
           is_expected.to have_content("What's it about?")
-          is_expected.not_to have_body_text 'and has assigned you the following tasks:'
         end
       end
 
@@ -1161,16 +1148,6 @@ RSpec.describe Notify do
           end
         end
       end
-
-      context 'with tasks to be done present', :aggregate_failures do
-        let(:project_member) { invite_to_project(project, inviter: inviter, tasks_to_be_done: [:ci, :code]) }
-
-        it 'contains the assigned tasks to be done' do
-          is_expected.to have_body_text 'and has assigned you the following tasks:'
-          is_expected.to have_body_text localized_tasks_to_be_done_choices[:ci]
-          is_expected.to have_body_text localized_tasks_to_be_done_choices[:code]
-        end
-      end
     end
 
     describe 'project invitation accepted' do
@@ -1560,7 +1537,7 @@ RSpec.describe Notify do
         end
 
         it 'uses service bot name by default' do
-          expect_sender(User.support_bot)
+          expect_sender(Users::Internal.support_bot)
         end
 
         context 'when custom outgoing name is set' do
@@ -1577,7 +1554,7 @@ RSpec.describe Notify do
           let_it_be(:settings) { create(:service_desk_setting, project: project, outgoing_name: '') }
 
           it 'uses service bot name' do
-            expect_sender(User.support_bot)
+            expect_sender(Users::Internal.support_bot)
           end
         end
 
@@ -1589,7 +1566,7 @@ RSpec.describe Notify do
           it_behaves_like 'a mail with default delivery method'
 
           it 'uses service bot name by default' do
-            expect_sender(User.support_bot)
+            expect_sender(Users::Internal.support_bot)
           end
 
           context 'when custom email is enabled' do
@@ -1611,7 +1588,7 @@ RSpec.describe Notify do
             end
 
             it 'uses custom email and service bot name in "from" header' do
-              expect_sender(User.support_bot, sender_email: 'supersupport@example.com')
+              expect_sender(Users::Internal.support_bot, sender_email: 'supersupport@example.com')
             end
 
             it 'uses SMTP delivery method and has correct settings' do
@@ -1773,7 +1750,7 @@ RSpec.describe Notify do
       end
     end
 
-    def invite_to_group(group, inviter:, user: nil, tasks_to_be_done: [])
+    def invite_to_group(group, inviter:, user: nil)
       create(
         :group_member,
         :developer,
@@ -1781,8 +1758,7 @@ RSpec.describe Notify do
         invite_token: '1234',
         invite_email: 'toto@example.com',
         user: user,
-        created_by: inviter,
-        tasks_to_be_done: tasks_to_be_done
+        created_by: inviter
       )
     end
 
@@ -1807,7 +1783,6 @@ RSpec.describe Notify do
           is_expected.to have_body_text group.name
           is_expected.to have_body_text group_member.human_access.downcase
           is_expected.to have_body_text group_member.invite_token
-          is_expected.not_to have_body_text 'and has assigned you the following tasks:'
         end
       end
 
@@ -1821,24 +1796,6 @@ RSpec.describe Notify do
           is_expected.to have_body_text group_member.invite_token
         end
       end
-
-      context 'with tasks to be done present', :aggregate_failures do
-        let(:group_member) { invite_to_group(group, inviter: inviter, tasks_to_be_done: [:ci, :code]) }
-
-        it 'contains the assigned tasks to be done' do
-          is_expected.to have_body_text 'and has assigned you the following tasks:'
-          is_expected.to have_body_text localized_tasks_to_be_done_choices[:ci]
-          is_expected.to have_body_text localized_tasks_to_be_done_choices[:code]
-        end
-
-        context 'when there is no inviter' do
-          let(:inviter) { nil }
-
-          it 'does not contain the assigned tasks to be done' do
-            is_expected.not_to have_body_text 'and has assigned you the following tasks:'
-          end
-        end
-      end
     end
 
     describe 'group invitation reminders' do
@@ -2534,17 +2491,4 @@ RSpec.describe Notify do
       end
     end
   end
-
-  describe 'in product marketing', :mailer do
-    let_it_be(:group) { create(:group) }
-
-    let(:mail) { ActionMailer::Base.deliveries.last }
-
-    it 'does not raise error' do
-      described_class.in_product_marketing_email(user.id, group.id, :trial, 0).deliver
-
-      expect(mail.subject).to eq('Go farther with GitLab')
-      expect(mail.body.parts.first.to_s).to include('Start a GitLab Ultimate trial today in less than one minute, no credit card required.')
-    end
-  end
 end