aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/relation
diff options
context:
space:
mode:
authorGraham Turner <turnertgraham@gmail.com>2018-04-25 04:36:27 -0400
committerGraham Turner <turnertgraham@gmail.com>2018-04-25 06:29:03 -0400
commitbc62f2a3bec27497e6963af42f49857926d6d860 (patch)
treebee97a9afb3f1c3ec7a1232ee0dfffec463893d0 /activerecord/test/cases/relation
parent03721d9379c0eeb8b0c93c92301ba7a9caa436a2 (diff)
downloadrails-bc62f2a3bec27497e6963af42f49857926d6d860.tar.gz
rails-bc62f2a3bec27497e6963af42f49857926d6d860.tar.bz2
rails-bc62f2a3bec27497e6963af42f49857926d6d860.zip
`get_value` needs to be a public method
Adds test case for failing issue Moves set_value back to protected
Diffstat (limited to 'activerecord/test/cases/relation')
-rw-r--r--activerecord/test/cases/relation/or_test.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/activerecord/test/cases/relation/or_test.rb b/activerecord/test/cases/relation/or_test.rb
index 7e418f9c7d..065819e0f1 100644
--- a/activerecord/test/cases/relation/or_test.rb
+++ b/activerecord/test/cases/relation/or_test.rb
@@ -126,5 +126,12 @@ module ActiveRecord
expected = Author.find(1).posts + Post.where(title: "I don't have any comments")
assert_equal expected.sort_by(&:id), actual.sort_by(&:id)
end
+
+ def test_or_with_scope_on_association
+ author = Author.first
+ assert_nothing_raised do
+ author.top_posts.or(author.other_top_posts)
+ end
+ end
end
end