activevalidators 5.1.0 → 6.0.0

data/test/validations/hex_color_test.rb

@@ -14,42 +14,42 @@ describe "Hex-Color Validation" do
   it "accepts blank value" do
     subject.text_color = ''
 
-    subject.must_be :valid?
-    subject.errors.must_be :empty?
+    _(subject).must_be(:valid?)
+    _(subject.errors).must_be(:empty?)
   end
 
   it "accepts 3 hex characters" do
     subject.text_color = 'abc'
 
-    subject.must_be :valid?
-    subject.errors.must_be :empty?
+    _(subject).must_be(:valid?)
+    _(subject.errors).must_be(:empty?)
   end
 
   it "accepts 6 hex characters" do
     subject.text_color = 'abc012'
 
-    subject.must_be :valid?
-    subject.errors.must_be :empty?
+    _(subject).must_be(:valid?)
+    _(subject.errors).must_be(:empty?)
   end
 
   it "rejects non-hex characters" do
     subject.text_color = 'efg345'
 
-    subject.must_be :invalid?
-    subject.errors[:text_color].must_include invalid_message
+    _(subject).must_be(:invalid?)
+    _(subject.errors[:text_color]).must_include(invalid_message)
   end
 
   it "rejects too few characters" do
     subject.text_color = 'ef'
 
-    subject.must_be :invalid?
-    subject.errors[:text_color].must_include invalid_message
+    _(subject).must_be(:invalid?)
+    _(subject.errors[:text_color]).must_include(invalid_message)
   end
 
   it "rejects too many characters" do
     subject.text_color = 'efab001'
 
-    subject.must_be :invalid?
-    subject.errors[:text_color].must_include invalid_message
+    _(subject).must_be(:invalid?)
+    _(subject.errors[:text_color]).must_include(invalid_message)
   end
 end

data/test/validations/ip_test.rb

@@ -6,27 +6,27 @@ describe "IP Validation" do
   describe "IPv4 Validation" do
     it "accepts valid IPs" do
       subject = build_ip_record :v4, :ip => '192.168.1.1'
-      subject.valid?.must_equal true
-      subject.errors.size.must_equal 0
+      _(subject.valid?).must_equal(true)
+      _(subject.errors.size).must_equal(0)
     end
 
     it "accepts IPAddrs" do
       subject = build_ip_record :v4, :ip => IPAddr.new('192.168.1.1')
-      subject.valid?.must_equal true
-      subject.errors.size.must_equal 0
+      _(subject.valid?).must_equal(true)
+      _(subject.errors.size).must_equal(0)
     end
 
     describe "for invalid IPs" do
       it "rejects invalid IPs" do
         subject = build_ip_record :v4, :ip => '267.34.56.3'
-        subject.valid?.must_equal false
-        subject.errors.size.must_equal 1
+        _(subject.valid?).must_equal(false)
+        _(subject.errors.size).must_equal(1)
       end
 
       it "generates an error message of type invalid" do
         subject = build_ip_record  :v4, :ip => '267.34.56.3'
-        subject.valid?.must_equal false
-        subject.errors[:ip].include?(subject.errors.generate_message(:ip, :invalid)).must_equal true
+        _(subject.valid?).must_equal(false)
+        _(subject.errors[:ip].include?(subject.errors.generate_message(:ip, :invalid))).must_equal(true)
       end
     end
   end
@@ -34,27 +34,27 @@ describe "IP Validation" do
   describe "IPv6 Validation" do
     it "accepts valid IPs" do
       subject = build_ip_record :v6, :ip => '::1'
-      subject.valid?.must_equal true
-      subject.errors.size.must_equal 0
+      _(subject.valid?).must_equal(true)
+      _(subject.errors.size).must_equal(0)
     end
 
     it "accepts IPAddrs" do
       subject = build_ip_record :v6, :ip => IPAddr.new('::1')
-      subject.valid?.must_equal true
-      subject.errors.size.must_equal 0
+      _(subject.valid?).must_equal(true)
+      _(subject.errors.size).must_equal(0)
     end
 
     describe "for invalid IPs" do
       it "rejects invalid IPs" do
         subject = build_ip_record :v6, :ip => '192.168.1.1'
-        subject.valid?.must_equal false
-        subject.errors.size.must_equal 1
+        _(subject.valid?).must_equal(false)
+        _(subject.errors.size).must_equal(1)
       end
 
       it "generates an error message of type invalid" do
         subject = build_ip_record :v6, :ip => '192.168.1.1'
-        subject.valid?.must_equal false
-        subject.errors[:ip].include?(subject.errors.generate_message(:ip, :invalid)).must_equal true
+        _(subject.valid?).must_equal(false)
+        _(subject.errors[:ip].include?(subject.errors.generate_message(:ip, :invalid))).must_equal(true)
       end
     end
   end

data/test/validations/nino_test.rb

@@ -6,7 +6,7 @@ describe "NINO validations" do
     describe "for invalid" do
       it "rejects empty nino" do
         subject = build_nino_record({:nino => ''})
-        subject.valid?.must_equal false
+        _(subject.valid?).must_equal(false)
       end
 
       it "rejects nino, which has invalid first letter" do
@@ -14,7 +14,7 @@ describe "NINO validations" do
         invalid_first_letter.each do |letter|
           invalid_nino = letter + 'B123456C'
           subject = build_nino_record({:nino => invalid_nino})
-          subject.valid?.must_equal false
+          _(subject.valid?).must_equal(false)
         end
       end
 
@@ -23,23 +23,23 @@ describe "NINO validations" do
         invalid_second_letter.each do |letter|
           invalid_nino = 'a' + letter + '123456C'
           subject = build_nino_record({:nino => invalid_nino})
-          subject.valid?.must_equal false
+          _(subject.valid?).must_equal(false)
         end
       end
 
       it "rejects too long nino" do
         subject = build_nino_record({:nino => 'AB123456C100200'})
-        subject.valid?.must_equal false
+        _(subject.valid?).must_equal(false)
       end
 
       it "rejects nino with invalid prefix" do
         subject = build_nino_record({:nino => '#$123456C'})
-        subject.valid?.must_equal false
+        _(subject.valid?).must_equal(false)
       end
 
       it "rejects nino with invalid chars in number section" do
         subject = build_nino_record({:nino => 'AB@2%4#6C'})
-        subject.valid?.must_equal false
+        _(subject.valid?).must_equal(false)
       end
 
       it "rejects wrong suffixes" do
@@ -47,7 +47,7 @@ describe "NINO validations" do
         invalid_suffix.each do |suffix|
           invalid_nino = 'AB123456' + suffix
           subject = build_nino_record({:nino => invalid_nino})
-          subject.valid?.must_equal false
+          _(subject.valid?).must_equal(false)
         end
       end
 
@@ -56,7 +56,7 @@ describe "NINO validations" do
         non_allocated_prefixes.each do |suffix|
           invalid_nino = suffix + '123456C'
           subject = build_nino_record({:nino => invalid_nino})
-          subject.valid?.must_equal false
+          _(subject.valid?).must_equal(false)
         end
       end
 
@@ -65,30 +65,30 @@ describe "NINO validations" do
         administrative_numbers.each do |suffix|
           invalid_nino = suffix + '123456C'
           subject = build_nino_record({:nino => invalid_nino})
-          subject.valid?.must_equal false
+          _(subject.valid?).must_equal(false)
         end
       end
 
       it "rejects temporary numbers" do
         subject = build_nino_record({:nino => '63T12345'})
-        subject.valid?.must_equal false
+        _(subject.valid?).must_equal(false)
       end
     end
 
     describe "for valid" do
       it "acepts correct nino" do
         subject = build_nino_record({:nino => 'AB123456C'})
-        subject.valid?.must_equal true
+        _(subject.valid?).must_equal(true)
       end
 
       it "acepts nino, divided by spaces" do
         subject = build_nino_record({:nino => 'AB 12 34 56 C'})
-        subject.valid?.must_equal true
+        _(subject.valid?).must_equal(true)
       end
 
       it "acepts downcase nino" do
         subject = build_nino_record({:nino => 'ab 12 34 56 c'})
-        subject.valid?.must_equal true
+        _(subject.valid?).must_equal(true)
       end
 
       it "acepts correct suffixes" do
@@ -96,7 +96,7 @@ describe "NINO validations" do
         valid_suffix.each do |suffix|
           valid_nino = 'AB123456' + suffix
           subject = build_nino_record({:nino => valid_nino})
-          subject.valid?.must_equal true
+          _(subject.valid?).must_equal(true)
         end
       end
     end

data/test/validations/password_test.rb

@@ -13,22 +13,22 @@ describe "Password Validation" do
       describe "valid passwords" do
         it "accepts a #{strength} password like #{passwords[:valid]}" do
           subject = build_password_record strength, :password => passwords[:valid]
-          subject.valid?.must_equal true
-          subject.errors.size.must_equal 0
+          _(subject.valid?).must_equal(true)
+          _(subject.errors.size).must_equal(0)
         end
       end
 
       describe "invalid passwords" do
         it "rejects invalid passwords like #{passwords[:invalid]}" do
           subject = build_password_record strength, :password => passwords[:invalid]
-          subject.valid?.must_equal false
-          subject.errors.size.must_equal 1
+          _(subject.valid?).must_equal(false)
+          _(subject.errors.size).must_equal(1)
         end
 
         it "generates an error message of type invalid" do
           subject = build_password_record strength, :password => passwords[:invalid]
-          subject.valid?.must_equal false
-          subject.errors[:password].include?(subject.errors.generate_message(:password, :invalid)).must_equal true
+          _(subject.valid?).must_equal(false)
+          _(subject.errors[:password].include?(subject.errors.generate_message(:password, :invalid))).must_equal(true)
         end
       end
     end

data/test/validations/phone_test.rb

@@ -12,13 +12,13 @@ describe "Phone Validation" do
     it "allows numbers matching that country" do
       subject = build_phone_validation(country: :gb)
       subject.phone = '+441234567890'
-      subject.valid?.must_equal true
+      _(subject.valid?).must_equal(true)
     end
 
     it "does not allow numbers from other countries" do
       subject = build_phone_validation(country: :gb)
       subject.phone = '+19999999999'
-      subject.valid?.must_equal false
+      _(subject.valid?).must_equal(false)
     end
   end
 
@@ -26,36 +26,36 @@ describe "Phone Validation" do
     it 'should validate format of phone with ###-###-####' do
       subject = build_phone_validation true
       subject.phone = '1-999-999-9999'
-      subject.valid?.must_equal true
-      subject.errors.size.must_equal 0
+      _(subject.valid?).must_equal(true)
+      _(subject.errors.size).must_equal(0)
     end
 
     it 'should validate format of phone with ##########' do
       subject = build_phone_validation true
       subject.phone = '19999999999'
-      subject.valid?.must_equal true
-      subject.errors.size.must_equal 0
+      _(subject.valid?).must_equal(true)
+      _(subject.errors.size).must_equal(0)
     end
 
     it 'should validate format of phone with ###.###.####' do
       subject = build_phone_validation true
       subject.phone = '1999.999.9999'
-      subject.valid?.must_equal true
-      subject.errors.size.must_equal 0
+      _(subject.valid?).must_equal(true)
+      _(subject.errors.size).must_equal(0)
     end
 
     it 'should validate format of phone with ### ### ####' do
       subject = build_phone_validation true
       subject.phone = '1999 999 9999'
-      subject.valid?.must_equal true
-      subject.errors.size.must_equal 0
+      _(subject.valid?).must_equal(true)
+      _(subject.errors.size).must_equal(0)
     end
 
     it 'should validate format of phone with (###) ###-####' do
       subject = build_phone_validation true
       subject.phone = '1(999) 999-9999'
-      subject.valid?.must_equal true
-      subject.errors.size.must_equal 0
+      _(subject.valid?).must_equal(true)
+      _(subject.errors.size).must_equal(0)
     end
 
   end
@@ -65,17 +65,17 @@ describe "Phone Validation" do
     it "rejects invalid formats" do
       subject = build_phone_validation true
       subject.phone = '999'
-      subject.valid?.must_equal false
-      subject.errors.size.must_equal 1
+      _(subject.valid?).must_equal(false)
+      _(subject.errors.size).must_equal(1)
     end
 
     it "generates an error message of type invalid" do
       subject = build_phone_validation true
       subject.phone = '999'
-      subject.valid?.must_equal false
+      _(subject.valid?).must_equal(false)
 
       message = subject.errors.generate_message(:phone, :invalid)
-      subject.errors[:phone].include?(message).must_equal true
+      _(subject.errors[:phone].include?(message)).must_equal(true)
     end
   end
 end

data/test/validations/postal_code_test.rb

@@ -12,15 +12,15 @@ describe "Postal Code Validation" do
     it 'should validate format of postal code with #####' do
       subject = build_postal_code_record true
       subject.postal_code = '11211'
-      subject.valid?.must_equal true
-      subject.errors.size.must_equal 0
+      _(subject.valid?).must_equal(true)
+      _(subject.errors.size).must_equal(0)
     end
 
     it 'should validate format of postal code with #####-#####' do
       subject = build_postal_code_record true
       subject.postal_code = '94117-1234'
-      subject.valid?.must_equal true
-      subject.errors.size.must_equal 0
+      _(subject.valid?).must_equal(true)
+      _(subject.errors.size).must_equal(0)
     end
   end
 
@@ -30,15 +30,15 @@ describe "Postal Code Validation" do
         it "should validate format of lowercase postal code with #{format}" do
           subject = build_postal_code_record :country => country
           subject.postal_code = ActiveValidators::OneNineShims::OneNineString.new(format).gsub(/[@#]/, '@' => 'A', '#' => '9')
-          subject.valid?.must_equal true
-          subject.errors.size.must_equal 0
+          _(subject.valid?).must_equal(true)
+          _(subject.errors.size).must_equal(0)
         end
 
         it "should validate format of upcase postal code with #{format}" do
           subject = build_postal_code_record :country => country.upcase
           subject.postal_code = ActiveValidators::OneNineShims::OneNineString.new(format).gsub(/[@#]/, '@' => 'A', '#' => '9')
-          subject.valid?.must_equal true
-          subject.errors.size.must_equal 0
+          _(subject.valid?).must_equal(true)
+          _(subject.errors.size).must_equal(0)
         end
 
         # if format is entirely numeric
@@ -46,8 +46,8 @@ describe "Postal Code Validation" do
           it "should validate format of integer postal code with #{format}" do
             subject = build_postal_code_record :country => country
             subject.postal_code = ActiveValidators::OneNineShims::OneNineString.new(format).gsub(/[@#]/, '@' => 'A', '#' => '9').to_i
-            subject.valid?.must_equal true
-            subject.errors.size.must_equal 0
+            _(subject.valid?).must_equal(true)
+            _(subject.errors.size).must_equal(0)
           end
         end
       end
@@ -59,28 +59,28 @@ describe "Postal Code Validation" do
       # aa is not in ActiveModel::Validations::PostalCodeValidator.known_formats
       subject = build_postal_code_record :country => 'aa'
       subject.postal_code = '999'
-      subject.valid?.must_equal true
-      subject.errors.size.must_equal 0
+      _(subject.valid?).must_equal(true)
+      _(subject.errors.size).must_equal(0)
     end
   end
 
   describe "for invalid formats" do
     it "rejects invalid formats" do
       subject = build_postal_code_record true, :postal_code => '999'
-      subject.valid?.must_equal false
-      subject.errors.size.must_equal 1
+      _(subject.valid?).must_equal(false)
+      _(subject.errors.size).must_equal(1)
     end
 
     it "generates an error message of type invalid" do
       subject = build_postal_code_record true, :postal_code => '999'
-      subject.valid?.must_equal false
-      subject.errors[:postal_code].include?(subject.errors.generate_message(:postal_code, :invalid)).must_equal true
+      _(subject.valid?).must_equal(false)
+      _(subject.errors[:postal_code].include?(subject.errors.generate_message(:postal_code, :invalid))).must_equal(true)
     end
 
     it "rejects injected content" do
       subject = build_postal_code_record true, :postal_code => "injected\n11211"
-      subject.valid?.must_equal false
-      subject.errors.size.must_equal 1
+      _(subject.valid?).must_equal(false)
+      _(subject.errors.size).must_equal(1)
     end
   end
 end

data/test/validations/regexp_test.rb

@@ -14,22 +14,22 @@ describe "Regexp Validation" do
   it "accepts blank value" do
     subject.redirect_rule = ''
 
-    subject.must_be :valid?
-    subject.errors.must_be :empty?
+    _(subject).must_be(:valid?)
+    _(subject.errors).must_be(:empty?)
   end
 
   it "rejects malformed regular expressions" do
     subject.redirect_rule = '['
 
-    subject.must_be :invalid?
-    subject.errors[:redirect_rule].must_include invalid_message
+    _(subject).must_be(:invalid?)
+    _(subject.errors[:redirect_rule]).must_include(invalid_message)
   end
 
   it "allow proper regular expressions" do
     subject.redirect_rule = '^/vanity-url(-2014)?'
 
-    subject.must_be :valid?
-    subject.errors.must_be :empty?
+    _(subject).must_be(:valid?)
+    _(subject.errors).must_be(:empty?)
   end
 
 end