Clean up tests.

CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+* deprecation
+  * devise :all is deprecated
+
 * enhancements
   * Added devise lockable (by github/mhfs)
 

README.rdoc

@@ -160,7 +160,7 @@ The devise method in your models also accept some options to configure its modul
 
   devise :authenticatable, :confirmable, :recoverable, :encryptor => :bcrypt
 
-Besides :encryptor, you can provide :pepper, :stretches, :confirm_within, :remember_for, :timeout, :unlock_in and others. All those are describer in the initializer created when you invoke the devise_install generator describer above.
+Besides :encryptor, you can provide :pepper, :stretches, :confirm_within, :remember_for, :timeout_in, :unlock_in and others. All those are describer in the initializer created when you invoke the devise_install generator describer above.
 
 == Views
 

test/models_test.rb

@@ -1,51 +1,9 @@
 require 'test/test_helper'
 
-class Authenticatable < User
-  devise :authenticatable
-end
-
-class Confirmable < User
-  devise :authenticatable, :confirmable
-end
-
-class Recoverable < User
-  devise :authenticatable, :recoverable
-end
-
-class Rememberable < User
-  devise :authenticatable, :rememberable
-end
-
-class Trackable < User
-  devise :authenticatable, :trackable
-end
-
-class Timeoutable < User
-  devise :authenticatable, :timeoutable
-end
-
-class Lockable < User
-  devise :authenticatable, :lockable
-end
-
-class IsValidatable < User
-  devise :authenticatable, :validatable
-end
-
-class Devisable < User
-  devise :all
-end
-
-class Exceptable < User
-  devise :all, :except => [:recoverable, :rememberable, :validatable, :lockable]
-end
-
 class Configurable < User
-  devise :all, :timeoutable, :stretches => 15,
-                             :pepper => 'abcdef',
-                             :confirm_within => 5.days,
-                             :remember_for => 7.days,
-                             :timeout_in => 15.minutes
+  devise :authenticatable, :confirmable, :rememberable, :timeoutable, :lockable,
+         :stretches => 15, :pepper => 'abcdef', :confirm_within => 5.days,
+         :remember_for => 7.days, :timeout_in => 15.minutes, :unlock_in => 10.days
 end
 
 class ActiveRecordTest < ActiveSupport::TestCase
@@ -64,45 +22,8 @@ def assert_include_modules(klass, *modules)
     end
   end
 
-  test 'add authenticatable module only' do
-    assert_include_modules Authenticatable, :authenticatable
-  end
-
-  test 'add confirmable module only' do
-    assert_include_modules Confirmable, :authenticatable, :confirmable
-  end
-
-  test 'add recoverable module only' do
-    assert_include_modules Recoverable, :authenticatable, :recoverable
-  end
-
-  test 'add rememberable module only' do
-    assert_include_modules Rememberable, :authenticatable, :rememberable
-  end
-
-  test 'add trackable module only' do
-    assert_include_modules Trackable, :authenticatable, :trackable
-  end
-
-  test 'add timeoutable module only' do
-    assert_include_modules Timeoutable, :authenticatable, :timeoutable
-  end
-
-  test 'add lockable module only' do
-    assert_include_modules Lockable, :authenticatable, :lockable
-  end
-
-  test 'add validatable module only' do
-    assert_include_modules IsValidatable, :authenticatable, :validatable
-  end
-
-  test 'add all modules' do
-    assert_include_modules Devisable,
-      :authenticatable, :confirmable, :recoverable, :rememberable, :trackable, :validatable
-  end
-
-  test 'configure modules with except option' do
-    assert_include_modules Exceptable, :authenticatable, :confirmable, :trackable
+  test 'add modules cherry pick' do
+    assert_include_modules Admin, :authenticatable, :timeoutable
   end
 
   test 'set a default value for stretches' do
@@ -125,6 +46,10 @@ def assert_include_modules(klass, *modules)
     assert_equal 15.minutes, Configurable.timeout_in
   end
 
+  test 'set a default value for unlock_in' do
+    assert_equal 10.days, Configurable.unlock_in
+  end
+
   test 'set null fields on migrations' do
     Admin.create!
   end