Issue 6600: skip email confirmation when saving new volunteer email, due to how CASA orgs work

app/controllers/volunteers_controller.rb

@@ -61,6 +61,11 @@ def edit
 
   def update
     authorize @volunteer
+
+    if params.dig(:volunteer, :email).present? && params[:volunteer][:email] != @volunteer.email
+      @volunteer.skip_reconfirmation!
+    end
+
     if @volunteer.update(update_volunteer_params)
       notice = check_unconfirmed_email_notice(@volunteer)
 

app/views/volunteers/edit.html.erb

@@ -30,7 +30,7 @@
           type: "submit",
           class: "main-btn primary-btn btn-hover btn-sm my-1"
         ) do %>
-          <i class="lni lni-checkmark-circle mr-5"></i> Submit
+          <i class="lni lni-checkmark-circle mr-5"></i> Update
         <% end %>
       </div>
     <% end %>

spec/requests/volunteers_spec.rb

@@ -239,18 +239,19 @@
         expect(volunteer.phone_number).to eq "15463457898"
       end
 
-      it "sends the volunteer a confirmation email upon email change" do
+      it "updates the volunteer email without sending a confirmation email" do
+        old_email = volunteer.email
+        new_email = "newemail@example.com"
+
         patch volunteer_path(volunteer), params: {
-          volunteer: {email: "newemail@gmail.com"}
+          volunteer: {email: new_email}
         }
         expect(response).to have_http_status(:redirect)
 
         volunteer.reload
-        expect(volunteer.unconfirmed_email).to eq("newemail@gmail.com")
-        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("Click here to confirm your email")
+        expect(volunteer.email).to eq(new_email)
+        expect(volunteer.old_emails).to eq([old_email])
+        expect(volunteer.unconfirmed_email).to eq(nil)
       end
     end
 

spec/system/volunteers/edit_spec.rb

@@ -14,7 +14,7 @@
         fill_in "volunteer_display_name", with: "Kamisato Ayato"
         fill_in "volunteer_phone_number", with: "+14163248967"
         fill_in "volunteer_date_of_birth", with: Date.new(1998, 7, 1)
-        click_on "Submit"
+        click_on "Update"
 
         expect(page).to have_text "Volunteer was successfully updated."
       end
@@ -31,7 +31,7 @@
           visit edit_volunteer_path(volunteer)
 
           fill_in "volunteer_phone_number", with: "+141632489"
-          click_on "Submit"
+          click_on "Update"
           expect(page).to have_text "Phone number must be 10 digits or 12 digits including country code (+1)"
         end
 
@@ -44,7 +44,7 @@
           visit edit_volunteer_path(volunteer)
 
           fill_in "volunteer_phone_number", with: "+141632180923"
-          click_on "Submit"
+          click_on "Update"
 
           expect(page).to have_text "Phone number must be 10 digits or 12 digits including country code (+1)"
         end
@@ -58,7 +58,7 @@
           visit edit_volunteer_path(volunteer)
 
           fill_in "volunteer_phone_number", with: "+141632u809o"
-          click_on "Submit"
+          click_on "Update"
 
           expect(page).to have_text "Phone number must be 10 digits or 12 digits including country code (+1)"
         end
@@ -72,7 +72,7 @@
           visit edit_volunteer_path(volunteer)
 
           fill_in "volunteer_phone_number", with: "+24163218092"
-          click_on "Submit"
+          click_on "Update"
 
           expect(page).to have_text "Phone number must be 10 digits or 12 digits including country code (+1)"
         end
@@ -86,7 +86,7 @@
           visit edit_volunteer_path(volunteer)
 
           fill_in "volunteer_date_of_birth", with: 5.days.from_now
-          click_on "Submit"
+          click_on "Update"
 
           expect(page).to have_text "Date of birth must be in the past."
         end
@@ -104,7 +104,7 @@
         fill_in "volunteer_display_name", with: "Kamisato Ayato"
         fill_in "volunteer_email", with: admin.email
         fill_in "volunteer_display_name", with: "Mickey Mouse"
-        click_on "Submit"
+        click_on "Update"
 
         expect(page).to have_text "already been taken"
       end
@@ -120,7 +120,7 @@
 
         fill_in "volunteer_email", with: ""
         fill_in "volunteer_display_name", with: ""
-        click_on "Submit"
+        click_on "Update"
 
         expect(page).to have_text "can't be blank"
       end
@@ -129,7 +129,7 @@
 
   describe "updating a volunteer's email" do
     context "with a valid email" do
-      it "sends volunteer a confirmation email and does not change the displayed email" do
+      it "updates volunteer email without sending a confirmation email" do
         organization = create(:casa_org)
         admin = create(:casa_admin, casa_org: organization)
         volunteer = create(:volunteer, :with_assigned_supervisor, casa_org: organization)
@@ -151,25 +151,26 @@
           .to match("Click here to confirm your email")
       end
 
-      it "succesfully displays the new email once the user confirms" do
+      it "updates volunteer email and tracks old emails" do
         organization = create(:casa_org)
         admin = create(:casa_admin, casa_org: organization)
         volunteer = create(:volunteer, :with_assigned_supervisor, casa_org: organization)
         old_email = volunteer.email
+        new_email = "newemail@example.com"
 
         sign_in admin
         visit edit_volunteer_path(volunteer)
 
-        fill_in "Email", with: "newemail@example.com"
-        click_on "Submit"
-        volunteer.reload
-        volunteer.confirm
+        fill_in "Email", with: new_email
+        click_on "Update"
 
-        visit edit_volunteer_path(volunteer)
+        volunteer.reload
 
-        expect(page).to have_field("Email", with: "newemail@example.com")
-        expect(page).not_to have_field("Email", with: old_email)
+        expect(page).to have_text "Volunteer was successfully updated."
+        expect(page).to have_field("Email", with: new_email)
+        expect(volunteer.email).to eq(new_email)
         expect(volunteer.old_emails).to eq([old_email])
+        expect(volunteer.unconfirmed_email).to eq(nil)
       end
     end
   end
@@ -736,7 +737,7 @@
         visit edit_volunteer_path(volunteer)
 
         fill_in "volunteer_address_attributes_content", with: "123 Main St"
-        click_on "Submit"
+        click_on "Update"
         expect(page).to have_text "Volunteer was successfully updated."
         expect(page).to have_selector("input[value='123 Main St']")
       end