feat(isISO31661Alpha2/3): Add tests

Author: johanpoirier-d4

src/lib/isISO31661Alpha2.js

@@ -32,14 +32,21 @@ const validISO31661Alpha2CountriesCodes = new Set([
 const alpha2CountryCode = /^[a-zA-Z]{2}$/;
 
 export default function isISO31661Alpha2(str, options = {}) {
+  assertString(str);
+
   const { userAssignedCodes } = options;
-  (userAssignedCodes || []).forEach((code) => {
-    if (alpha2CountryCode.test(code)) {
-      validISO31661Alpha2CountriesCodes.add(code.toUpperCase());
-    }
-  });
+  const validUserAssignedCodes = (userAssignedCodes || [])
+    .reduce((accumulator, userAssignedCode) => {
+      if (alpha2CountryCode.test(userAssignedCode)) {
+        accumulator.push(userAssignedCode.toUpperCase());
+      }
+      return accumulator;
+    }, []);
+
+  if (validUserAssignedCodes.includes(str.toUpperCase())) {
+    return true;
+  }
 
-  assertString(str);
   return validISO31661Alpha2CountriesCodes.has(str.toUpperCase());
 }
 

src/lib/isISO31661Alpha3.js

@@ -23,13 +23,20 @@ const validISO31661Alpha3CountriesCodes = new Set([
 const alpha3CountryCode = /^[a-zA-Z]{3}$/;
 
 export default function isISO31661Alpha3(str, options = {}) {
+  assertString(str);
+
   const { userAssignedCodes } = options;
-  (userAssignedCodes || []).forEach((code) => {
-    if (alpha3CountryCode.test(code)) {
-      validISO31661Alpha3CountriesCodes.add(code.toUpperCase());
-    }
-  });
+  const validUserAssignedCodes = (userAssignedCodes || [])
+    .reduce((accumulator, userAssignedCode) => {
+      if (alpha3CountryCode.test(userAssignedCode)) {
+        accumulator.push(userAssignedCode.toUpperCase());
+      }
+      return accumulator;
+    }, []);
+
+  if (validUserAssignedCodes.includes(str.toUpperCase())) {
+    return true;
+  }
 
-  assertString(str);
   return validISO31661Alpha3CountriesCodes.has(str.toUpperCase());
 }

test/validators.test.js

@@ -12471,61 +12471,6 @@ describe('Validators', () => {
     });
   });
 
-  it('should validate ISO 3166-1 alpha 2 country codes', () => {
-    // from https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
-    test({
-      validator: 'isISO31661Alpha2',
-      valid: [
-        'FR',
-        'fR',
-        'GB',
-        'PT',
-        'CM',
-        'JP',
-        'PM',
-        'ZW',
-        'MM',
-        'cc',
-        'GG',
-      ],
-      invalid: [
-        '',
-        'FRA',
-        'AA',
-        'PI',
-        'RP',
-        'WV',
-        'WL',
-        'UK',
-        'ZZ',
-      ],
-    });
-  });
-
-  it('should validate ISO 3166-1 alpha 3 country codes', () => {
-    // from https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3
-    test({
-      validator: 'isISO31661Alpha3',
-      valid: [
-        'ABW',
-        'HND',
-        'KHM',
-        'RWA',
-      ],
-      invalid: [
-        '',
-        'FR',
-        'fR',
-        'GB',
-        'PT',
-        'CM',
-        'JP',
-        'PM',
-        'ZW',
-      ],
-    });
-  });
-
   it('should validate ISO 3166-1 numeric country codes', () => {
     // from https://en.wikipedia.org/wiki/ISO_3166-1_numeric
     test({

test/validators/isISO31661Alpha2.test.js

@@ -1,19 +1,41 @@
 import test from '../testFunctions';
 
 describe('isISO31661Alpha2', () => {
-  it('should validate official alpha 2 code', () => {
+  it('should validate ISO 3166-1 alpha 2 country codes', () => {
+    // from https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
     test({
       validator: 'isISO31661Alpha2',
-      args: [],
-      valid: ['BE', 'FR', 'GB', 'US'],
-      invalid: ['XK'],
+      valid: [
+        'FR',
+        'fR',
+        'GB',
+        'PT',
+        'CM',
+        'JP',
+        'PM',
+        'ZW',
+        'MM',
+        'cc',
+        'GG',
+      ],
+      invalid: [
+        '',
+        'FRA',
+        'AA',
+        'PI',
+        'RP',
+        'WV',
+        'WL',
+        'UK',
+        'ZZ',
+      ],
     });
   });
 
   it('should validate user assigned alpha 2 code if provided', () => {
     test({
       validator: 'isISO31661Alpha2',
-      args: [{ userAssignedCodes: ['XK', 'XL', '', 'x'] }],
+      args: [{ userAssignedCodes: ['XK', 'xl', '', 'x'] }],
       valid: ['BE', 'FR', 'GB', 'US', 'XK', 'XL'],
       invalid: ['XA', 'XB'],
     });
@@ -27,4 +49,22 @@ describe('isISO31661Alpha2', () => {
       invalid: ['XXX', 'X'],
     });
   });
+
+  it('should still validate ISO 3166-1 alpha 2 country codes if the options object is empty', () => {
+    test({
+      validator: 'isISO31661Alpha2',
+      args: [{}],
+      valid: ['FR', 'US'],
+      invalid: ['XK'],
+    });
+  });
+
+  it('should still validate ISO 3166-1 alpha 2 country codes if the userAssignedCodes option is empty', () => {
+    test({
+      validator: 'isISO31661Alpha2',
+      args: [{ userAssignedCodes: [] }],
+      valid: ['FR', 'US'],
+      invalid: ['XK'],
+    });
+  });
 });

test/validators/isISO31661Alpha3.test.js

@@ -1,30 +1,64 @@
 import test from '../testFunctions';
 
 describe('isISO31661Alpha3', () => {
-  it('should validate official alpha 3 code', () => {
+  it('should validate ISO 3166-1 alpha 3 country codes', () => {
+    // from https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3
     test({
       validator: 'isISO31661Alpha3',
-      args: [],
-      valid: ['BEL', 'FRA', 'GBR', 'USA'],
-      invalid: ['XXK'],
+      valid: [
+        'ABW',
+        'HND',
+        'KHM',
+        'RWA',
+      ],
+      invalid: [
+        '',
+        'FR',
+        'fR',
+        'GB',
+        'PT',
+        'CM',
+        'JP',
+        'PM',
+        'ZW',
+        'XXK',
+      ],
     });
   });
 
-  it('should validate user assigned alpha 3 code if provided', () => {
+  it('should validate user assigned ISO 3166-1 alpha 3 code if provided', () => {
     test({
       validator: 'isISO31661Alpha3',
-      args: [{ userAssignedCodes: ['XXK', 'XXL'] }],
+      args: [{ userAssignedCodes: ['XXK', 'xxl'] }],
       valid: ['BEL', 'FRA', 'GBR', 'USA', 'XXK', 'XXL'],
       invalid: ['XXA', 'GGG'],
     });
   });
 
-  it('should not validate user assigned alpha 3 not valid code if provided', () => {
+  it('should not validate user assigned ISO 3166-1 alpha 3 not valid code if provided', () => {
     test({
       validator: 'isISO31661Alpha3',
       args: [{ userAssignedCodes: ['', 'x', 'XX', 'XXXX'] }],
       valid: ['FRA'],
       invalid: ['XX', 'XXXX', 'X'],
     });
   });
+
+  it('should still validate ISO 3166-1 alpha 3 country codes if the options object is empty', () => {
+    test({
+      validator: 'isISO31661Alpha3',
+      args: [{}],
+      valid: ['FRA', 'USA'],
+      invalid: ['XXK'],
+    });
+  });
+
+  it('should still validate ISO 3166-1 alpha 3 country codes if the userAssignedCodes option is empty', () => {
+    test({
+      validator: 'isISO31661Alpha3',
+      args: [{ userAssignedCodes: [] }],
+      valid: ['FRA', 'USA'],
+      invalid: ['XXK'],
+    });
+  });
 });