1 files changed, 36 insertions, 4 deletions
diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb
index f99801c437..e77de19ac3 100644
--- a/activerecord/test/cases/relation_test.rb
+++ b/activerecord/test/cases/relation_test.rb
@@ -9,6 +9,10 @@ module ActiveRecord
     fixtures :posts, :comments, :authors
 
     class FakeKlass < Struct.new(:table_name, :name)
+      extend ActiveRecord::Delegation::DelegateCache
+
+      inherited self
+
       def self.connection
         Post.connection
       end
@@ -76,8 +80,8 @@ module ActiveRecord
     end
 
     def test_table_name_delegates_to_klass
-      relation = Relation.new FakeKlass.new('foo'), :b
-      assert_equal 'foo', relation.table_name
+      relation = Relation.new FakeKlass.new('posts'), :b
+      assert_equal 'posts', relation.table_name
     end
 
     def test_scope_for_create
@@ -177,14 +181,26 @@ module ActiveRecord
     end
 
     test 'merging a hash interpolates conditions' do
-      klass = stub_everything
-      klass.stubs(:sanitize_sql).with(['foo = ?', 'bar']).returns('foo = bar')
+      klass = Class.new(FakeKlass) do
+        def self.sanitize_sql(args)
+          raise unless args == ['foo = ?', 'bar']
+          'foo = bar'
+        end
+      end
 
       relation = Relation.new(klass, :b)
       relation.merge!(where: ['foo = ?', 'bar'])
       assert_equal ['foo = bar'], relation.where_values
     end
 
+    def test_merging_readonly_false
+      relation = Relation.new FakeKlass, :b
+      readonly_false_relation = relation.readonly(false)
+      # test merging in both directions
+      assert_equal false, relation.merge(readonly_false_relation).readonly_value
+      assert_equal false, readonly_false_relation.merge(relation).readonly_value
+    end
+
     def test_relation_merging_with_merged_joins_as_symbols
       special_comments_with_ratings = SpecialComment.joins(:ratings)
       posts_with_special_comments_with_ratings = Post.group("posts.id").joins(:special_comments).merge(special_comments_with_ratings)
@@ -210,6 +226,9 @@ module ActiveRecord
 
   class RelationMutationTest < ActiveSupport::TestCase
     class FakeKlass < Struct.new(:table_name, :name)
+      extend ActiveRecord::Delegation::DelegateCache
+      inherited self
+
       def arel_table
         Post.arel_table
       end
@@ -217,6 +236,10 @@ module ActiveRecord
       def connection
         Post.connection
       end
+
+      def relation_delegate_class(klass)
+        self.class.relation_delegate_class(klass)
+      end
     end
 
     def relation
@@ -296,6 +319,15 @@ module ActiveRecord
       assert relation.reordering_value
     end
 
+    test '#reorder! with symbol prepends the table name' do
+      assert relation.reorder!(:name).equal?(relation)
+      node = relation.order_values.first
+
+      assert node.ascending?
+      assert_equal :name, node.expr.name
+      assert_equal "posts", node.expr.relation.name
+    end
+
     test 'reverse_order!' do
       assert relation.reverse_order!.equal?(relation)
       assert relation.reverse_order_value