Permit frozen models to be validated (rails#47969)

* Permit frozen models to be validated

* Remove initialize method since it's not needed

 Co-authored-by: Rafael Mendonça França <[email protected]>

Author: npezza93

activemodel/lib/active_model/validations.rb

@@ -45,27 +45,6 @@ module Validations
       extend  HelperMethods
       include HelperMethods
 
-      ##
-      # :method: validation_context
-      # Returns the context when running validations.
-      #
-      # This is useful when running validations except a certain context (opposite to the +on+ option).
-      #
-      #   class Person
-      #     include ActiveModel::Validations
-      #
-      #     attr_accessor :name
-      #     validates :name, presence: true, if: -> { validation_context != :custom }
-      #   end
-      #
-      #   person = Person.new
-      #   person.valid?          #=> false
-      #   person.valid?(:new)    #=> false
-      #   person.valid?(:custom) #=> true
-
-      ##
-      attr_accessor :validation_context
-      private :validation_context=
       define_callbacks :validate, scope: :name
 
       class_attribute :_validators, instance_writer: false, default: Hash.new { |h, k| h[k] = [] }
@@ -361,15 +340,23 @@ def errors
     #   person.valid?       # => true
     #   person.valid?(:new) # => false
     def valid?(context = nil)
-      current_context, self.validation_context = validation_context, context
+      current_context = validation_context
+      context_for_validation.context = context
       errors.clear
       run_validations!
     ensure
-      self.validation_context = current_context
+      context_for_validation.context = current_context
     end
 
     alias_method :validate, :valid?
 
+    def freeze
+      errors
+      context_for_validation
+
+      super
+    end
+
     # Performs the opposite of <tt>valid?</tt>. Returns +true+ if errors were
     # added, +false+ otherwise.
     #
@@ -430,7 +417,34 @@ def validate!(context = nil)
     #   end
     alias :read_attribute_for_validation :send
 
+    # Returns the context when running validations.
+    #
+    # This is useful when running validations except a certain context (opposite to the +on+ option).
+    #
+    #   class Person
+    #     include ActiveModel::Validations
+    #
+    #     attr_accessor :name
+    #     validates :name, presence: true, if: -> { validation_context != :custom }
+    #   end
+    #
+    #   person = Person.new
+    #   person.valid?          #=> false
+    #   person.valid?(:new)    #=> false
+    #   person.valid?(:custom) #=> true
+    def validation_context
+      context_for_validation.context
+    end
+
   private
+    def validation_context=(context)
+      context_for_validation.context = context
+    end
+
+    def context_for_validation
+      @context_for_validation ||= ValidationContext.new
+    end
+
     def init_internals
       super
       @errors = nil
@@ -466,6 +480,10 @@ def initialize(model)
       super(I18n.t(:"#{@model.class.i18n_scope}.errors.messages.model_invalid", errors: errors, default: :"errors.messages.model_invalid"))
     end
   end
+
+  class ValidationContext # :nodoc:
+    attr_accessor :context
+  end
 end
 
 Dir[File.expand_path("validations/*.rb", __dir__)].each { |file| require file }

activemodel/test/cases/validations_test.rb

@@ -3,6 +3,7 @@
 require "cases/helper"
 
 require "models/topic"
+require "models/person"
 require "models/reply"
 require "models/custom_reader"
 
@@ -14,6 +15,7 @@ class CustomStrictValidationException < StandardError; end
 
   def teardown
     Topic.clear_validators!
+    Person.clear_validators!
   end
 
   def test_single_field_validation
@@ -453,4 +455,11 @@ def test_validation_with_message_as_proc_that_takes_record_and_data_as_a_paramet
     assert_predicate t, :invalid?
     assert_equal ["Title is missing. You have failed me for the last time, Admiral."], t.errors[:title]
   end
+
+  def test_frozen_models_can_be_validated
+    Person.validates :title, presence: true
+    person = Person.new.freeze
+    assert_predicate person, :frozen?
+    assert_not person.valid?
+  end
 end