Cimpress-MCP#62 moved the postal code check down and added a test so …

…that empty postal codes are valid as well for countries that don't have a postal code standard
jonathanheijmans · Jan 4, 2021 · e860fb4 · e860fb4
1 parent 588af79
commit e860fb4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/postal-codes.js b/postal-codes.js
@@ -17,10 +17,6 @@ module.exports.validate = function (countryCode, postalCode) {
         return "Missing country code.";
     }
 
-    if ( !postalCode ) {
-        return 'Missing postal code.';
-    }
-
     var countryData = undefined;
     var preparedCountryCode = countryCode.trim().toUpperCase();
 
@@ -43,6 +39,10 @@ module.exports.validate = function (countryCode, postalCode) {
         return true;
     }
 
+    if ( !postalCode ) {
+      return 'Missing postal code.';
+    }
+
     var format = getFormat(countryData.postalCodeFormat);
     if ( !format ) {
         return 'Failed to load postal code format "' + countryData.postalCodeFormat + '".';

diff --git a/test/validationTests.js b/test/validationTests.js
@@ -49,6 +49,12 @@ describe('Postal codes border cases: ', function () {
             description: 'should return error when postal code is null',
             expectedResult: 'Missing postal code.'
         },
+        {
+            countryCode: 'bw',
+            postalCode: undefined,
+            description: 'should return true when postal code is undefined and the country does not have a postal code standard',
+            expectedResult: true
+        },
         {
             countryCode: 'gb',
             postalCode: undefined,
@@ -98,4 +104,4 @@ describe('Postal codes border cases: ', function () {
             expect(postalCodes.validate(test.countryCode, test.postalCode)).to.equal(test.expectedResult);
         });
     });
-});
+});