From 6c4306be71b37f3057087f6debf169c1681c5692 Mon Sep 17 00:00:00 2001
From: Ryuta Kamizono <kamipo@gmail.com>
Date: Tue, 29 Dec 2020 16:19:45 +0900
Subject: [PATCH] Move `set_options_for_callback` into
 `Callbacks::ClassMethods`

https://buildkite.com/rails/rails/builds/73736#864bc31e-384d-4e38-8165-0d3256ac3f3d/968-979
---
 .../lib/active_model/validations/callbacks.rb | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/activemodel/lib/active_model/validations/callbacks.rb b/activemodel/lib/active_model/validations/callbacks.rb
index ca371bcc7f..38642272f2 100644
--- a/activemodel/lib/active_model/validations/callbacks.rb
+++ b/activemodel/lib/active_model/validations/callbacks.rb
@@ -96,6 +96,19 @@ def after_validation(*args, &block)
 
           set_callback(:validation, :after, *args, options, &block)
         end
+
+        private
+          def set_options_for_callback(options)
+            if options.key?(:on)
+              options[:on] = Array(options[:on])
+              options[:if] = [
+                ->(o) {
+                  !(options[:on] & Array(o.validation_context)).empty?
+                },
+                *options[:if]
+              ]
+            end
+          end
       end
 
     private
@@ -103,18 +116,6 @@ def after_validation(*args, &block)
       def run_validations!
         _run_validation_callbacks { super }
       end
-
-      def set_options_for_callback(options)
-        if options.key?(:on)
-          options[:on] = Array(options[:on])
-          options[:if] = [
-            ->(o) {
-              !(options[:on] & Array(o.validation_context)).empty?
-            },
-            *options[:if]
-          ]
-        end
-      end
     end
   end
 end