Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
8a389ffc
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,发现更多精彩内容 >>
提交
8a389ffc
编写于
7月 10, 2015
作者:
K
Kasper Timm Hansen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use private method call assertions in Active Model tests.
Also fix Minitest constant reference.
上级
46b92c4d
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
46 addition
and
59 deletion
+46
-59
activemodel/test/cases/errors_test.rb
activemodel/test/cases/errors_test.rb
+9
-24
activemodel/test/cases/helper.rb
activemodel/test/cases/helper.rb
+5
-0
activemodel/test/cases/validations/i18n_validation_test.rb
activemodel/test/cases/validations/i18n_validation_test.rb
+31
-34
activemodel/test/cases/validations/with_validation_test.rb
activemodel/test/cases/validations/with_validation_test.rb
+1
-1
未找到文件。
activemodel/test/cases/errors_test.rb
浏览文件 @
8a389ffc
...
...
@@ -27,14 +27,6 @@ def self.lookup_ancestors
end
end
def
setup
@mock_generator
=
MiniTest
::
Mock
.
new
end
def
teardown
@mock_generator
.
verify
end
def
test_delete
errors
=
ActiveModel
::
Errors
.
new
(
self
)
errors
[
:foo
]
<<
'omg'
...
...
@@ -307,8 +299,7 @@ def test_no_key
test
"add_on_empty generates message"
do
person
=
Person
.
new
@mock_generator
.
expect
(
:call
,
nil
,
[
:name
,
:empty
,
{}])
person
.
errors
.
stub
(
:generate_message
,
@mock_generator
)
do
assert_called_with
(
person
.
errors
,
:generate_message
,
[
:name
,
:empty
,
{}])
do
assert_deprecated
do
person
.
errors
.
add_on_empty
:name
end
...
...
@@ -317,9 +308,8 @@ def test_no_key
test
"add_on_empty generates message for multiple attributes"
do
person
=
Person
.
new
@mock_generator
.
expect
(
:call
,
nil
,
[
:name
,
:empty
,
{}])
@mock_generator
.
expect
(
:call
,
nil
,
[
:age
,
:empty
,
{}])
person
.
errors
.
stub
(
:generate_message
,
@mock_generator
)
do
expected_calls
=
[
[
:name
,
:empty
,
{}],
[
:age
,
:empty
,
{}]
]
assert_called_with
(
person
.
errors
,
:generate_message
,
expected_calls
)
do
assert_deprecated
do
person
.
errors
.
add_on_empty
[
:name
,
:age
]
end
...
...
@@ -328,8 +318,7 @@ def test_no_key
test
"add_on_empty generates message with custom default message"
do
person
=
Person
.
new
@mock_generator
.
expect
(
:call
,
nil
,
[
:name
,
:empty
,
{
message:
'custom'
}])
person
.
errors
.
stub
(
:generate_message
,
@mock_generator
)
do
assert_called_with
(
person
.
errors
,
:generate_message
,
[
:name
,
:empty
,
{
message:
'custom'
}])
do
assert_deprecated
do
person
.
errors
.
add_on_empty
:name
,
message:
'custom'
end
...
...
@@ -339,8 +328,7 @@ def test_no_key
test
"add_on_empty generates message with empty string value"
do
person
=
Person
.
new
person
.
name
=
''
@mock_generator
.
expect
(
:call
,
nil
,
[
:name
,
:empty
,
{}])
person
.
errors
.
stub
(
:generate_message
,
@mock_generator
)
do
assert_called_with
(
person
.
errors
,
:generate_message
,
[
:name
,
:empty
,
{}])
do
assert_deprecated
do
person
.
errors
.
add_on_empty
:name
end
...
...
@@ -349,8 +337,7 @@ def test_no_key
test
"add_on_blank generates message"
do
person
=
Person
.
new
@mock_generator
.
expect
(
:call
,
nil
,
[
:name
,
:blank
,
{}])
person
.
errors
.
stub
(
:generate_message
,
@mock_generator
)
do
assert_called_with
(
person
.
errors
,
:generate_message
,
[
:name
,
:blank
,
{}])
do
assert_deprecated
do
person
.
errors
.
add_on_blank
:name
end
...
...
@@ -359,9 +346,8 @@ def test_no_key
test
"add_on_blank generates message for multiple attributes"
do
person
=
Person
.
new
@mock_generator
.
expect
(
:call
,
nil
,
[
:name
,
:blank
,
{}])
@mock_generator
.
expect
(
:call
,
nil
,
[
:age
,
:blank
,
{}])
person
.
errors
.
stub
(
:generate_message
,
@mock_generator
)
do
expected_calls
=
[
[
:name
,
:blank
,
{}],
[
:age
,
:blank
,
{}]
]
assert_called_with
(
person
.
errors
,
:generate_message
,
expected_calls
)
do
assert_deprecated
do
person
.
errors
.
add_on_blank
[
:name
,
:age
]
end
...
...
@@ -370,8 +356,7 @@ def test_no_key
test
"add_on_blank generates message with custom default message"
do
person
=
Person
.
new
@mock_generator
.
expect
(
:call
,
nil
,
[
:name
,
:blank
,
{
message:
'custom'
}])
person
.
errors
.
stub
(
:generate_message
,
@mock_generator
)
do
assert_called_with
(
person
.
errors
,
:generate_message
,
[
:name
,
:blank
,
{
message:
'custom'
}])
do
assert_deprecated
do
person
.
errors
.
add_on_blank
:name
,
message:
'custom'
end
...
...
activemodel/test/cases/helper.rb
浏览文件 @
8a389ffc
...
...
@@ -11,6 +11,7 @@
I18n
.
enforce_available_locales
=
false
require
'active_support/testing/autorun'
require
'active_support/testing/method_call_assertions'
require
'minitest/mock'
...
...
@@ -22,3 +23,7 @@ def rubinius_skip(message = '')
def
jruby_skip
(
message
=
''
)
skip
message
if
defined?
(
JRUBY_VERSION
)
end
class
ActiveModel::TestCase
include
ActiveSupport
::
Testing
::
MethodCallAssertions
end
activemodel/test/cases/validations/i18n_validation_test.rb
浏览文件 @
8a389ffc
...
...
@@ -11,7 +11,6 @@ def setup
I18n
.
load_path
.
clear
I18n
.
backend
=
I18n
::
Backend
::
Simple
.
new
I18n
.
backend
.
store_translations
(
'en'
,
errors:
{
messages:
{
custom:
nil
}
})
@mock_generator
=
MiniTest
::
Mock
.
new
end
def
teardown
...
...
@@ -19,7 +18,6 @@ def teardown
I18n
.
load_path
.
replace
@old_load_path
I18n
.
backend
=
@old_backend
I18n
.
backend
.
reload!
@mock_generator
.
verify
end
def
test_full_message_encoding
...
...
@@ -32,8 +30,7 @@ def test_full_message_encoding
def
test_errors_full_messages_translates_human_attribute_name_for_model_attributes
@person
.
errors
.
add
(
:name
,
'not found'
)
@mock_generator
.
expect
(
:call
,
"Person's name"
,
[
:name
,
default:
'Name'
])
Person
.
stub
(
:human_attribute_name
,
@mock_generator
)
do
assert_called_with
(
Person
,
:human_attribute_name
,
[
:name
,
default:
'Name'
],
returns:
"Person's name"
)
do
assert_equal
[
"Person's name not found"
],
@person
.
errors
.
full_messages
end
end
...
...
@@ -64,8 +61,8 @@ def test_errors_full_messages_uses_format
test
"validates_confirmation_of on generated message
#{
name
}
"
do
Person
.
validates_confirmation_of
:title
,
validation_options
@person
.
title_confirmation
=
'foo'
@mock_generator
.
expect
(
:call
,
nil
,
[
:title_confirmation
,
:confirmation
,
generate_message_options
.
merge
(
attribute:
'Title'
)])
@person
.
errors
.
stub
(
:generate_message
,
@mock_generator
)
do
call
=
[
:title_confirmation
,
:confirmation
,
generate_message_options
.
merge
(
attribute:
'Title'
)]
assert_called_with
(
@person
.
errors
,
:generate_message
,
call
)
do
@person
.
valid?
end
end
...
...
@@ -76,8 +73,8 @@ def test_errors_full_messages_uses_format
COMMON_CASES
.
each
do
|
name
,
validation_options
,
generate_message_options
|
test
"validates_acceptance_of on generated message
#{
name
}
"
do
Person
.
validates_acceptance_of
:title
,
validation_options
.
merge
(
allow_nil:
false
)
@mock_generator
.
expect
(
:call
,
nil
,
[
:title
,
:accepted
,
generate_message_options
])
@person
.
errors
.
stub
(
:generate_message
,
@mock_generator
)
do
call
=
[
:title
,
:accepted
,
generate_message_options
]
assert_called_with
(
@person
.
errors
,
:generate_message
,
call
)
do
@person
.
valid?
end
end
...
...
@@ -88,8 +85,8 @@ def test_errors_full_messages_uses_format
COMMON_CASES
.
each
do
|
name
,
validation_options
,
generate_message_options
|
test
"validates_presence_of on generated message
#{
name
}
"
do
Person
.
validates_presence_of
:title
,
validation_options
@mock_generator
.
expect
(
:call
,
nil
,
[
:title
,
:blank
,
generate_message_options
])
@person
.
errors
.
stub
(
:generate_message
,
@mock_generator
)
do
call
=
[
:title
,
:blank
,
generate_message_options
]
assert_called_with
(
@person
.
errors
,
:generate_message
,
call
)
do
@person
.
valid?
end
end
...
...
@@ -100,8 +97,8 @@ def test_errors_full_messages_uses_format
COMMON_CASES
.
each
do
|
name
,
validation_options
,
generate_message_options
|
test
"validates_length_of for :within on generated message when too short
#{
name
}
"
do
Person
.
validates_length_of
:title
,
validation_options
.
merge
(
within:
3
..
5
)
@mock_generator
.
expect
(
:call
,
nil
,
[
:title
,
:too_short
,
generate_message_options
.
merge
(
count:
3
)])
@person
.
errors
.
stub
(
:generate_message
,
@mock_generator
)
do
call
=
[
:title
,
:too_short
,
generate_message_options
.
merge
(
count:
3
)]
assert_called_with
(
@person
.
errors
,
:generate_message
,
call
)
do
@person
.
valid?
end
end
...
...
@@ -113,8 +110,8 @@ def test_errors_full_messages_uses_format
test
"validates_length_of for :too_long generated message
#{
name
}
"
do
Person
.
validates_length_of
:title
,
validation_options
.
merge
(
within:
3
..
5
)
@person
.
title
=
'this title is too long'
@mock_generator
.
expect
(
:call
,
nil
,
[
:title
,
:too_long
,
generate_message_options
.
merge
(
count:
5
)])
@person
.
errors
.
stub
(
:generate_message
,
@mock_generator
)
do
call
=
[
:title
,
:too_long
,
generate_message_options
.
merge
(
count:
5
)]
assert_called_with
(
@person
.
errors
,
:generate_message
,
)
do
@person
.
valid?
end
end
...
...
@@ -125,8 +122,8 @@ def test_errors_full_messages_uses_format
COMMON_CASES
.
each
do
|
name
,
validation_options
,
generate_message_options
|
test
"validates_length_of for :is on generated message
#{
name
}
"
do
Person
.
validates_length_of
:title
,
validation_options
.
merge
(
is:
5
)
@mock_generator
.
expect
(
:call
,
nil
,
[
:title
,
:wrong_length
,
generate_message_options
.
merge
(
count:
5
)])
@person
.
errors
.
stub
(
:generate_message
,
@mock_generator
)
do
call
=
[
:title
,
:wrong_length
,
generate_message_options
.
merge
(
count:
5
)]
assert_called_with
(
@person
.
errors
,
:generate_message
,
call
)
do
@person
.
valid?
end
end
...
...
@@ -138,8 +135,8 @@ def test_errors_full_messages_uses_format
test
"validates_format_of on generated message
#{
name
}
"
do
Person
.
validates_format_of
:title
,
validation_options
.
merge
(
with:
/\A[1-9][0-9]*\z/
)
@person
.
title
=
'72x'
@mock_generator
.
expect
(
:call
,
nil
,
[
:title
,
:invalid
,
generate_message_options
.
merge
(
value:
'72x'
)])
@person
.
errors
.
stub
(
:generate_message
,
@mock_generator
)
do
call
=
[
:title
,
:invalid
,
generate_message_options
.
merge
(
value:
'72x'
)]
assert_called_with
(
@person
.
errors
,
:generate_message
,
call
)
do
@person
.
valid?
end
end
...
...
@@ -151,8 +148,8 @@ def test_errors_full_messages_uses_format
test
"validates_inclusion_of on generated message
#{
name
}
"
do
Person
.
validates_inclusion_of
:title
,
validation_options
.
merge
(
in:
%w(a b c)
)
@person
.
title
=
'z'
@mock_generator
.
expect
(
:call
,
nil
,
[
:title
,
:inclusion
,
generate_message_options
.
merge
(
value:
'z'
)])
@person
.
errors
.
stub
(
:generate_message
,
@mock_generator
)
do
call
=
[
:title
,
:inclusion
,
generate_message_options
.
merge
(
value:
'z'
)]
assert_called_with
(
@person
.
errors
,
:generate_message
,
call
)
do
@person
.
valid?
end
end
...
...
@@ -164,8 +161,8 @@ def test_errors_full_messages_uses_format
test
"validates_inclusion_of using :within on generated message
#{
name
}
"
do
Person
.
validates_inclusion_of
:title
,
validation_options
.
merge
(
within:
%w(a b c)
)
@person
.
title
=
'z'
@mock_generator
.
expect
(
:call
,
nil
,
[
:title
,
:inclusion
,
generate_message_options
.
merge
(
value:
'z'
)])
@person
.
errors
.
stub
(
:generate_message
,
@mock_generator
)
do
call
=
[
:title
,
:inclusion
,
generate_message_options
.
merge
(
value:
'z'
)]
assert_called_with
(
@person
.
errors
,
:generate_message
,
call
)
do
@person
.
valid?
end
end
...
...
@@ -177,8 +174,8 @@ def test_errors_full_messages_uses_format
test
"validates_exclusion_of generated message
#{
name
}
"
do
Person
.
validates_exclusion_of
:title
,
validation_options
.
merge
(
in:
%w(a b c)
)
@person
.
title
=
'a'
@mock_generator
.
expect
(
:call
,
nil
,
[
:title
,
:exclusion
,
generate_message_options
.
merge
(
value:
'a'
)])
@person
.
errors
.
stub
(
:generate_message
,
@mock_generator
)
do
call
=
[
:title
,
:exclusion
,
generate_message_options
.
merge
(
value:
'a'
)]
assert_called_with
(
@person
.
errors
,
:generate_message
,
call
)
do
@person
.
valid?
end
end
...
...
@@ -190,8 +187,8 @@ def test_errors_full_messages_uses_format
test
"validates_exclusion_of using :within generated message
#{
name
}
"
do
Person
.
validates_exclusion_of
:title
,
validation_options
.
merge
(
within:
%w(a b c)
)
@person
.
title
=
'a'
@mock_generator
.
expect
(
:call
,
nil
,
[
:title
,
:exclusion
,
generate_message_options
.
merge
(
value:
'a'
)])
@person
.
errors
.
stub
(
:generate_message
,
@mock_generator
)
do
call
=
[
:title
,
:exclusion
,
generate_message_options
.
merge
(
value:
'a'
)]
assert_called_with
(
@person
.
errors
,
:generate_message
,
call
)
do
@person
.
valid?
end
end
...
...
@@ -203,8 +200,8 @@ def test_errors_full_messages_uses_format
test
"validates_numericality_of generated message
#{
name
}
"
do
Person
.
validates_numericality_of
:title
,
validation_options
@person
.
title
=
'a'
@mock_generator
.
expect
(
:call
,
nil
,
[
:title
,
:not_a_number
,
generate_message_options
.
merge
(
value:
'a'
)])
@person
.
errors
.
stub
(
:generate_message
,
@mock_generator
)
do
call
=
[
:title
,
:not_a_number
,
generate_message_options
.
merge
(
value:
'a'
)]
assert_called_with
(
@person
.
errors
,
:generate_message
,
call
)
do
@person
.
valid?
end
end
...
...
@@ -216,8 +213,8 @@ def test_errors_full_messages_uses_format
test
"validates_numericality_of for :only_integer on generated message
#{
name
}
"
do
Person
.
validates_numericality_of
:title
,
validation_options
.
merge
(
only_integer:
true
)
@person
.
title
=
'0.0'
@mock_generator
.
expect
(
:call
,
nil
,
[
:title
,
:not_an_integer
,
generate_message_options
.
merge
(
value:
'0.0'
)])
@person
.
errors
.
stub
(
:generate_message
,
@mock_generator
)
do
call
=
[
:title
,
:not_an_integer
,
generate_message_options
.
merge
(
value:
'0.0'
)]
assert_called_with
(
@person
.
errors
,
:generate_message
,
call
)
do
@person
.
valid?
end
end
...
...
@@ -229,8 +226,8 @@ def test_errors_full_messages_uses_format
test
"validates_numericality_of for :odd on generated message
#{
name
}
"
do
Person
.
validates_numericality_of
:title
,
validation_options
.
merge
(
only_integer:
true
,
odd:
true
)
@person
.
title
=
0
@mock_generator
.
expect
(
:call
,
nil
,
[
:title
,
:odd
,
generate_message_options
.
merge
(
value:
0
)])
@person
.
errors
.
stub
(
:generate_message
,
@mock_generator
)
do
call
=
[
:title
,
:odd
,
generate_message_options
.
merge
(
value:
0
)]
assert_called_with
(
@person
.
errors
,
:generate_message
,
call
)
do
@person
.
valid?
end
end
...
...
@@ -242,8 +239,8 @@ def test_errors_full_messages_uses_format
test
"validates_numericality_of for :less_than on generated message
#{
name
}
"
do
Person
.
validates_numericality_of
:title
,
validation_options
.
merge
(
only_integer:
true
,
less_than:
0
)
@person
.
title
=
1
@mock_generator
.
expect
(
:call
,
nil
,
[
:title
,
:less_than
,
generate_message_options
.
merge
(
value:
1
,
count:
0
)])
@person
.
errors
.
stub
(
:generate_message
,
@mock_generator
)
do
call
=
[
:title
,
:less_than
,
generate_message_options
.
merge
(
value:
1
,
count:
0
)]
assert_called_with
(
@person
.
errors
,
:generate_message
,
call
)
do
@person
.
valid?
end
end
...
...
activemodel/test/cases/validations/with_validation_test.rb
浏览文件 @
8a389ffc
...
...
@@ -97,7 +97,7 @@ def check_validity!
test
"passes all configuration options to the validator class"
do
topic
=
Topic
.
new
validator
=
Mini
T
est
::
Mock
.
new
validator
=
Mini
t
est
::
Mock
.
new
validator
.
expect
(
:new
,
validator
,
[{
foo: :bar
,
if:
"1 == 1"
,
class:
Topic
}])
validator
.
expect
(
:validate
,
nil
,
[
topic
])
validator
.
expect
(
:is_a?
,
false
,
[
Symbol
])
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录