Merge remote-tracking branch 'origin/master' into unlock-minitest

1 files changed, 13 insertions, 0 deletions

diff --git a/activerecord/test/cases/relation/or_test.rb b/activerecord/test/cases/relation/or_test.rb
index 61b6601580..b01801b41f 100644
--- a/activerecord/test/cases/relation/or_test.rb
+++ b/activerecord/test/cases/relation/or_test.rb
@@ -1,9 +1,14 @@
+# frozen_string_literal: true
+
 require "cases/helper"
+require "models/author"
+require "models/categorization"
 require "models/post"
 
 module ActiveRecord
   class OrTest < ActiveRecord::TestCase
     fixtures :posts
+    fixtures :authors
 
     def test_or_with_relation
       expected = Post.where("id = 1 or id = 2").to_a
@@ -113,5 +118,13 @@ module ActiveRecord
         Post.where(id: [1, 2, 3]).or(title: "Rails")
       end
     end
+
+    def test_or_with_references_inequality
+      joined = Post.includes(:author)
+      actual = joined.where(authors: { id: 1 })
+        .or(joined.where(title: "I don't have any comments"))
+      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
   end
 end