1 files changed, 7 insertions, 12 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index dc68b01386..dc6fe1640e 100644
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -1792,12 +1792,7 @@ module ActiveRecord
         #   has_and_belongs_to_many :nations, class_name: "Country"
         #   has_and_belongs_to_many :categories, join_table: "prods_cats"
         #   has_and_belongs_to_many :categories, -> { readonly }
-        def has_and_belongs_to_many(name, scope = nil, options = {}, &extension)
-          if scope.is_a?(Hash)
-            options = scope
-            scope   = nil
-          end
-
+        def has_and_belongs_to_many(name, scope = nil, **options, &extension)
           habtm_reflection = ActiveRecord::Reflection::HasAndBelongsToManyReflection.new(name, scope, options, self)
 
           builder = Builder::HasAndBelongsToMany.new name, self, options
@@ -1815,12 +1810,12 @@ module ActiveRecord
 
           include Module.new {
             class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def destroy_associations
-            association(:#{middle_reflection.name}).delete_all(:delete_all)
-            association(:#{name}).reset
-            super
-          end
-          RUBY
+              def destroy_associations
+                association(:#{middle_reflection.name}).delete_all(:delete_all)
+                association(:#{name}).reset
+                super
+              end
+            RUBY
           }
 
           hm_options = {}