aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2017-07-16 21:03:29 +0200
committerGitHub <noreply@github.com>2017-07-16 21:03:29 +0200
commit919b55d9747f69c566616d740616d11ef2db8c58 (patch)
tree48039fb65268710d1b0586fefd7c8a8696448534 /activerecord/test/cases
parentc74820d516bdb731a3df3c94192a542abb6c393b (diff)
parentd476553d1cdeee0805585c2d4e2e6ee6be841288 (diff)
downloadrails-919b55d9747f69c566616d740616d11ef2db8c58.tar.gz
rails-919b55d9747f69c566616d740616d11ef2db8c58.tar.bz2
rails-919b55d9747f69c566616d740616d11ef2db8c58.zip
Merge pull request #29814 from kamipo/dont_cache_scope_for_create
Don't cache `scope_for_create`
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r--activerecord/test/cases/relation_test.rb12
1 files changed, 2 insertions, 10 deletions
diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb
index d2859cbafd..82b071fb98 100644
--- a/activerecord/test/cases/relation_test.rb
+++ b/activerecord/test/cases/relation_test.rb
@@ -89,21 +89,13 @@ module ActiveRecord
def test_create_with_value_with_wheres
relation = Relation.new(Post, Post.arel_table, Post.predicate_builder)
- relation.where!(id: 10)
- relation.create_with_value = { hello: "world" }
- assert_equal({ "hello" => "world", "id" => 10 }, relation.scope_for_create)
- end
-
- # FIXME: is this really wanted or expected behavior?
- def test_scope_for_create_is_cached
- relation = Relation.new(Post, Post.arel_table, Post.predicate_builder)
assert_equal({}, relation.scope_for_create)
relation.where!(id: 10)
- assert_equal({}, relation.scope_for_create)
+ assert_equal({ "id" => 10 }, relation.scope_for_create)
relation.create_with_value = { hello: "world" }
- assert_equal({}, relation.scope_for_create)
+ assert_equal({ "hello" => "world", "id" => 10 }, relation.scope_for_create)
end
def test_bad_constants_raise_errors