Add Welcome email for new subscribers

rossta · rossta · commit 4a73cf09b02c · 2024-07-20T11:10:38.000-04:00
diff --git a/app/controllers/users/confirmations_controller.rb b/app/controllers/users/confirmations_controller.rb
@@ -53,6 +53,8 @@ def update
     if @user.confirm!
       warden.set_user(@user, scope: :user)
 
+      WelcomeNotifier.deliver_to(@user)
+
       redirect_to users_dashboard_path, notice: "Thank you for confirming your email address"
     else
       redirect_to new_users_confirmation_path, alert: "Something went wrong"
diff --git a/app/mailers/emails/user_mailer.rb b/app/mailers/emails/user_mailer.rb
@@ -19,4 +19,10 @@ def password_reset(user, password_reset_token)
 
     mail to: @user.email, subject: "Reset your password"
   end
+
+  def welcome(user)
+    @user = user
+
+    mail to: @user.email, subject: "Welcome to Joy of Rails!"
+  end
 end
diff --git a/app/notifiers/welcome_notifier.rb b/app/notifiers/welcome_notifier.rb
@@ -0,0 +1,11 @@
+class WelcomeNotifier < NotificationEvent
+  def self.deliver_to(user, **)
+    new(params: {user: user}).deliver(user, **)
+  end
+
+  def deliver_notification(notification)
+    user = notification.recipient
+
+    Emails::UserMailer.welcome(user).deliver_later
+  end
+end
diff --git a/app/views/emails/magic_session_mailer/no_account_found.text.erb b/app/views/emails/magic_session_mailer/no_account_found.text.erb
@@ -1,4 +1,4 @@
-Is this the right email?
+# Is this the right email?
 
 It looks like there isn’t an account on test tied to this email address.
 
diff --git a/app/views/emails/magic_session_mailer/sign_in_link.text.erb b/app/views/emails/magic_session_mailer/sign_in_link.text.erb
@@ -1,3 +1,3 @@
-Sign in to Joy of Rails
+# Sign in to Joy of Rails
 
 Follow this link to sign in: <%= users_magic_session_token_url(@magic_session_token) %>
diff --git a/app/views/emails/user_mailer/confirmation.html.erb b/app/views/emails/user_mailer/confirmation.html.erb
@@ -1,4 +1,4 @@
-<h1>Welcome to Joy of Rails!</h1>
+<h1>Complete your Joy of Rails registration</h1>
 
 <p>
 <%= link_to "Confirm your email address", edit_users_confirmation_url(@confirmation_token) %>.
diff --git a/app/views/emails/user_mailer/confirmation.text.erb b/app/views/emails/user_mailer/confirmation.text.erb
@@ -1,3 +1,3 @@
-Welcome to Joy of Rails!
+# Complete your Joy of Rails registration
 
 Follow this link to confirm your email address: <%= edit_users_confirmation_url(@confirmation_token) %>
diff --git a/app/views/emails/user_mailer/password_reset.text.erb b/app/views/emails/user_mailer/password_reset.text.erb
@@ -1,3 +1,3 @@
-Password reset for Joy of Rails
+# Password reset for Joy of Rails
 
 Follow this link to reset your password: <%= edit_users_password_url(@password_reset_token) %>
diff --git a/app/views/emails/user_mailer/welcome.html.erb b/app/views/emails/user_mailer/welcome.html.erb
@@ -0,0 +1,13 @@
+<p>Thank you for signing up for the Joy of Rails newsletter! I am humbled to have you here :)</p>
+
+<p>As you might have guessed, things are just getting underway at Joy of Rails. You’re one of the first to join and I’m grateful for that. I’m excited to see where this journey takes us. Tell your friends and colleagues and spread the Joy of Rails. The more the merrier!</p>
+
+<p>Now that you’ve joined, you can expect occasional email updates from me. I’ll do my best to send you interesting and engaging Ruby on Rails content that’s worth your attention and time. Maybe every, now and then, something to put a smile on your face.</p>
+
+<p>If you’re into RSS, you may want to subscribe to the <%= link_to "Joy of Rails feed", feed_index_url %>.</p>
+
+<p>You can also <%= link_to "unsubscribe", unsubscribe_users_newsletter_subscriptions_url %> at any time. That’s ok too!</p>
+
+<p>If you have any questions, feedback, or just want to say hi, please don’t hesitate to reach out. I’d love to hear from you.</p>
+
+<p>- Ross</p>
diff --git a/app/views/emails/user_mailer/welcome.text.erb b/app/views/emails/user_mailer/welcome.text.erb
@@ -0,0 +1,13 @@
+Thank you for signing up for the Joy of Rails newsletter! I am humbled to have you here :)
+
+As you might have guessed, things are just getting underway at Joy of Rails. You’re one of the first to join and I’m grateful for that. I’m excited to see where this journey takes us. Tell your friends and colleagues about Joy of Rails. The more the merrier!
+
+Now that you’ve joined, you can expect occasional email updates from me. I’m going to do my best to send you interesting and engaging Ruby on Rails content that’s worth your attention and time. Maybe every, now and then, something to put a smile on your face.
+
+If you’re into RSS, you may want to subscribe to the Joy of Rails feed: <%= feed_index_url %>.
+
+You can also unsubscribe at any time: <%= unsubscribe_users_newsletter_subscriptions_url %>. That’s ok too!
+
+If you have any questions, feedback, or just want to say hi, please don’t hesitate to reach out. I’d love to hear from you.
+
+- Ross
diff --git a/spec/mailers/emails/user_mailer_spec.rb b/spec/mailers/emails/user_mailer_spec.rb
@@ -30,4 +30,19 @@
       expect(mail.body.encoded).to match("reset your password")
     end
   end
+
+  describe "welcome" do
+    let(:user) { instance_double(User, email: "to@example.com") }
+    let(:mail) { Emails::UserMailer.welcome(user) }
+
+    it "renders the headers" do
+      expect(mail.subject).to eq("Welcome to Joy of Rails!")
+      expect(mail.to).to eq(["to@example.com"])
+      expect(mail.from).to eq(["hello@joyofrails.com"])
+    end
+
+    it "renders the body" do
+      expect(mail.body.encoded).to match("Thank you for signing up")
+    end
+  end
 end
diff --git a/spec/mailers/previews/emails/user_mailer_preview.rb b/spec/mailers/previews/emails/user_mailer_preview.rb
@@ -8,4 +8,8 @@ def confirmation
   def password_reset
     Emails::UserMailer.password_reset(FactoryBot.build(:user), "password_reset_token")
   end
+
+  def welcome
+    Emails::UserMailer.welcome(FactoryBot.build(:user))
+  end
 end
diff --git a/spec/requests/users/confirmations_spec.rb b/spec/requests/users/confirmations_spec.rb
@@ -107,6 +107,19 @@
       expect(flash[:notice]).to eq("Thank you for confirming your email address")
     end
 
+    it "sends welcome email to user" do
+      user = FactoryBot.create(:user, :unconfirmed)
+
+      put users_confirmation_path(user.generate_token_for(:confirmation))
+
+      perform_enqueued_jobs_and_subsequently_enqueued_jobs
+
+      expect(ActionMailer::Base.deliveries.count).to eq(1)
+
+      mail = find_mail_to(user.email)
+      expect(mail.subject).to eq("Welcome to Joy of Rails!")
+    end
+
     it "disallows a user to confirm their email address with invalid token" do
       token = "invalid_token"
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Is this the right email?`
	`1`	`+# Is this the right email?`
`2`	`2`
`3`	`3`	`It looks like there isn’t an account on test tied to this email address.`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-Sign in to Joy of Rails`
	`1`	`+# Sign in to Joy of Rails`
`2`	`2`
`3`	`3`	`Follow this link to sign in: <%= users_magic_session_token_url(@magic_session_token) %>`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<h1>Welcome to Joy of Rails!</h1>`
	`1`	`+<h1>Complete your Joy of Rails registration</h1>`
`2`	`2`
`3`	`3`	`<p>`
`4`	`4`	`<%= link_to "Confirm your email address", edit_users_confirmation_url(@confirmation_token) %>.`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-Welcome to Joy of Rails!`
	`1`	`+# Complete your Joy of Rails registration`
`2`	`2`
`3`	`3`	`Follow this link to confirm your email address: <%= edit_users_confirmation_url(@confirmation_token) %>`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-Password reset for Joy of Rails`
	`1`	`+# Password reset for Joy of Rails`
`2`	`2`
`3`	`3`	`Follow this link to reset your password: <%= edit_users_password_url(@password_reset_token) %>`