Removing default mapping and Updating tests at all

app/views/notifier/confirmation_instructions.html.erb

@@ -2,4 +2,4 @@ Welcome <%= @user.email %>!
 
 You can confirm your account through the link below:
 
-<%= link_to 'Confirm my account', confirmation_url(@user, :perishable_token => @user.perishable_token) %>
+<%#= link_to 'Confirm my account', confirmation_url(@user, :perishable_token => @user.perishable_token) %>

app/views/notifier/reset_password_instructions.html.erb

@@ -2,7 +2,7 @@ Hello <%= @user.email %>!
 
 Someone has requested a link to change your password, and you can do this through the link below.
 
-<%= link_to 'Change my password', edit_password_url(@user, :perishable_token => @user.perishable_token) %>
+<%#= link_to 'Change my password', edit_password_url(@user, :perishable_token => @user.perishable_token) %>
 
 If you didn't request this, please ignore this email.
 Your password won't change until you access the link above and create a new one.

lib/devise.rb

@@ -42,7 +42,6 @@ module Devise
     options.assert_valid_keys(:to, :for, :as)
     mapping = mapping.to_s.singularize.to_sym
     mappings[mapping] = Mapping.new(options.merge(:resource => mapping))
-    mappings.default = mapping if mappings.default.nil?
   end
 
   def self.find_mapping(map)
@@ -52,8 +51,6 @@ module Devise
       mappings[map_sym]
     elsif mapping = mappings.detect{|m, options| options[:as] == map}.try(:first)
       mappings[mapping]
-    else
-      mappings[mappings.default]
     end
   end
 

test/controllers/resources_test.rb

@@ -9,8 +9,8 @@ class ResourcesTest < ActionController::TestCase
   end
 
   test 'get translated resource name from request path' do
-    @request.path = '/conta/session'
+    @request.path = '/admin_area/session'
-    assert_equal 'account', @controller.resource_name
+    assert_equal 'admin', @controller.resource_name
   end
 
   test 'get resource class from request path' do
@@ -19,16 +19,16 @@ class ResourcesTest < ActionController::TestCase
   end
 
   test 'get resource ivar from request path' do
-    @request.path = '/conta/session'
+    @request.path = '/admin_area/session'
-    @controller.instance_variable_set(:@account, account = Account.new)
+    @controller.instance_variable_set(:@admin, admin = Admin.new)
-    assert_equal account, @controller.resource
+    assert_equal admin, @controller.resource
-    assert_equal account, @controller.instance_variable_get(:@resource)
+    assert_equal admin, @controller.instance_variable_get(:@resource)
   end
 
   test 'set resource ivar from request path' do
-    @request.path = '/conta/session'
+    @request.path = '/admin_area/session'
-    @controller.resource = account = @controller.resource_class.new
+    @controller.resource = admin = @controller.resource_class.new
-    assert_equal account, @controller.resource
+    assert_equal admin, @controller.resource
-    assert_equal account, @controller.instance_variable_get(:@resource)
+    assert_equal admin, @controller.instance_variable_get(:@resource)
   end
 end

test/map_test.rb

@@ -35,15 +35,6 @@ class MapTest < ActiveSupport::TestCase
     end
   end
 
-  test 'set the first mapping as default' do
-    Devise.mappings.default = nil
-    assert_nil Devise.mappings.default
-    Devise.map :participants, :for => [:authenticable]
-    assert_equal :participant, Devise.mappings.default
-    Devise.map :organizers, :for => [:authenticable]
-    assert_equal :participant, Devise.mappings.default
-  end
-
   test 'singularize map' do
     Devise.map :participants, :for => [:authenticable]
     assert_not_nil Devise.mappings[:participant]
@@ -69,12 +60,6 @@ class MapTest < ActiveSupport::TestCase
     assert_equal :participant, Devise.find_mapping('usuarios').resource
   end
 
-  test 'find mapping should return default map in no one is found or empty is given' do
-    Devise.map :participants, :for => [:authenticable]
-    assert_equal :participant, Devise.find_mapping('test_drive').resource
-    assert_equal :participant, Devise.find_mapping(nil).resource
-  end
-
   test 'find mapping receiving a path should split it' do
     Devise.map :participants, :for => [:authenticable]
     Devise.map :organizer, :for => [:authenticable]

test/models/authenticable_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test/test_helper'
 require 'digest/sha1'
 
 class AuthenticableTest < ActiveSupport::TestCase

test/models/confirmable_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test/test_helper'
 
 class ConfirmableTest < ActiveSupport::TestCase
 

test/models/perishable_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test/test_helper'
 
 class PerishableTest < ActiveSupport::TestCase
 

test/models/recoverable_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test/test_helper'
 
 class RecoverableTest < ActiveSupport::TestCase
 

test/models/validatable_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test/test_helper'
 
 class ValidatableTest < ActiveSupport::TestCase
 

test/rails_app/app/controllers/admins_controller.rb

@@ -0,0 +1,6 @@
+class AdminsController < ApplicationController
+  before_filter :admin_authenticate!
+
+  def index
+  end
+end

test/rails_app/app/controllers/application_controller.rb

@@ -6,7 +6,5 @@ class ApplicationController < ActionController::Base
   protect_from_forgery # See ActionController::RequestForgeryProtection for details
 
   # Scrub sensitive parameters from your log
-  # filter_parameter_logging :password
+  filter_parameter_logging :password
-
-  before_filter :authenticate!
 end

test/rails_app/app/controllers/users_controller.rb

@@ -0,0 +1,6 @@
+class UsersController < ApplicationController
+  before_filter :user_authenticate!
+
+  def index
+  end
+end

test/rails_app/app/models/account.rb

@@ -1,3 +0,0 @@
-class Account < ActiveRecord::Base
-  devise :all
-end

test/rails_app/app/models/admin.rb

@@ -0,0 +1,3 @@
+class Admin < ActiveRecord::Base
+  devise :all
+end

test/rails_app/app/views/admins/index.html.erb

@@ -0,0 +1 @@
+Welcome Admin!

test/rails_app/app/views/home/index.html.erb

@@ -1 +1 @@
-Hello World!
+Home!

test/rails_app/app/views/users/index.html.erb

@@ -0,0 +1 @@
+Welcome User!

test/rails_app/config/initializers/devise.rb

@@ -1,2 +1,2 @@
-Devise.map :users, :to => User, :for => [:authenticable, :recoverable, :confirmable]
+Devise.map :user, :for => [:authenticable, :recoverable, :confirmable, :validatable]
-Devise.map :account, :to => Account, :for => [:authenticable, :confirmable], :as => 'conta'
+Devise.map :admin, :for => [:authenticable, :recoverable, :confirmable, :validatable], :as => 'admin_area'

test/rails_app/config/routes.rb

@@ -1,4 +1,5 @@
 ActionController::Routing::Routes.draw do |map|
-  map.resources :home, :only => :index
+  map.resources :users, :only => :index
+  map.resources :admins, :only => :index
   map.root :controller => :home
 end

test/routes/confirmation_routing_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test/test_helper'
 
 class ConfirmationRoutingTest < ActionController::TestCase
 
@@ -20,15 +20,15 @@ class ConfirmationRoutingTest < ActionController::TestCase
     end
   end
 
-  test 'new account session route' do
+  test 'new admin session route' do
-    assert_recognizes({:controller => 'confirmations', :action => 'new'}, 'conta/confirmation/new')
+    assert_recognizes({:controller => 'confirmations', :action => 'new'}, 'admin_area/confirmation/new')
   end
 
-  test 'create account confirmation route' do
+  test 'create admin confirmation route' do
-    assert_recognizes({:controller => 'confirmations', :action => 'create'}, {:path => 'conta/confirmation', :method => :post})
+    assert_recognizes({:controller => 'confirmations', :action => 'create'}, {:path => 'admin_area/confirmation', :method => :post})
   end
 
-  test 'show account confirmation route' do
+  test 'show admin confirmation route' do
-    assert_recognizes({:controller => 'confirmations', :action => 'show'}, 'conta/confirmation')
+    assert_recognizes({:controller => 'confirmations', :action => 'show'}, 'admin_area/confirmation')
   end
 end

test/routes/map_routing_test.rb

@@ -14,15 +14,15 @@ class MapRoutingTest < ActionController::TestCase
     assert_recognizes({:controller => 'passwords', :action => 'new'}, 'users/password/new')
   end
 
-  test 'map devise account session with :as option' do
+  test 'map devise admin session with :as option' do
-    assert_recognizes({:controller => 'sessions', :action => 'new'}, 'conta/session/new')
+    assert_recognizes({:controller => 'sessions', :action => 'new'}, 'admin_area/session/new')
   end
 
-  test 'map devise account confirmation with :as option' do
+  test 'map devise admin confirmation with :as option' do
-    assert_recognizes({:controller => 'confirmations', :action => 'new'}, 'conta/confirmation/new')
+    assert_recognizes({:controller => 'confirmations', :action => 'new'}, 'admin_area/confirmation/new')
   end
 
-  test 'map devise account password with :as option' do
+  test 'map devise admin password with :as option' do
-    assert_recognizes({:controller => 'passwords', :action => 'new'}, 'conta/password/new')
+    assert_recognizes({:controller => 'passwords', :action => 'new'}, 'admin_area/password/new')
   end
 end

test/routes/password_routing_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test/test_helper'
 
 class PasswordRoutingTest < ActionController::TestCase
 
@@ -24,19 +24,19 @@ class PasswordRoutingTest < ActionController::TestCase
     end
   end
 
-  test 'new account password route' do
+  test 'new admin password route' do
-    assert_recognizes({:controller => 'passwords', :action => 'new'}, 'conta/password/new')
+    assert_recognizes({:controller => 'passwords', :action => 'new'}, 'admin_area/password/new')
   end
 
-  test 'create account password route' do
+  test 'create admin password route' do
-    assert_recognizes({:controller => 'passwords', :action => 'create'}, {:path => 'conta/password', :method => :post})
+    assert_recognizes({:controller => 'passwords', :action => 'create'}, {:path => 'admin_area/password', :method => :post})
   end
 
-  test 'edit account password route' do
+  test 'edit admin password route' do
-    assert_recognizes({:controller => 'passwords', :action => 'edit'}, 'conta/password/edit')
+    assert_recognizes({:controller => 'passwords', :action => 'edit'}, 'admin_area/password/edit')
   end
 
-  test 'update account password route' do
+  test 'update admin password route' do
-    assert_recognizes({:controller => 'passwords', :action => 'update'}, {:path => 'conta/password', :method => :put})
+    assert_recognizes({:controller => 'passwords', :action => 'update'}, {:path => 'admin_area/password', :method => :put})
   end
 end

test/routes/session_routing_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test/test_helper'
 
 class SessionRoutingTest < ActionController::TestCase
 
@@ -20,15 +20,15 @@ class SessionRoutingTest < ActionController::TestCase
     end
   end
 
-  test 'new account session route' do
+  test 'new admin session route' do
-    assert_recognizes({:controller => 'sessions', :action => 'new'}, 'conta/session/new')
+    assert_recognizes({:controller => 'sessions', :action => 'new'}, 'admin_area/session/new')
   end
 
-  test 'create account session route' do
+  test 'create admin session route' do
-    assert_recognizes({:controller => 'sessions', :action => 'create'}, {:path => 'conta/session', :method => :post})
+    assert_recognizes({:controller => 'sessions', :action => 'create'}, {:path => 'admin_area/session', :method => :post})
   end
 
-  test 'destroy account session route' do
+  test 'destroy admin session route' do
-    assert_recognizes({:controller => 'sessions', :action => 'destroy'}, {:path => 'conta/session', :method => :delete})
+    assert_recognizes({:controller => 'sessions', :action => 'destroy'}, {:path => 'admin_area/session', :method => :delete})
   end
 end

test/test_helper.rb

@@ -22,7 +22,7 @@ ActiveRecord::Schema.define(:version => 1) do
     t.datetime :confirmed_at
   end
 
-  create_table :accounts do |t|
+  create_table :admins do |t|
     t.string :email,              :null => false
     t.string :encrypted_password, :null => false
     t.string :password_salt,      :null => false