提交 95889244 编写于 作者: C Carlos Antonio da Silva

Update test name to reflect change in how scopes merging works

Introduced in f1082b85.
Full changelog in 9f007d7f.

[ci skip]
上级 9f007d7f
......@@ -167,7 +167,6 @@ def scope(name, body, &block)
scope = relation.merge(scope)
scope.default_scoped = default_scoped
end
else
scope = body
end
......
......@@ -309,7 +309,7 @@ def test_chaining_with_duplicate_joins
assert_equal post.comments.size, Post.joins(join).joins(join).where("posts.id = #{post.id}").size
end
def test_chaining_should_use_latest_conditions_when_creating
def test_chaining_applies_last_conditions_when_creating
post = Topic.rejected.new
assert !post.approved?
......@@ -323,7 +323,7 @@ def test_chaining_should_use_latest_conditions_when_creating
assert post.approved?
end
def test_chaining_should_use_latest_conditions_when_searching
def test_chaining_combines_conditions_when_searching
# Normal hash conditions
assert_equal Topic.where(approved: false).where(approved: true).to_a, Topic.rejected.approved.to_a
assert_equal Topic.where(approved: true).where(approved: false).to_a, Topic.approved.rejected.to_a
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册