Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions app/views/devise/mailer/email_changed.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<p>Hello <%= @email %>!</p>

<% if @resource.try(:unconfirmed_email?) %>
<p>We're contacting you to notify you that your email is being changed to <%= @resource.unconfirmed_email %>.</p>
<p>Your CASA account's email has been updated to <%= @resource.unconfirmed_email %>.</p>
<% else %>
<p>We're contacting you to notify you that your email has been changed to <%= @resource.email %>.</p>
<p>Your CASA account's email has been updated to <%= @resource.email %>.</p>
<% end %>
2 changes: 1 addition & 1 deletion spec/system/all_casa_admins/all_casa_admin_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
fill_in "all_casa_admin_email", with: "newemail@example.com"
click_on "Update Profile"
expect(page).to have_text "successfully updated"
expect(ActionMailer::Base.deliveries.last.body.encoded).to match(">We're contacting you to notify you that your email has been changed to newemail@example.com")
expect(ActionMailer::Base.deliveries.last.body.encoded).to match(">Your CASA account's email has been updated to newemail@example.com")

# change password
click_on "Change Password"
Expand Down
Loading