diff options
author | Godfrey Chan <godfreykfc@gmail.com> | 2014-01-24 20:35:48 -0800 |
---|---|---|
committer | Godfrey Chan <godfreykfc@gmail.com> | 2014-01-24 20:35:48 -0800 |
commit | 94ce51445eb70fb168640c0404b7fc1985365f67 (patch) | |
tree | dd7244b4b9131ba47a39f663e5396aad262f4e2f /activemodel/test/models | |
parent | 7776fd6afb4463f8e7c39e653bdc2ee9226b22f4 (diff) | |
parent | 98705d88cd8ec705b80a032f8c166072b4e6fffd (diff) | |
download | rails-94ce51445eb70fb168640c0404b7fc1985365f67.tar.gz rails-94ce51445eb70fb168640c0404b7fc1985365f67.tar.bz2 rails-94ce51445eb70fb168640c0404b7fc1985365f67.zip |
Merge pull request #13772 from chancancode/fix_has_secure_password_for_good
Refactored validations rules for has_secure_password
Diffstat (limited to 'activemodel/test/models')
-rw-r--r-- | activemodel/test/models/oauthed_user.rb | 11 | ||||
-rw-r--r-- | activemodel/test/models/user.rb | 2 |
2 files changed, 1 insertions, 12 deletions
diff --git a/activemodel/test/models/oauthed_user.rb b/activemodel/test/models/oauthed_user.rb deleted file mode 100644 index 9750bc19d4..0000000000 --- a/activemodel/test/models/oauthed_user.rb +++ /dev/null @@ -1,11 +0,0 @@ -class OauthedUser - extend ActiveModel::Callbacks - include ActiveModel::Validations - include ActiveModel::SecurePassword - - define_model_callbacks :create - - has_secure_password(validations: false) - - attr_accessor :password_digest, :password_salt -end diff --git a/activemodel/test/models/user.rb b/activemodel/test/models/user.rb index 4b11df12bf..cbe259b1ad 100644 --- a/activemodel/test/models/user.rb +++ b/activemodel/test/models/user.rb @@ -7,5 +7,5 @@ class User has_secure_password - attr_accessor :password_digest, :password_salt + attr_accessor :password_digest end |