Merge pull request #832 from DavyJonesLocker/bugfix/fix-rails-edge-su…

…pport Fix support for Rails edge (7.0.0.alpha)
DavyJonesLocker · Apr 24, 2021 · 027fea2 · 027fea2
2 parents 88b73c3 + 0d5bd31
commit 027fea2
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/lib/client_side_validations/active_model/numericality.rb b/lib/client_side_validations/active_model/numericality.rb
@@ -6,7 +6,14 @@ module Numericality
       @@option_map = {}
 
       def self.included(base)
-        @@option_map.merge!(base::CHECKS.keys.inject({}) { |acc, elem| acc.merge!(elem => elem) })
+        checks =
+          if base.const_defined?('RESERVED_OPTIONS')
+            base::RESERVED_OPTIONS - [:only_integer]
+          else
+            base::CHECKS.keys
+          end
+
+        @@option_map.merge!(checks.inject({}) { |acc, elem| acc.merge!(elem => elem) })
         super
       end