@@ -19,28 +19,30 @@ def test_validate_siret
1919 Company . validates_siret_of ( :siret )
2020
2121 model = Company . new ( siret : INVALID_SIRET )
22+
2223 assert_predicate model , :invalid?
23- assert model . errors . has_key ?( :siret )
24+ assert model . errors . key ?( :siret )
2425
2526 model . siret = VALID_SIRET
27+
2628 assert_predicate model , :valid?
27- refute model . errors . has_key ?( :siret )
29+ refute model . errors . key ?( :siret )
2830 end
2931
3032 def test_validate_siret_cases
3133 Company . validates_siret_of ( :siret )
3234
3335 cases = {
34- nil => :wrong_siret_format , # nil
35- "" => :wrong_siret_format , # blank
36- "8216114310003" => :wrong_siret_format , # too short
37- "invalid--siret" => :wrong_siret_format , # invalid characters
38- "82161143100031" => nil , # valid siret
36+ nil => :wrong_siret_format , # nil
37+ "" => :wrong_siret_format , # blank
38+ "8216114310003" => :wrong_siret_format , # too short
39+ "invalid--siret" => :wrong_siret_format , # invalid characters
40+ "82161143100031" => nil , # valid siret
3941 "821611431000314" => :wrong_siret_format , # too long
40- "82161143100039" => :invalid , # invalid luhn
41- "35600000000048" => nil , # La Poste siège
42- "35600000041461" => nil , # La Poste établissement
43- "35600000041462" => :invalid # invalid La Poste établissement
42+ "82161143100039" => :invalid , # invalid luhn
43+ "35600000000048" => nil , # La Poste siège
44+ "35600000041461" => nil , # La Poste établissement
45+ "35600000041462" => :invalid # invalid La Poste établissement
4446 }
4547
4648 cases . each do |( siret , expected_error ) |
@@ -70,27 +72,29 @@ def test_validate_siret_localized_message
7072 c = Company . new ( siret : "foo" )
7173
7274 with_locale ( :en ) do
73- assert_equal c . tap ( & :validate ) . errors [ :siret ] , [ "is the wrong length (should be 14 digits)" ]
75+ assert_equal [ "is the wrong length (should be 14 digits)" ] , c . tap ( & :validate ) . errors [ :siret ]
7476 end
7577
7678 with_locale ( :fr ) do
77- assert_equal c . tap ( & :validate ) . errors [ :siret ] , [ "ne fait pas la bonne longueur (doit comporter 14 chiffres)" ]
79+ assert_equal [ "ne fait pas la bonne longueur (doit comporter 14 chiffres)" ] , c . tap ( & :validate ) . errors [ :siret ]
7880 end
7981 end
8082
8183 def test_validate_siret_with_custom_message
8284 Company . validates_siret_of ( :siret , message : "is invalid" )
8385
8486 c = Company . new ( siret : "foo" ) . tap ( &:validate )
85- assert_equal c . errors [ :siret ] , [ "is invalid" ]
87+
88+ assert_equal [ "is invalid" ] , c . errors [ :siret ]
8689 end
8790
8891 private
8992
9093 def assert_siret_validity ( siret , expected_error )
9194 model = Company . new ( siret : siret ) . tap ( &:validate )
9295 if expected_error . present?
93- assert ( model . errors . where ( :siret , expected_error ) . present? , "Expected '#{ siret } ' to generate a ':#{ expected_error } ' validation error" )
96+ assert_predicate ( model . errors . where ( :siret , expected_error ) , :present? ,
97+ "Expected '#{ siret } ' to generate a ':#{ expected_error } ' validation error" )
9498 else
9599 assert_empty ( model . errors [ :siret ] , "Expected '#{ siret } ' to be valid" )
96100 end
0 commit comments