Merge pull request #807 from gucki/rails-7.1

Send nil to ActiveSupport#compile which now requires a parameter
zdennis · Aug 11, 2023 · e85a287 · e85a287
2 parents e3331d5 + 41ba6ba
commit e85a287
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -40,7 +40,7 @@ end
 gem "factory_bot"
 gem "timecop"
 gem "chronic"
-gem "mocha", "~> 1.3.0"
+gem "mocha", "~> 2.1.0"
 
 # Debugging
 platforms :jruby do

diff --git a/lib/activerecord-import/import.rb b/lib/activerecord-import/import.rb
@@ -85,7 +85,11 @@ def valid_model?(model)
 
         model.run_callbacks(:validation) do
           if defined?(ActiveSupport::Callbacks::Filters::Environment) # ActiveRecord >= 4.1
-            runner = @validate_callbacks.compile
+            runner = if @validate_callbacks.method(:compile).arity == 0
+              @validate_callbacks.compile
+            else # ActiveRecord >= 7.1
+              @validate_callbacks.compile(nil)
+            end
             env = ActiveSupport::Callbacks::Filters::Environment.new(model, false, nil)
             if runner.respond_to?(:call) # ActiveRecord < 5.1
               runner.call(env)

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -24,7 +24,7 @@
   require 'mocha/test_unit'
 else
   require 'active_support/testing/autorun'
-  require "mocha/mini_test"
+  require "mocha/minitest"
 end
 
 require 'timecop'