Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
9eb15ed6
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9eb15ed6
编写于
7月 02, 2014
作者:
G
Godfrey Chan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Only automatically include validations when enabled
This is a follow up to #16024.
上级
6ee17968
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
5 addition
and
12 deletion
+5
-12
activemodel/lib/active_model/secure_password.rb
activemodel/lib/active_model/secure_password.rb
+2
-1
activemodel/test/cases/secure_password_test.rb
activemodel/test/cases/secure_password_test.rb
+3
-11
未找到文件。
activemodel/lib/active_model/secure_password.rb
浏览文件 @
9eb15ed6
module
ActiveModel
module
ActiveModel
module
SecurePassword
module
SecurePassword
extend
ActiveSupport
::
Concern
extend
ActiveSupport
::
Concern
include
ActiveModel
::
Validations
# BCrypt hash function can handle maximum 72 characters, and if we pass
# BCrypt hash function can handle maximum 72 characters, and if we pass
# password of length more than 72 characters it ignores extra characters.
# password of length more than 72 characters it ignores extra characters.
...
@@ -65,6 +64,8 @@ def has_secure_password(options = {})
...
@@ -65,6 +64,8 @@ def has_secure_password(options = {})
include
InstanceMethodsOnActivation
include
InstanceMethodsOnActivation
if
options
.
fetch
(
:validations
,
true
)
if
options
.
fetch
(
:validations
,
true
)
include
ActiveModel
::
Validations
# This ensures the model has a password by checking whether the password_digest
# This ensures the model has a password by checking whether the password_digest
# is present, so that this works with both new and existing records. However,
# is present, so that this works with both new and existing records. However,
# when there is an error, the message is added to the password attribute instead
# when there is an error, the message is added to the password attribute instead
...
...
activemodel/test/cases/secure_password_test.rb
浏览文件 @
9eb15ed6
...
@@ -20,20 +20,12 @@ class SecurePasswordTest < ActiveModel::TestCase
...
@@ -20,20 +20,12 @@ class SecurePasswordTest < ActiveModel::TestCase
ActiveModel
::
SecurePassword
.
min_cost
=
@original_min_cost
ActiveModel
::
SecurePassword
.
min_cost
=
@original_min_cost
end
end
test
"user object should respond to valid?"
do
test
"automatically include ActiveModel::Validations when validations are enabled"
do
assert_respond_to
@visitor
,
:valid?
assert_respond_to
@user
,
:valid?
assert_respond_to
@user
,
:valid?
end
end
test
"create/update without validations"
do
test
"don't include ActiveModel::Validations when validations are disabled"
do
assert
@visitor
.
valid?
(
:create
),
'visitor should be valid'
assert_not_respond_to
@visitor
,
:valid?
assert
@visitor
.
valid?
(
:update
),
'visitor should be valid'
@visitor
.
password
=
'123'
@visitor
.
password_confirmation
=
'456'
assert
@visitor
.
valid?
(
:create
),
'visitor should be valid'
assert
@visitor
.
valid?
(
:update
),
'visitor should be valid'
end
end
test
"create a new user with validations and valid password/confirmation"
do
test
"create a new user with validations and valid password/confirmation"
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录