Merge pull request #342 from DefactoSoftware/jurre/fix-account-update…

…-flashes

fix account update flashes

app/controllers/users_controller.rb

@@ -15,8 +15,17 @@ def edit
 
   def update
     @user = current_user
+    if @user.respond_to?(:unconfirmed_email)
+      prev_unconfirmed_email = @user.unconfirmed_email
+    end
+
     if @user.update_with_password(user_params)
-      redirect_to edit_user_path, notice: t(:user_updated)
+      flash_key = if update_needs_confirmation?(@user, prev_unconfirmed_email)
+                    :update_needs_confirmation
+                  else
+                    :updated
+                  end
+      redirect_to edit_user_path, notice: t(".#{flash_key}")
     else
       render :edit
     end
@@ -36,4 +45,10 @@ def user_params
                                  :password_confirmation,
                                  :current_password)
   end
+
+  def update_needs_confirmation?(resource, previous)
+    resource.respond_to?(:pending_reconfirmation?) &&
+      resource.pending_reconfirmation? &&
+      previous != resource.unconfirmed_email
+  end
 end

config/locales/en.yml

@@ -261,6 +261,10 @@ en:
     invite: Invite User
     invitation_sent_at: Invited %{time_ago} ago
     confirm: Confirm
+    update:
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address."
+      updated: You updated your account successfully.
+
   entry_filters:
     title: Filters
     clients: All Clients

config/locales/nl.yml

@@ -341,6 +341,9 @@ nl:
     email: Email
     invitation_sent_at: "%{time_ago} geleden uitgenodigd"
     invite: Nodig uit
+    update:
+      update_needs_confirmation: U heeft uw account aangepast, maar we moeten uw email valideren. Controlleer uw email en klik op de bevestigingslink om uw nieuw email te valideren.
+      updated: Uw account is aangepast.
   views:
     pagination:
       truncate: ...

spec/features/user_edits_account_spec.rb

@@ -16,7 +16,17 @@
       fill_in "user_current_password", with: user.password
       click_button "Update"
 
-      expect(page).to have_content I18n.t(:user_updated)
+      expect(page).to have_content I18n.t("users.update.updated")
+    end
+
+    scenario "changing the email address" do
+      fill_in "user_email", with: "[email protected]"
+      fill_in "user_current_password", with: user.password
+      click_button "Update"
+
+      expect(page).to have_content(
+        I18n.t("users.update.update_needs_confirmation")
+      )
     end
 
     scenario "with invalid data" do