提交 2cce44fa 编写于 作者: A Aaron Patterson

expectations change when using IM. Change oracle tests to reflect that

上级 4bd8d260
......@@ -965,7 +965,10 @@ def test_should_allow_to_bypass_validations_on_associated_models_at_any_depth
values = [@pirate.reload.catchphrase, @pirate.ship.name, *@pirate.ship.parts.map(&:name)]
# Oracle saves empty string as NULL
if current_adapter?(:OracleAdapter)
assert_equal [nil, nil, nil, nil], values
expected = ActiveRecord::IdentityMap.enabled? ?
[nil, nil, '', ''] :
[nil, nil, nil, nil]
assert_equal expected, values
else
assert_equal ['', '', '', ''], values
end
......@@ -1060,7 +1063,8 @@ def test_should_still_allow_to_bypass_validations_on_the_associated_model
@ship.save(:validate => false)
# Oracle saves empty string as NULL
if current_adapter?(:OracleAdapter)
assert_equal [nil, nil], [@ship.reload.name, @ship.pirate.catchphrase]
expected = ActiveRecord::IdentityMap.enabled? ? [nil, ''] : [nil, nil]
assert_equal expected, [@ship.reload.name, @ship.pirate.catchphrase]
else
assert_equal ['', ''], [@ship.reload.name, @ship.pirate.catchphrase]
end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册