Commit df4dbc79

@@ -7,4 +7,9 @@ class PasswordsController < ApplicationController
     PasswordReset.send_reset_instructions_to(params[:user][:email])
     redirect_to new_session_path, notice: 'Password reset instructions have been emailed to you.'
   end
+
+  def edit
+    @user = User.find_by(reset_password_token: params[:id])
+    redirect_to root_path if @user.nil?
+  end
 end

@@ -52,7 +52,7 @@ Cake::Application.routes.draw do
 
   # /users
   #devise_for :users, :controllers => {:registrations => 'registrations'}, :path => '', :path_names => { :sign_in => "signin", :sign_out => "signout", :sign_up => "register" }
-  resources :passwords, only: [:new, :create]
+  resources :passwords, only: [:new, :create, :edit]
   resource :registration, only: [:create]
 
   # sitemap

@@ -21,4 +21,21 @@ describe PasswordsController do
       expect(flash[:notice]).to_not be_empty
     end
   end
+
+  describe "#edit" do
+    let(:reset_token) { SecureRandom.hex(32) }
+    let(:user) { build(:user) }
+
+    it "loads the password reset token" do
+      allow(User).to receive(:find_by).with(reset_password_token: reset_token).and_return(user)
+      get :edit, id: reset_token
+      expect(assigns(:user)).to eql(user)
+    end
+
+    it "redirects to the homepage if the user cannot be found" do
+      allow(User).to receive(:find_by).with(reset_password_token: reset_token).and_return(nil)
+      get :edit, id: reset_token
+      expect(response).to redirect_to(root_path)
+    end
+  end
 end