Merge pull request #49677 from DmitryPogrebnoy/49670

Make `==(other)` method of AttributeSet safe #49670
rails · Oct 20, 2023 · 5dac2c8 · 5dac2c8
2 parents 7c58911 + 3ed0229
commit 5dac2c8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/activemodel/lib/active_model/attribute_set.rb b/activemodel/lib/active_model/attribute_set.rb
@@ -104,7 +104,7 @@ def reverse_merge!(target_attributes)
     end
 
     def ==(other)
-      attributes == other.attributes
+      other.is_a?(AttributeSet) && attributes == other.send(:attributes)
     end
 
     protected

diff --git a/activemodel/test/cases/attribute_set_test.rb b/activemodel/test/cases/attribute_set_test.rb
@@ -279,6 +279,14 @@ def builder.build_from_database(values = {}, additional_types = {})
       assert_not_equal attributes2, attributes3
     end
 
+    test "==(other) is safe to use with any instance" do
+      attribute_set = AttributeSet.new({})
+
+      assert_equal false, attribute_set == nil
+      assert_equal false, attribute_set == 1
+      assert_equal true, attribute_set == attribute_set
+    end
+
     private
       def attributes_with_uninitialized_key
         builder = AttributeSet::Builder.new(foo: Type::Integer.new, bar: Type::Float.new)