Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Added specs for InvitationMailer, fixed `invitation_accepted` email
Damian Legawiecdb949c94c6af
diff --git a/core/app/mailers/spree/invitation_mailer.rb b/core/app/mailers/spree/invitation_mailer.rbindex 88b12449fa..9fdc86265a 100644--- a/core/app/mailers/spree/invitation_mailer.rb+++ b/core/app/mailers/spree/invitation_mailer.rb@@ -3,13 +3,18 @@ module Spree# invitation email, sending email to the invited to let them know they have been invited to join a store/account/vendordef invitation_email(invitation)@invitation = invitation- mail(to: invitation.email, subject: Spree.t('invitation_mailer.invitation_email.subject', resource_name: invitation.resource.name))+ mail(to: invitation.email,+ subject: Spree.t('invitation_mailer.invitation_email.subject',+ resource_name: invitation.resource&.name))end# accept/reject, sending email to the invited to let them know the status of their invitationdef invitation_accepted(invitation)@invitation = invitation- mail(to: invitation.inviter.email, subject: Spree.t('invitation_mailer.invitation_accepted.subject', invitee_name: invitation.email, resource_name: invitation.resource.name))+ mail(to: invitation.inviter.email,+ subject: Spree.t('invitation_mailer.invitation_accepted.subject',+ invitee_name: invitation.invitee&.name,+ resource_name: invitation.resource&.name))endendenddiff --git a/core/app/views/spree/invitation_mailer/invitation_accepted.html.erb b/core/app/views/spree/invitation_mailer/invitation_accepted.html.erbnew file mode 100644index 0000000000..7c4a62e065--- /dev/null+++ b/core/app/views/spree/invitation_mailer/invitation_accepted.html.erb@@ -0,0 +1,12 @@+<h1>+ <%= Spree.t('invitation_mailer.greeting', user_name: @invitation.inviter.first_name) %>+</h1>+<p>+ <%= Spree.t('invitation_mailer.invitation_accepted.body', invitee_name: @invitation.invitee&.name, resource_name: @invitation.resource.name) %>+</p>++<p>+ <%= Spree.t('invitation_mailer.thanks') %><br />+ <%= current_store.name %>+</p>+diff --git a/core/app/views/spree/invitation_mailer/invitation_email.html.erb b/core/app/views/spree/invitation_mailer/invitation_email.html.erbindex 41df0947ae..187ffce6a4 100644--- a/core/app/views/spree/invitation_mailer/invitation_email.html.erb+++ b/core/app/views/spree/invitation_mailer/invitation_email.html.erb@@ -1,5 +1,5 @@<h1>- <%= Spree.t('invitation_mailer.greeting', user_name: @invitation.invitee&.name || @invitation.email) %>+ <%= Spree.t('invitation_mailer.greeting', user_name: @invitation.invitee&.first_name || @invitation.email) %></h1><p><%= Spree.t('invitation_mailer.invitation_email.body', inviter_name: @invitation.inviter.name, resource_name: @invitation.resource.name) %>diff --git a/core/spec/mailers/spree/invitation_mailer_spec.rb b/core/spec/mailers/spree/invitation_mailer_spec.rbnew file mode 100644index 0000000000..78a870387a--- /dev/null+++ b/core/spec/mailers/spree/invitation_mailer_spec.rb@@ -0,0 +1,54 @@+require 'spec_helper'++RSpec.describe Spree::InvitationMailer, type: :mailer do+ let(:store) { @default_store }+ let(:inviter) { create(:admin_user) }+ let(:invitation) { create(:invitation, email: '[email protected]', inviter: inviter, resource: store) }+ let(:spree) { Spree::Core::Engine.routes.url_helpers }++ before do+ allow(spree).to receive(:admin_invitation_url).and_return("http://test.com/admin/invitations/#{invitation.id}?token=#{invitation.token}")+ end++ describe '#invitation_email' do+ subject(:mail) { described_class.invitation_email(invitation) }++ it 'renders the subject' do+ expect(mail.subject).to eq(+ Spree.t('invitation_mailer.invitation_email.subject', resource_name: store.name)+ )+ end++ it 'sends to the correct recipient' do+ expect(mail.to).to eq([invitation.email])+ end++ it 'includes the invitation link in the body' do+ expect(mail.body.encoded).to include("http://test.com/admin/invitations/#{invitation.id}?token=#{invitation.token}")+ end+ end++ describe '#invitation_accepted' do+ subject(:mail) { described_class.invitation_accepted(invitation) }++ let(:invitee) { create(:admin_user, first_name: 'John', last_name: 'Doe') }++ before do+ allow(invitation).to receive(:invitee).and_return(invitee)+ end++ it 'renders the subject' do+ expect(mail.subject).to eq(+ Spree.t('invitation_mailer.invitation_accepted.subject', invitee_name: invitee.name, resource_name: store.name)+ )+ end++ it 'includes the invitee name in the body' do+ expect(mail.body.encoded).to include(invitee.name)+ end++ it 'sends to the correct recipient' do+ expect(mail.to).to eq([inviter.email])+ end+ end+end