Permalink
Browse files

Removing namespaces for controllers

  • Loading branch information...
qrush committed Apr 21, 2009
1 parent db0cb55 commit e2601dbeee7938d08776bf06969df09f8d24a36e
@@ -1,4 +1,4 @@
-class Clearance::ConfirmationsController < ApplicationController
+class ClearanceConfirmationsController < ApplicationController
before_filter :forbid_confirmed_user, :only => :new
before_filter :forbid_missing_token, :only => :new
@@ -1,4 +1,4 @@
-class Clearance::PasswordsController < ApplicationController
+class ClearancePasswordsController < ApplicationController
before_filter :forbid_missing_token, :only => [:edit, :update]
before_filter :forbid_non_existent_user, :only => [:edit, :update]
@@ -1,4 +1,4 @@
-class Clearance::SessionsController < ApplicationController
+class ClearanceSessionsController < ApplicationController
protect_from_forgery :except => :create
filter_parameter_logging :password
@@ -1,4 +1,4 @@
-class Clearance::UsersController < ApplicationController
+class ClearanceUsersController < ApplicationController
before_filter :redirect_to_root, :only => [:new, :create], :if => :signed_in?
filter_parameter_logging :password
View
@@ -1,19 +1,19 @@
ActionController::Routing::Routes.draw do |map|
map.resources :passwords,
- :controller => 'clearance/passwords',
+ :controller => 'clearance_passwords',
:only => [:new, :create]
map.resource :session,
- :controller => 'clearance/sessions',
+ :controller => 'clearance_sessions',
:only => [:new, :create, :destroy]
- map.resources :users, :controller => 'clearance/users' do |users|
+ map.resources :users, :controller => 'clearance_users' do |users|
users.resource :password,
- :controller => 'clearance/passwords',
+ :controller => 'clearance_passwords',
:only => [:create, :edit, :update]
users.resource :confirmation,
- :controller => 'clearance/confirmations',
+ :controller => 'clearance_confirmations',
:only => [:new, :create]
end
end
@@ -1,8 +1,6 @@
require 'test_helper'
-class ConfirmationsControllerTest < ActionController::TestCase
-
- tests Clearance::ConfirmationsController
+class ClearanceConfirmationsControllerTest < ActionController::TestCase
should_filter_params :token
@@ -1,11 +1,9 @@
require 'test_helper'
-class PasswordsControllerTest < ActionController::TestCase
-
- tests Clearance::PasswordsController
+class ClearancePasswordsControllerTest < ActionController::TestCase
should_route :get, '/users/1/password/edit',
- :controller => 'clearance/passwords', :action => 'edit', :user_id => '1'
+ :controller => 'clearance_passwords', :action => 'edit', :user_id => '1'
context "a signed up user" do
setup do
@@ -1,8 +1,6 @@
require 'test_helper'
-class SessionsControllerTest < ActionController::TestCase
-
- tests Clearance::SessionsController
+class ClearanceSessionsControllerTest < ActionController::TestCase
should_filter_params :password
@@ -1,8 +1,6 @@
require 'test_helper'
-class UsersControllerTest < ActionController::TestCase
-
- tests Clearance::UsersController
+class ClearanceUsersControllerTest < ActionController::TestCase
should_filter_params :password

0 comments on commit e2601db

Please sign in to comment.