Remove re-invitation tests and simplify user invitation logic in CustomDeviseMailer specs

Author: rrg1459

spec/mailers/custom_devise_mailer_spec.rb

@@ -1,7 +1,7 @@
 RSpec.describe CustomDeviseMailer, type: :mailer do
   describe "#invitation_instructions" do
     let(:user) { create(:partner_user) }
-    let(:invitation_sent_at) { nil }
+    # let(:invitation_sent_at) { nil }
     let(:mail) { described_class.invitation_instructions(user, SecureRandom.uuid) }
 
     context "when partner is invited" do
@@ -14,7 +14,7 @@
       end
 
       let(:user) do
-        create(:partner_user, partner: partner, invitation_sent_at: invitation_sent_at)
+        create(:partner_user, partner: partner)
       end
 
       it "invites to primary user" do
@@ -26,96 +26,21 @@
 
     context "when other partner users invited" do
       let(:partner) { create(:partner) }
-      let(:user) { create(:partner_user, partner: partner, invitation_sent_at: invitation_sent_at) }
+      let(:user) { create(:partner_user, partner: partner) }
 
       it "invites to partner user" do
         expect(mail.subject).to eq("You've been invited to #{user.partner.name}'s Human Essentials account")
         expect(mail.html_part.body).to include("You've been invited to <strong>#{user.partner.name}'s</strong> account for requesting items from <strong>#{user.partner.organization.name}!")
       end
     end
 
-    context "when user is re-invited" do
+    context "when user is invited" do
       let(:invitation_sent_at) { Time.zone.now }
       let(:user) { create(:user, invitation_sent_at: invitation_sent_at) }
-      let(:role_name) { "org_user" }
 
       it "invites to user" do
-        expect(mail.subject).to eq("You've been re-invited to be a #{role_name} in your Human Essentials App Account")
-        expect(mail.html_part.body).to include("You've been re-invited to become a <strong>#{role_name}</strong> in your Human Essentials App Account")
-      end
-
-      it "has invite expiration message and reset instructions" do
-        expect(mail.html_part.body).to include("This invitation will expire at #{user.invitation_due_at.strftime("%B %d, %Y %I:%M %p")} GMT or if a new password reset is triggered.")
-      end
-
-      it "has reset instructions" do
-        expect(mail.html_part.body).to match(%r{<p>If your invitation has an expired message, go <a href="http://.+?/users/password/new">here</a> and enter your email address to reset your password.</p>})
-        expect(mail.html_part.body).to include("Feel free to ignore this email if you are not interested or if you feel it was sent by mistake.")
-      end
-    end
-
-    context "when partner is re-invited" do
-      let(:invitation_sent_at) { Time.zone.now }
-      let(:user) { create(:partner_user, invitation_sent_at: invitation_sent_at) }
-      let(:role_name) { "partner" }
-
-      it "invites to user" do
-        expect(mail.subject).to eq("You've been re-invited to be a #{role_name} in your Human Essentials App Account")
-        expect(mail.html_part.body).to include("You've been re-invited to become a <strong>#{role_name}</strong> in your Human Essentials App Account")
-      end
-
-      it "has invite expiration message and reset instructions" do
-        expect(mail.html_part.body).to include("This invitation will expire at #{user.invitation_due_at.strftime("%B %d, %Y %I:%M %p")} GMT or if a new password reset is triggered.")
-      end
-
-      it "has reset instructions" do
-        expect(mail.html_part.body).to match(%r{<p>If your invitation has an expired message, go <a href="http://.+?/users/password/new">here</a> and enter your email address to reset your password.</p>})
-        expect(mail.html_part.body).to include("Feel free to ignore this email if you are not interested or if you feel it was sent by mistake.")
-      end
-    end
-
-    context "when user is re-invited and has two roles" do
-      let(:invitation_sent_at) { Time.zone.now }
-      let(:user) { create(:partner_user, invitation_sent_at: invitation_sent_at) }
-      let(:role_name) { "org_user" }
-      let(:organization) { create(:organization) }
-
-      it "invites to user" do
-        user.add_role(Role::ORG_USER, organization)
-        expect(mail.subject).to eq("You've been re-invited to be a #{role_name} in your Human Essentials App Account")
-        expect(mail.html_part.body).to include("You've been re-invited to become a <strong>#{role_name}</strong> in your Human Essentials App Account")
-      end
-
-      it "has invite expiration message and reset instructions" do
-        expect(mail.html_part.body).to include("This invitation will expire at #{user.invitation_due_at.strftime("%B %d, %Y %I:%M %p")} GMT or if a new password reset is triggered.")
-      end
-
-      it "has reset instructions" do
-        expect(mail.html_part.body).to match(%r{<p>If your invitation has an expired message, go <a href="http://.+?/users/password/new">here</a> and enter your email address to reset your password.</p>})
-        expect(mail.html_part.body).to include("Feel free to ignore this email if you are not interested or if you feel it was sent by mistake.")
-      end
-    end
-
-    context "when user is re-invited and has three roles" do
-      let(:invitation_sent_at) { Time.zone.now }
-      let(:user) { create(:partner_user, invitation_sent_at: invitation_sent_at) }
-      let(:role_name) { "org_admin" }
-      let(:organization) { create(:organization) }
-
-      it "invites to user" do
-        user.add_role(Role::ORG_ADMIN, organization)
-        user.add_role(Role::ORG_USER, organization)
-        expect(mail.subject).to eq("You've been re-invited to be a #{role_name} in your Human Essentials App Account")
-        expect(mail.html_part.body).to include("You've been re-invited to become a <strong>#{role_name}</strong> in your Human Essentials App Account")
-      end
-
-      it "has invite expiration message and reset instructions" do
-        expect(mail.html_part.body).to include("This invitation will expire at #{user.invitation_due_at.strftime("%B %d, %Y %I:%M %p")} GMT or if a new password reset is triggered.")
-      end
-
-      it "has reset instructions" do
-        expect(mail.html_part.body).to match(%r{<p>If your invitation has an expired message, go <a href="http://.+?/users/password/new">here</a> and enter your email address to reset your password.</p>})
-        expect(mail.html_part.body).to include("Feel free to ignore this email if you are not interested or if you feel it was sent by mistake.")
+        expect(mail.subject).to eq("Your Human Essentials App Account Approval")
+        expect(mail.html_part.body).to include("Your request has been approved and you're invited to become an user of the Human Essentials inventory management system!")
       end
     end
   end