9 files changed, 17 insertions, 16 deletions
diff --git a/activerecord/test/cases/callbacks_test.rb b/activerecord/test/cases/callbacks_test.rb
index 51bf51b28d..e2352bd9f9 100644
--- a/activerecord/test/cases/callbacks_test.rb
+++ b/activerecord/test/cases/callbacks_test.rb
@@ -16,7 +16,7 @@ class CallbackDeveloper < ActiveRecord::Base
 
     def define_callback_method(callback_method)
       define_method(callback_method) do
-        self.history << [callback_method, :method]
+        history << [callback_method, :method]
       end
       send(callback_method, :"#{callback_method}")
     end
diff --git a/activerecord/test/cases/column_alias_test.rb b/activerecord/test/cases/column_alias_test.rb
index ae64c99f33..9893ba9580 100644
--- a/activerecord/test/cases/column_alias_test.rb
+++ b/activerecord/test/cases/column_alias_test.rb
@@ -6,9 +6,9 @@ class TestColumnAlias < ActiveRecord::TestCase
 
   QUERY = if "Oracle" == ActiveRecord::Base.connection.adapter_name
     "SELECT id AS pk FROM topics WHERE ROWNUM < 2"
-          else
-            "SELECT id AS pk FROM topics"
-          end
+  else
+    "SELECT id AS pk FROM topics"
+  end
 
   def test_column_alias
     records = Topic.connection.select_all(QUERY)
diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index 64251c5d11..bf0ce18bb8 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -562,9 +562,9 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_take_and_first_and_last_with_integer_should_use_sql_limit
-    assert_sql(/LIMIT|ROWNUM <=/) { Topic.take(3).entries }
-    assert_sql(/LIMIT|ROWNUM <=/) { Topic.first(2).entries }
-    assert_sql(/LIMIT|ROWNUM <=/) { Topic.last(5).entries }
+    assert_sql(/LIMIT|ROWNUM <=|FETCH FIRST/) { Topic.take(3).entries }
+    assert_sql(/LIMIT|ROWNUM <=|FETCH FIRST/) { Topic.first(2).entries }
+    assert_sql(/LIMIT|ROWNUM <=|FETCH FIRST/) { Topic.last(5).entries }
   end
 
   def test_last_with_integer_and_order_should_keep_the_order
diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb
index 6f4b6ddbc0..f799f1e1fa 100644
--- a/activerecord/test/cases/fixtures_test.rb
+++ b/activerecord/test/cases/fixtures_test.rb
@@ -1004,10 +1004,10 @@ class FixtureClassNamesTest < ActiveRecord::TestCase
   end
 
   def teardown
-    self.fixture_class_names.replace(@saved_cache)
+    fixture_class_names.replace(@saved_cache)
   end
 
   test "fixture_class_names returns nil for unregistered identifier" do
-    assert_nil self.fixture_class_names["unregistered_identifier"]
+    assert_nil fixture_class_names["unregistered_identifier"]
   end
 end
diff --git a/activerecord/test/cases/migration/columns_test.rb b/activerecord/test/cases/migration/columns_test.rb
index baf0a0eb9f..70d40ed87a 100644
--- a/activerecord/test/cases/migration/columns_test.rb
+++ b/activerecord/test/cases/migration/columns_test.rb
@@ -75,9 +75,10 @@ module ActiveRecord
       def test_rename_nonexistent_column
         exception = if current_adapter?(:PostgreSQLAdapter, :OracleAdapter)
           ActiveRecord::StatementInvalid
-                    else
-                      ActiveRecord::ActiveRecordError
-                    end
+        else
+          ActiveRecord::ActiveRecordError
+        end
+
         assert_raise(exception) do
           rename_column "test_models", "nonexistent", "should_fail"
         end
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 50d39d942e..5d96569d38 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -313,7 +313,7 @@ class MigrationTest < ActiveRecord::TestCase
       assert_no_column Person, :last_name
 
       migration = Class.new(ActiveRecord::Migration::Current) {
-        self.disable_ddl_transaction!
+        disable_ddl_transaction!
 
         def version; 101 end
         def migrate(x)
diff --git a/activerecord/test/cases/scoping/relation_scoping_test.rb b/activerecord/test/cases/scoping/relation_scoping_test.rb
index 0428e1640e..13007e2e73 100644
--- a/activerecord/test/cases/scoping/relation_scoping_test.rb
+++ b/activerecord/test/cases/scoping/relation_scoping_test.rb
@@ -246,7 +246,7 @@ class NestedRelationScopingTest < ActiveRecord::TestCase
         devs = Developer.all
         sql = devs.to_sql
         assert_match "(salary = 80000)", sql
-        assert_match "LIMIT 10", sql
+        assert_match /LIMIT 10|ROWNUM <= 10|FETCH FIRST 10 ROWS ONLY/, sql
       end
     end
   end
diff --git a/activerecord/test/cases/test_case.rb b/activerecord/test/cases/test_case.rb
index b0f5b5ca4a..b4f5226f2b 100644
--- a/activerecord/test/cases/test_case.rb
+++ b/activerecord/test/cases/test_case.rb
@@ -86,7 +86,7 @@ module ActiveRecord
       def clear_log; self.log = []; self.log_all = []; end
     end
 
-    self.clear_log
+    clear_log
 
     self.ignored_sql = [/^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/, /^SAVEPOINT/, /^ROLLBACK TO SAVEPOINT/, /^RELEASE SAVEPOINT/, /^SHOW max_identifier_length/, /^BEGIN/, /^COMMIT/]
 
diff --git a/activerecord/test/cases/transaction_callbacks_test.rb b/activerecord/test/cases/transaction_callbacks_test.rb
index be23fb8a4a..6a7d48871c 100644
--- a/activerecord/test/cases/transaction_callbacks_test.rb
+++ b/activerecord/test/cases/transaction_callbacks_test.rb
@@ -17,7 +17,7 @@ class TransactionCallbacksTest < ActiveRecord::TestCase
 
     attr_accessor :save_on_after_create
     after_create do
-      self.save! if save_on_after_create
+      save! if save_on_after_create
     end
 
     def history