diff options
| author | Erich Menge <erich.menge@me.com> | 2012-05-08 17:54:47 -0500 |
|---|---|---|
| committer | Erich Menge <erich.menge@me.com> | 2012-05-08 18:08:55 -0500 |
| commit | f0213773584f3c15b960098c59d84ea0aafc54aa (patch) | |
| tree | 3d87fe8e92f179ed9ddd3b874f9567710721f0f2 /activemodel/test/models | |
| parent | 0e1e527654f286452fa6f86f5d229f278435319a (diff) | |
| download | rails-f0213773584f3c15b960098c59d84ea0aafc54aa.tar.gz rails-f0213773584f3c15b960098c59d84ea0aafc54aa.tar.bz2 rails-f0213773584f3c15b960098c59d84ea0aafc54aa.zip | |
Updated tests for has_secure_password.
Diffstat (limited to 'activemodel/test/models')
| -rw-r--r-- | activemodel/test/models/administrator.rb | 3 | ||||
| -rw-r--r-- | activemodel/test/models/user.rb | 3 | ||||
| -rw-r--r-- | activemodel/test/models/visitor.rb | 7 |
3 files changed, 11 insertions, 2 deletions
diff --git a/activemodel/test/models/administrator.rb b/activemodel/test/models/administrator.rb index a48f8b064f..2d6d34b3e2 100644 --- a/activemodel/test/models/administrator.rb +++ b/activemodel/test/models/administrator.rb @@ -1,7 +1,10 @@ class Administrator + extend ActiveModel::Callbacks include ActiveModel::Validations include ActiveModel::SecurePassword include ActiveModel::MassAssignmentSecurity + + define_model_callbacks :create attr_accessor :name, :password_digest attr_accessible :name diff --git a/activemodel/test/models/user.rb b/activemodel/test/models/user.rb index e221bb8091..4b11df12bf 100644 --- a/activemodel/test/models/user.rb +++ b/activemodel/test/models/user.rb @@ -1,6 +1,9 @@ class User + extend ActiveModel::Callbacks include ActiveModel::Validations include ActiveModel::SecurePassword + + define_model_callbacks :create has_secure_password diff --git a/activemodel/test/models/visitor.rb b/activemodel/test/models/visitor.rb index 36c0a16688..d15f448516 100644 --- a/activemodel/test/models/visitor.rb +++ b/activemodel/test/models/visitor.rb @@ -1,9 +1,12 @@ class Visitor + extend ActiveModel::Callbacks include ActiveModel::Validations include ActiveModel::SecurePassword include ActiveModel::MassAssignmentSecurity + + define_model_callbacks :create - has_secure_password + has_secure_password(validations: false) - attr_accessor :password_digest + attr_accessor :password_digest, :password_confirmation end |