3 files changed, 6 insertions, 21 deletions
diff --git a/activerecord/test/cases/relation/delegation_test.rb b/activerecord/test/cases/relation/delegation_test.rb
index d2382b9bb2..49d4aeafc9 100644
--- a/activerecord/test/cases/relation/delegation_test.rb
+++ b/activerecord/test/cases/relation/delegation_test.rb
@@ -32,7 +32,8 @@ module ActiveRecord
       :exclude?, :find_all, :flat_map, :group_by, :include?, :length,
       :map, :none?, :one?, :partition, :reject, :reverse,
       :sample, :second, :sort, :sort_by, :third,
-      :to_ary, :to_set, :to_xml, :to_yaml, :join
+      :to_ary, :to_set, :to_xml, :to_yaml, :join,
+      :in_groups, :in_groups_of, :to_sentence, :to_formatted_s
     ]
 
     ARRAY_DELEGATES.each do |method|
diff --git a/activerecord/test/cases/relation/mutation_test.rb b/activerecord/test/cases/relation/mutation_test.rb
index 966ae83a3f..4f92f71a09 100644
--- a/activerecord/test/cases/relation/mutation_test.rb
+++ b/activerecord/test/cases/relation/mutation_test.rb
@@ -3,7 +3,7 @@ require "models/post"
 
 module ActiveRecord
   class RelationMutationTest < ActiveRecord::TestCase
-    class FakeKlass < Struct.new(:table_name, :name)
+    FakeKlass = Struct.new(:table_name, :name) do
       extend ActiveRecord::Delegation::DelegateCache
       inherited self
 
@@ -90,7 +90,7 @@ module ActiveRecord
       assert_equal [], relation.extending_values
     end
 
-    (Relation::SINGLE_VALUE_METHODS - [:lock, :reordering, :reverse_order, :create_with, :uniq]).each do |method|
+    (Relation::SINGLE_VALUE_METHODS - [:lock, :reordering, :reverse_order, :create_with]).each do |method|
       test "##{method}!" do
         assert relation.public_send("#{method}!", :foo).equal?(relation)
         assert_equal :foo, relation.public_send("#{method}_value")
@@ -108,7 +108,7 @@ module ActiveRecord
     end
 
     test "#reorder!" do
-      @relation = self.relation.order("foo")
+      @relation = relation.order("foo")
 
       assert relation.reorder!("bar").equal?(relation)
       assert_equal ["bar"], relation.order_values
@@ -161,22 +161,6 @@ module ActiveRecord
     test "distinct!" do
       relation.distinct! :foo
       assert_equal :foo, relation.distinct_value
-
-      assert_deprecated do
-        assert_equal :foo, relation.uniq_value # deprecated access
-      end
-    end
-
-    test "uniq! was replaced by distinct!" do
-      assert_deprecated(/use distinct! instead/) do
-        relation.uniq! :foo
-      end
-
-      assert_deprecated(/use distinct_value instead/) do
-        assert_equal :foo, relation.uniq_value # deprecated access
-      end
-
-      assert_equal :foo, relation.distinct_value
     end
   end
 end
diff --git a/activerecord/test/cases/relation/or_test.rb b/activerecord/test/cases/relation/or_test.rb
index 2796595523..abb7ca72dd 100644
--- a/activerecord/test/cases/relation/or_test.rb
+++ b/activerecord/test/cases/relation/or_test.rb
@@ -79,7 +79,7 @@ module ActiveRecord
       expected = Post.where("id = 1 or id = 2").to_a
       p = Post.where("id = 1")
       p.load
-      assert_equal p.loaded?, true
+      assert_equal true, p.loaded?
       assert_equal expected, p.or(Post.where("id = 2")).to_a
     end