Merge pull request #6408 from JenMcD-star/5260-Suppress-Erroneous-Email-Reset-Warning

5260 suppress erroneous email reset warning

Author: compwron

app/controllers/users/passwords_controller.rb

@@ -18,6 +18,19 @@ def create
       notice: "If the account exists you will receive an email or SMS with instructions on how to reset your password in a few minutes."
   end
 
+  def update
+    self.resource = resource_class.reset_password_by_token(resource_params)
+
+    yield resource if block_given?
+
+    if resource.errors.empty?
+      flash[:notice] = "Your password has been changed successfully."
+      redirect_to new_session_path(resource_name)
+    else
+      respond_with resource
+    end
+  end
+
   private
 
   def render_error

spec/requests/users/passwords_spec.rb

@@ -123,4 +123,30 @@
       end
     end
   end
+
+  describe "PUT /update" do
+    let(:token) do
+      raw_token, enc_token = Devise.token_generator.generate(User, :reset_password_token)
+      user.update!(reset_password_token: enc_token, reset_password_sent_at: Time.current)
+      raw_token
+    end
+
+    let(:params) do
+      {
+        user: {
+          reset_password_token: token,
+          password: "newpassword123!",
+          password_confirmation: "newpassword123!"
+        }
+      }
+    end
+
+    subject(:submit_reset) { put user_password_path, params: params }
+
+    it "successfully resets the password" do
+      submit_reset
+      expect(response).to redirect_to(new_user_session_path)
+      expect(flash[:notice]).to eq("Your password has been changed successfully.")
+    end
+  end
 end