Move test models into their own file so they can be used elsewhere

test/models/database_authenticatable_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'test_models'
 require 'digest/sha1'
 
 class DatabaseAuthenticatableTest < ActiveSupport::TestCase

test/models_test.rb

@@ -1,26 +1,5 @@
 require 'test_helper'
-
-class Configurable < User
-  devise :database_authenticatable, :confirmable, :rememberable, :timeoutable, :lockable,
-         :stretches => 15, :pepper => 'abcdef', :allow_unconfirmed_access_for => 5.days,
-         :remember_for => 7.days, :timeout_in => 15.minutes, :unlock_in => 10.days
-end
-
-class WithValidation < Admin
-  devise :database_authenticatable, :validatable, :password_length => 2..6
-end
-
-class UserWithValidation < User
-  validates_presence_of :username
-end
-
-class Several < Admin
-  devise :validatable
-  devise :lockable
-end
-
-class Inheritable < Admin
-end
+require 'test_models'
 
 class ActiveRecordTest < ActiveSupport::TestCase
   def include_module?(klass, mod)

test/support/helpers.rb

@@ -29,6 +29,10 @@ class ActiveSupport::TestCase
       :password_confirmation => '12345678' }.update(attributes)
   end
 
+  def new_user_with_class(klass=User, attributes={})
+    klass.new(valid_attributes(attributes))
+  end
+
   def new_user(attributes={})
     User.new(valid_attributes(attributes))
   end

test/test_models.rb

@@ -0,0 +1,28 @@
+class Configurable < User
+  devise :database_authenticatable, :confirmable, :rememberable, :timeoutable, :lockable,
+         :stretches => 15, :pepper => 'abcdef', :allow_unconfirmed_access_for => 5.days,
+         :remember_for => 7.days, :timeout_in => 15.minutes, :unlock_in => 10.days
+end
+
+class WithValidation < Admin
+  devise :database_authenticatable, :validatable, :password_length => 2..6
+end
+
+class UserWithValidation < User
+  validates_presence_of :username
+end
+
+class UserWithVirtualAttributes < User
+  devise :case_insensitive_keys => [ :email, :email_confirmation ]
+  validates :email, :presence => true, :confirmation => {:on => :create}
+  attr_accessible :email, :email_confirmation
+end
+
+class Several < Admin
+  devise :validatable
+  devise :lockable
+end
+
+class Inheritable < Admin
+end
+