@@ -55,12 +55,8 @@ def test_each_when_arity_is_negative
55
55
def test_any?
56
56
errors = ActiveModel ::Errors . new ( Person . new )
57
57
errors . add ( :name )
58
- assert_not_deprecated {
59
- assert errors . any? , "any? should return true"
60
- }
61
- assert_not_deprecated {
62
- assert errors . any? { |_ | true } , "any? should return true"
63
- }
58
+ assert errors . any? , "any? should return true"
59
+ assert errors . any? { |_ | true } , "any? should return true"
64
60
end
65
61
66
62
def test_first
@@ -169,32 +165,6 @@ def test_no_key
169
165
assert_equal [ "cannot be nil" ] , person . errors [ :name ]
170
166
end
171
167
172
- test "add an error message on a specific attribute (deprecated)" do
173
- person = Person . new
174
- person . errors . add ( :name , "cannot be blank" )
175
- assert_equal [ "cannot be blank" ] , person . errors [ :name ]
176
- end
177
-
178
- test "add an error message on a specific attribute with a defined type (deprecated)" do
179
- person = Person . new
180
- person . errors . add ( :name , :blank , message : "cannot be blank" )
181
- assert_equal [ "cannot be blank" ] , person . errors [ :name ]
182
- end
183
-
184
- test "add an error with a symbol (deprecated)" do
185
- person = Person . new
186
- person . errors . add ( :name , :blank )
187
- message = person . errors . generate_message ( :name , :blank )
188
- assert_equal [ message ] , person . errors [ :name ]
189
- end
190
-
191
- test "add an error with a proc (deprecated)" do
192
- person = Person . new
193
- message = Proc . new { "cannot be blank" }
194
- person . errors . add ( :name , message )
195
- assert_equal [ "cannot be blank" ] , person . errors [ :name ]
196
- end
197
-
198
168
test "add creates an error object and returns it" do
199
169
person = Person . new
200
170
error = person . errors . add ( :name , :blank )
@@ -249,6 +219,12 @@ def test_no_key
249
219
assert_equal [ "can't be blank" ] , person . errors [ :name ]
250
220
end
251
221
222
+ test "add an error message on a specific attribute with a defined type" do
223
+ person = Person . new
224
+ person . errors . add ( :name , :blank , message : "cannot be blank" )
225
+ assert_equal [ "cannot be blank" ] , person . errors [ :name ]
226
+ end
227
+
252
228
test "initialize options[:message] as Proc, which evaluates to String" do
253
229
msg = "custom msg"
254
230
type = Proc . new { msg }
@@ -641,16 +617,6 @@ def call
641
617
assert_empty person . errors . details
642
618
end
643
619
644
- test "copy errors (deprecated)" do
645
- errors = ActiveModel ::Errors . new ( Person . new )
646
- errors . add ( :name , :invalid )
647
- person = Person . new
648
- person . errors . copy! ( errors )
649
-
650
- assert_equal [ :name ] , person . errors . messages . keys
651
- assert_equal [ :name ] , person . errors . details . keys
652
- end
653
-
654
620
test "details returns empty array when accessed with non-existent attribute" do
655
621
errors = ActiveModel ::Errors . new ( Person . new )
656
622
@@ -669,18 +635,6 @@ def call
669
635
end
670
636
end
671
637
672
- test "merge errors (deprecated)" do
673
- errors = ActiveModel ::Errors . new ( Person . new )
674
- errors . add ( :name , :invalid )
675
-
676
- person = Person . new
677
- person . errors . add ( :name , :blank )
678
- person . errors . merge! ( errors )
679
-
680
- assert_equal ( { name : [ "can't be blank" , "is invalid" ] } , person . errors . messages )
681
- assert_equal ( { name : [ { error : :blank } , { error : :invalid } ] } , person . errors . details )
682
- end
683
-
684
638
test "merge errors" do
685
639
errors = ActiveModel ::Errors . new ( Person . new )
686
640
errors . add ( :name , :invalid )
0 commit comments