diff options
| author | Matthew Draper <matthew@trebex.net> | 2017-08-02 21:15:08 +0930 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-02 21:15:08 +0930 |
| commit | 686261f0df560cd720231365499ac116f2024a32 (patch) | |
| tree | 0d94936a5d9a9fa5c6236335f9889e61cce2e7b4 /activerecord/test | |
| parent | 75436a49843c4a5f27b11bcb6ce4ccbdbb7a5f7a (diff) | |
| parent | f0e6ecc9966f5a569313658bedff54bde8517e65 (diff) | |
| download | rails-686261f0df560cd720231365499ac116f2024a32.tar.gz rails-686261f0df560cd720231365499ac116f2024a32.tar.bz2 rails-686261f0df560cd720231365499ac116f2024a32.zip | |
Merge pull request #29914 from kamipo/relation_merger_should_not_fill_empty_values
`Relation::Merger` should not fill `values` with empty values
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/relation_test.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb index f22fcd7b5a..c1805aa592 100644 --- a/activerecord/test/cases/relation_test.rb +++ b/activerecord/test/cases/relation_test.rb @@ -100,6 +100,14 @@ module ActiveRecord assert_equal({ "hello" => "world", "id" => 10 }, relation.scope_for_create) end + def test_empty_scope + relation = Relation.new(Post, Post.arel_table, Post.predicate_builder) + assert relation.empty_scope? + + relation.merge!(relation) + assert relation.empty_scope? + end + def test_bad_constants_raise_errors assert_raises(NameError) do ActiveRecord::Relation::HelloWorld |