From 986922133327c8ca983570e2c3a45259adf22bd7 Mon Sep 17 00:00:00 2001
From: Rui Venancio <rmvenancio@gmail.com>
Date: Fri, 16 Oct 2015 18:18:06 +0100
Subject: [PATCH] When you visit the change password link for the second time
 (sent by email), you should be redirected to a 404 page instead of get a
 window with a json message.

This behaviour is also required when you have a wrong password confirmtion link.
---
 .../devise_token_auth/passwords_controller.rb          |  8 +-------
 .../devise_token_auth/passwords_controller_test.rb     | 10 +++++-----
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/app/controllers/devise_token_auth/passwords_controller.rb b/app/controllers/devise_token_auth/passwords_controller.rb
index d917dbb8d..2f74c3d05 100644
--- a/app/controllers/devise_token_auth/passwords_controller.rb
+++ b/app/controllers/devise_token_auth/passwords_controller.rb
@@ -100,7 +100,7 @@ def edit
           config:         params[:config]
         }))
       else
-        render_edit_error
+        raise ActionController::RoutingError.new('Not Found')
       end
     end
 
@@ -174,12 +174,6 @@ def render_create_error
       }, status: @error_status
     end
 
-    def render_edit_error
-      render json: {
-        success: false
-      }, status: 404
-    end
-
     def render_update_error_unauthorized
       render json: {
         success: false,
diff --git a/test/controllers/devise_token_auth/passwords_controller_test.rb b/test/controllers/devise_token_auth/passwords_controller_test.rb
index a2962143c..726bd7875 100644
--- a/test/controllers/devise_token_auth/passwords_controller_test.rb
+++ b/test/controllers/devise_token_auth/passwords_controller_test.rb
@@ -122,13 +122,13 @@ class DeviseTokenAuth::PasswordsControllerTest < ActionController::TestCase
           end
 
           describe 'password reset link failure' do
-            test 'respone should return 404' do
-              xhr :get, :edit, {
-                  reset_password_token: 'bogus',
+            test 'response should return 404' do
+              assert_raises(ActionController::RoutingError) {
+                xhr :get, :edit, {
+                  reset_password_token: "bogus",
                   redirect_url: @mail_redirect_url
+                }
               }
-
-              assert_equal 404, response.status
             end
           end