Namespaced the passwords controller

app/controllers/passwords_controller.rb → app/controllers/clearance/passwords_controller.rb

@@ -1,10 +1,11 @@
-class PasswordsController < ApplicationController
+class Clearance::PasswordsController < ApplicationController
 
   before_filter :forbid_missing_token,     :only => [:edit, :update]
   before_filter :forbid_non_existant_user, :only => [:edit, :update]
   filter_parameter_logging :password, :password_confirmation
 
   def new
+    render :template => 'passwords/new'
   end
 
   def create
@@ -16,12 +17,13 @@ def create
       redirect_to url_after_create
     else
       flash.now[:notice] = "Unknown email"
-      render :action => :new
+      render :template => 'passwords/new'
     end
   end
 
   def edit
     @user = User.find_by_id_and_token(params[:user_id], params[:token])
+    render :template => 'passwords/edit'
   end
 
   def update
@@ -33,7 +35,7 @@ def update
       sign_user_in(@user)
       redirect_to url_after_update
     else
-      render :action => :edit
+      render :template => 'passwords/edit'
     end
   end
 

config/routes.rb

@@ -1,7 +1,8 @@
 ActionController::Routing::Routes.draw do |map|
-  map.resources :passwords
+  map.resources :passwords, :controller => 'clearance/passwords'
   map.resource  :session
-  map.resources :users, :has_one => [:password] do |users|
+  map.resources :users do |users|
+    users.resource :password, :controller => 'clearance/passwords'
     users.resource :confirmation, :controller => 'clearance/confirmations'
   end
 end

test/controllers/passwords_controller_test.rb

@@ -2,8 +2,10 @@
 
 class PasswordsControllerTest < ActionController::TestCase
 
+  tests Clearance::PasswordsController
+
   should_route :get, '/users/1/password/edit',
-    :action  => 'edit', :user_id => '1'
+    :controller => 'clearance/passwords', :action  => 'edit', :user_id => '1'
 
   context "a signed up user" do
     setup do