Upgrade Rubocop to 0.61.1 and fix offenses

3 files changed, 59 insertions, 59 deletions

diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index 1248ed00c5..350b044a3e 100644
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -573,49 +573,49 @@ module ActiveRecord
 
       private
 
-      def read_and_insert(fixtures_directory, fixture_files, class_names, connection) # :nodoc:
-        fixtures_map = {}
-        fixture_sets = fixture_files.map do |fixture_set_name|
-          klass = class_names[fixture_set_name]
-          fixtures_map[fixture_set_name] = new( # ActiveRecord::FixtureSet.new
-            nil,
-            fixture_set_name,
-            klass,
-            ::File.join(fixtures_directory, fixture_set_name)
-          )
-        end
-        update_all_loaded_fixtures(fixtures_map)
-
-        insert(fixture_sets, connection)
+        def read_and_insert(fixtures_directory, fixture_files, class_names, connection) # :nodoc:
+          fixtures_map = {}
+          fixture_sets = fixture_files.map do |fixture_set_name|
+            klass = class_names[fixture_set_name]
+            fixtures_map[fixture_set_name] = new( # ActiveRecord::FixtureSet.new
+              nil,
+              fixture_set_name,
+              klass,
+              ::File.join(fixtures_directory, fixture_set_name)
+            )
+          end
+          update_all_loaded_fixtures(fixtures_map)
 
-        fixtures_map
-      end
+          insert(fixture_sets, connection)
 
-      def insert(fixture_sets, connection) # :nodoc:
-        fixture_sets_by_connection = fixture_sets.group_by do |fixture_set|
-          fixture_set.model_class&.connection || connection
+          fixtures_map
         end
 
-        fixture_sets_by_connection.each do |conn, set|
-          table_rows_for_connection = Hash.new { |h, k| h[k] = [] }
+        def insert(fixture_sets, connection) # :nodoc:
+          fixture_sets_by_connection = fixture_sets.group_by do |fixture_set|
+            fixture_set.model_class&.connection || connection
+          end
+
+          fixture_sets_by_connection.each do |conn, set|
+            table_rows_for_connection = Hash.new { |h, k| h[k] = [] }
 
-          set.each do |fixture_set|
-            fixture_set.table_rows.each do |table, rows|
-              table_rows_for_connection[table].unshift(*rows)
+            set.each do |fixture_set|
+              fixture_set.table_rows.each do |table, rows|
+                table_rows_for_connection[table].unshift(*rows)
+              end
             end
-          end
-          conn.insert_fixtures_set(table_rows_for_connection, table_rows_for_connection.keys)
+            conn.insert_fixtures_set(table_rows_for_connection, table_rows_for_connection.keys)
 
-          # Cap primary key sequences to max(pk).
-          if conn.respond_to?(:reset_pk_sequence!)
-            set.each { |fs| conn.reset_pk_sequence!(fs.table_name) }
+            # Cap primary key sequences to max(pk).
+            if conn.respond_to?(:reset_pk_sequence!)
+              set.each { |fs| conn.reset_pk_sequence!(fs.table_name) }
+            end
           end
         end
-      end
 
-      def update_all_loaded_fixtures(fixtures_map) # :nodoc:
-        all_loaded_fixtures.update(fixtures_map)
-      end
+        def update_all_loaded_fixtures(fixtures_map) # :nodoc:
+          all_loaded_fixtures.update(fixtures_map)
+        end
     end
 
     attr_reader :table_name, :name, :fixtures, :model_class, :config
diff --git a/activerecord/lib/active_record/type.rb b/activerecord/lib/active_record/type.rb
index 405936aca6..03d00006b7 100644
--- a/activerecord/lib/active_record/type.rb
+++ b/activerecord/lib/active_record/type.rb
@@ -48,9 +48,9 @@ module ActiveRecord
 
       private
 
-      def current_adapter_name
-        ActiveRecord::Base.connection.adapter_name.downcase.to_sym
-      end
+        def current_adapter_name
+          ActiveRecord::Base.connection.adapter_name.downcase.to_sym
+        end
     end
 
     BigInteger = ActiveModel::Type::BigInteger
diff --git a/activerecord/test/support/config.rb b/activerecord/test/support/config.rb
index bd6d5c339b..de0d90a18f 100644
--- a/activerecord/test/support/config.rb
+++ b/activerecord/test/support/config.rb
@@ -13,34 +13,34 @@ module ARTest
 
     private
 
-    def config_file
-      Pathname.new(ENV["ARCONFIG"] || TEST_ROOT + "/config.yml")
-    end
-
-    def read_config
-      unless config_file.exist?
-        FileUtils.cp TEST_ROOT + "/config.example.yml", config_file
+      def config_file
+        Pathname.new(ENV["ARCONFIG"] || TEST_ROOT + "/config.yml")
       end
 
-      erb = ERB.new(config_file.read)
-      expand_config(YAML.parse(erb.result(binding)).transform)
-    end
+      def read_config
+        unless config_file.exist?
+          FileUtils.cp TEST_ROOT + "/config.example.yml", config_file
+        end
 
-    def expand_config(config)
-      config["connections"].each do |adapter, connection|
-        dbs = [["arunit", "activerecord_unittest"], ["arunit2", "activerecord_unittest2"],
-               ["arunit_without_prepared_statements", "activerecord_unittest"]]
-        dbs.each do |name, dbname|
-          unless connection[name].is_a?(Hash)
-            connection[name] = { "database" => connection[name] }
-          end
+        erb = ERB.new(config_file.read)
+        expand_config(YAML.parse(erb.result(binding)).transform)
+      end
 
-          connection[name]["database"] ||= dbname
-          connection[name]["adapter"]  ||= adapter
+      def expand_config(config)
+        config["connections"].each do |adapter, connection|
+          dbs = [["arunit", "activerecord_unittest"], ["arunit2", "activerecord_unittest2"],
+                 ["arunit_without_prepared_statements", "activerecord_unittest"]]
+          dbs.each do |name, dbname|
+            unless connection[name].is_a?(Hash)
+              connection[name] = { "database" => connection[name] }
+            end
+
+            connection[name]["database"] ||= dbname
+            connection[name]["adapter"]  ||= adapter
+          end
         end
-      end
 
-      config
-    end
+        config
+      end
   end
 end