Merge pull request #6649 from Budmin/updating_email_instructions

Updating email instructions

Author: compwron

app/controllers/users_controller.rb

@@ -81,6 +81,7 @@ def update_email
 
     bypass_sign_in(@user) if @user == true_user
 
+    flash[:success] = "Click the link in your new email to finalize the email transfer"
     redirect_to edit_users_path
   end
 

app/views/devise/mailer/confirmation_instructions.html.erb

@@ -1,5 +1,3 @@
-<p>Hello! <%= @email %>!</p>
-
-<p>You can confirm your account email through the link below:</p>
-
+<p>Click here to confirm your email.</p>
 <p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %></p>
+<p>If you weren't expecting this email, please disregard.</p>

spec/requests/all_casa_admins/casa_admins_spec.rb

@@ -74,7 +74,7 @@
         expect(ActionMailer::Base.deliveries.count).to eq(1)
         expect(ActionMailer::Base.deliveries.first).to be_a(Mail::Message)
         expect(ActionMailer::Base.deliveries.first.body.encoded)
-          .to match("You can confirm your account email through the link below:")
+          .to match("Click here to confirm your email")
       end
 
       it { is_expected.to redirect_to edit_all_casa_admins_casa_org_casa_admin_path(casa_org, casa_admin) }

spec/requests/casa_admins_spec.rb

@@ -106,7 +106,7 @@
         expect(ActionMailer::Base.deliveries.count).to eq(1)
         expect(ActionMailer::Base.deliveries.first).to be_a(Mail::Message)
         expect(ActionMailer::Base.deliveries.first.body.encoded)
-          .to match("You can confirm your account email through the link below:")
+          .to match("Click here to confirm your email")
       end
 
       it "also respond as json", :aggregate_failures do

spec/requests/supervisors_spec.rb

@@ -160,7 +160,7 @@
         expect(ActionMailer::Base.deliveries.count).to eq(1)
         expect(ActionMailer::Base.deliveries.first).to be_a(Mail::Message)
         expect(ActionMailer::Base.deliveries.first.body.encoded)
-          .to match("You can confirm your account email through the link below:")
+          .to match("Click here to confirm your email")
       end
 
       it "can set the supervisor to be inactive" do
@@ -206,7 +206,7 @@
         expect(ActionMailer::Base.deliveries.count).to eq(1)
         expect(ActionMailer::Base.deliveries.first).to be_a(Mail::Message)
         expect(ActionMailer::Base.deliveries.first.body.encoded)
-          .to match("You can confirm your account email through the link below:")
+          .to match("Click here to confirm your email")
       end
 
       it "cannot change its own type" do

spec/requests/users_spec.rb

@@ -256,7 +256,7 @@
 
           expect(ActionMailer::Base.deliveries.count).to eq(1)
           expect(ActionMailer::Base.deliveries.last.body.encoded)
-            .to match("You can confirm your account email through the link below:")
+            .to match("Click here to confirm your email")
         end
       end
 
@@ -304,7 +304,7 @@
 
           expect(ActionMailer::Base.deliveries.count).to eq(1)
           expect(ActionMailer::Base.deliveries.last.body.encoded)
-            .to match("You can confirm your account email through the link below:")
+            .to match("Click here to confirm your email")
         end
 
         it "bypasses sign in if the current user is the true user" do
@@ -363,7 +363,7 @@
 
           expect(ActionMailer::Base.deliveries.count).to eq(1)
           expect(ActionMailer::Base.deliveries.last.body.encoded)
-            .to match("You can confirm your account email through the link below:")
+            .to match("Click here to confirm your email")
         end
 
         it "bypasses sign in if the current user is the true user" do

spec/requests/volunteers_spec.rb

@@ -250,7 +250,7 @@
         expect(ActionMailer::Base.deliveries.count).to eq(1)
         expect(ActionMailer::Base.deliveries.first).to be_a(Mail::Message)
         expect(ActionMailer::Base.deliveries.first.body.encoded)
-          .to match("You can confirm your account email through the link below:")
+          .to match("Click here to confirm your email")
       end
     end
 

spec/system/casa_admins/edit_spec.rb

@@ -42,7 +42,7 @@
       expect(ActionMailer::Base.deliveries.count).to eq(1)
       expect(ActionMailer::Base.deliveries.first).to be_a(Mail::Message)
       expect(ActionMailer::Base.deliveries.first.body.encoded)
-        .to match("You can confirm your account email through the link below:")
+        .to match("Click here to confirm your email")
 
       expect(page).to have_text "Admin was successfully updated. Confirmation Email Sent."
       expect(page).to have_field("Email", with: @old_email)

spec/system/supervisors/edit_spec.rb

@@ -182,7 +182,7 @@
         expect(ActionMailer::Base.deliveries.count).to eq(1)
         expect(ActionMailer::Base.deliveries.first).to be_a(Mail::Message)
         expect(ActionMailer::Base.deliveries.first.body.encoded)
-          .to match("You can confirm your account email through the link below:")
+          .to match("Click here to confirm your email")
 
         expect(page).to have_text "Supervisor was successfully updated. Confirmation Email Sent."
         expect(page).to have_field("Email", with: @old_email)

spec/system/users/edit_spec.rb

@@ -112,10 +112,12 @@
       fill_in "New Email", with: "new_volunteer@example.com"
       click_on "Update Email"
 
+      expect(page).to have_content "Click the link in your new email to finalize the email transfer"
+
       expect(ActionMailer::Base.deliveries.count).to eq(1)
       expect(ActionMailer::Base.deliveries.first).to be_a(Mail::Message)
       expect(ActionMailer::Base.deliveries.first.body.encoded)
-        .to have_text("You can confirm your account email through the link below:")
+        .to have_text("Click here to confirm your email")
     end
 
     it "displays email errors messages when user is unable to set a email with incorrect current password" do
@@ -264,10 +266,12 @@
       fill_in "New Email", with: "new_supervisor@example.com"
       click_on "Update Email"
 
+      expect(page).to have_content "Click the link in your new email to finalize the email transfer"
+
       expect(ActionMailer::Base.deliveries.count).to eq(1)
       expect(ActionMailer::Base.deliveries.first).to be_a(Mail::Message)
       expect(ActionMailer::Base.deliveries.first.body.encoded)
-        .to match("You can confirm your account email through the link below:")
+        .to match("Click here to confirm your email")
     end
 
     it "displays email errors messages when user is unable to set a email with incorrect current password" do
@@ -428,7 +432,7 @@
       expect(ActionMailer::Base.deliveries.count).to eq(1)
       expect(ActionMailer::Base.deliveries.first).to be_a(Mail::Message)
       expect(ActionMailer::Base.deliveries.first.body.encoded)
-        .to match("You can confirm your account email through the link below:")
+        .to match("Click here to confirm your email")
     end
 
     it "displays email errors messages when user is unable to set a email with incorrect current password" do