11 files changed, 15 insertions, 17 deletions
diff --git a/activerecord/test/cases/autosave_association_test.rb b/activerecord/test/cases/autosave_association_test.rb
index 6d31b7a091..2203aa1788 100644
--- a/activerecord/test/cases/autosave_association_test.rb
+++ b/activerecord/test/cases/autosave_association_test.rb
@@ -37,7 +37,7 @@ class TestAutosaveAssociationsInGeneral < ActiveRecord::TestCase
       private
 
         def should_be_cool
-          unless self.first_name == "cool"
+          unless first_name == "cool"
             errors.add :first_name, "not cool"
           end
         end
diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb
index ffd5c1395d..b29733a676 100644
--- a/activerecord/test/cases/calculations_test.rb
+++ b/activerecord/test/cases/calculations_test.rb
@@ -13,9 +13,9 @@ require "models/speedometer"
 require "models/ship_part"
 require "models/treasure"
 require "models/developer"
+require "models/post"
 require "models/comment"
 require "models/rating"
-require "models/post"
 
 class NumericData < ActiveRecord::Base
   self.table_name = "numeric_data"
diff --git a/activerecord/test/cases/callbacks_test.rb b/activerecord/test/cases/callbacks_test.rb
index 11ec6fb2c5..53ff037de1 100644
--- a/activerecord/test/cases/callbacks_test.rb
+++ b/activerecord/test/cases/callbacks_test.rb
@@ -125,11 +125,11 @@ class ContextualCallbacksDeveloper < ActiveRecord::Base
   after_validation :after_validation_on_create_and_update, on: [ :create, :update ]
 
   def before_validation_on_create_and_update
-    history << "before_validation_on_#{self.validation_context}".to_sym
+    history << "before_validation_on_#{validation_context}".to_sym
   end
 
   def after_validation_on_create_and_update
-    history << "after_validation_on_#{self.validation_context}".to_sym
+    history << "after_validation_on_#{validation_context}".to_sym
   end
 
   def history
diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb
index dd48053823..61e596e208 100644
--- a/activerecord/test/cases/fixtures_test.rb
+++ b/activerecord/test/cases/fixtures_test.rb
@@ -7,6 +7,7 @@ require "models/binary"
 require "models/book"
 require "models/bulb"
 require "models/category"
+require "models/post"
 require "models/comment"
 require "models/company"
 require "models/computer"
@@ -19,7 +20,6 @@ require "models/matey"
 require "models/other_dog"
 require "models/parrot"
 require "models/pirate"
-require "models/post"
 require "models/randomly_named_c1"
 require "models/reply"
 require "models/ship"
@@ -1012,7 +1012,7 @@ end
 
 class FixtureClassNamesTest < ActiveRecord::TestCase
   def setup
-    @saved_cache = self.fixture_class_names.dup
+    @saved_cache = fixture_class_names.dup
   end
 
   def teardown
diff --git a/activerecord/test/cases/locking_test.rb b/activerecord/test/cases/locking_test.rb
index 95fb670dac..9e42242e55 100644
--- a/activerecord/test/cases/locking_test.rb
+++ b/activerecord/test/cases/locking_test.rb
@@ -18,7 +18,7 @@ class LockWithoutDefault < ActiveRecord::Base; end
 
 class LockWithCustomColumnWithoutDefault < ActiveRecord::Base
   self.table_name = :lock_without_defaults_cust
-  self.column_defaults # to test @column_defaults caching.
+  column_defaults # to test @column_defaults caching.
   self.locking_column = :custom_lock_version
 end
 
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 082cfd3242..1602b3f757 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -887,7 +887,7 @@ if ActiveRecord::Base.connection.supports_bulk_alter?
       assert_equal :datetime, column(:birthdate).type
     end
 
-    protected
+    private
 
       def with_bulk_change_table
         # Reset columns/indexes cache as we're changing the table
diff --git a/activerecord/test/cases/query_cache_test.rb b/activerecord/test/cases/query_cache_test.rb
index 4c47a487ac..324c2f4388 100644
--- a/activerecord/test/cases/query_cache_test.rb
+++ b/activerecord/test/cases/query_cache_test.rb
@@ -280,18 +280,18 @@ class QueryCacheTest < ActiveRecord::TestCase
 
     # Warm up the cache by running the query
     assert_queries(1) do
-      assert_equal 0, Post.where(title: 'test').to_a.count
+      assert_equal 0, Post.where(title: "test").to_a.count
     end
 
     # Check that if the same query is run again, no queries are executed
     assert_queries(0) do
-      assert_equal 0, Post.where(title: 'test').to_a.count
+      assert_equal 0, Post.where(title: "test").to_a.count
     end
 
     ActiveRecord::Base.connection.uncached do
       # Check that new query is executed, avoiding the cache
       assert_queries(1) do
-        assert_equal 0, Post.where(title: 'test').to_a.count
+        assert_equal 0, Post.where(title: "test").to_a.count
       end
     end
   end
diff --git a/activerecord/test/cases/relation/mutation_test.rb b/activerecord/test/cases/relation/mutation_test.rb
index 2cbbc775ce..de15eb9187 100644
--- a/activerecord/test/cases/relation/mutation_test.rb
+++ b/activerecord/test/cases/relation/mutation_test.rb
@@ -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
diff --git a/activerecord/test/cases/timestamp_test.rb b/activerecord/test/cases/timestamp_test.rb
index 7766a74612..39b40e3411 100644
--- a/activerecord/test/cases/timestamp_test.rb
+++ b/activerecord/test/cases/timestamp_test.rb
@@ -422,7 +422,7 @@ class TimestampTest < ActiveRecord::TestCase
       self.table_name = "people"
 
       before_create do
-        self.born_at = self.created_at
+        self.born_at = created_at
       end
     end
 
diff --git a/activerecord/test/models/company.rb b/activerecord/test/models/company.rb
index 4561b3132b..20e37710e7 100644
--- a/activerecord/test/models/company.rb
+++ b/activerecord/test/models/company.rb
@@ -216,14 +216,12 @@ class Account < ActiveRecord::Base
 
   validate :check_empty_credit_limit
 
-  protected
+  private
 
     def check_empty_credit_limit
       errors.add("credit_limit", :blank) if credit_limit.blank?
     end
 
-  private
-
     def private_method
       "Sir, yes sir!"
     end
diff --git a/activerecord/test/models/customer.rb b/activerecord/test/models/customer.rb
index 60af7c2247..3d40cb1ace 100644
--- a/activerecord/test/models/customer.rb
+++ b/activerecord/test/models/customer.rb
@@ -56,7 +56,7 @@ class GpsLocation
   end
 
   def ==(other)
-    self.latitude == other.latitude && self.longitude == other.longitude
+    latitude == other.latitude && longitude == other.longitude
   end
 end