fix: multiple fixes related to alpha, tests and build (#1528)

Co-authored-by: Martin Beaudet <martin.beaudet@intelia.com>
validatorjs · Nov 29, 2020 · daab42b · daab42b
1 parent 527950a
commit daab42b
Show file tree

Hide file tree

Showing 10 changed files with 69 additions and 314 deletions.
diff --git a/.eslintignore b/.eslintignore
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,6 @@ package-lock.json
 yarn.lock
 /es
 /lib
+validator.js
+validator.min.js
+index.js
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,3 @@
-sudo: false
 language: node_js
 node_js:
   - stable

diff --git a/README.md b/README.md
diff --git a/index.js b/index.js
diff --git a/package.json b/package.json
@@ -67,7 +67,7 @@
     "build:es": "babel src -d es --env-name=es",
     "build:node": "babel src -d .",
     "build": "npm run build:browser && npm run build:node && npm run build:es",
-    "pretest": "npm run lint && npm run build",
+    "pretest": "npm run build && npm run lint",
     "test": "nyc mocha --require @babel/register --reporter dot",
     "test:ci": "nyc report --reporter=text-lcov"
   },

diff --git a/src/lib/alpha.js b/src/lib/alpha.js
@@ -68,7 +68,6 @@ export const alphanumeric = {
 export const decimal = {
   'en-US': '.',
   ar: '٫',
-  fa: '٫',
 };
 
 
@@ -100,17 +99,16 @@ export const farsiLocales = [
 
 for (let locale, i = 0; i < farsiLocales.length; i++) {
   locale = `fa-${farsiLocales[i]}`;
-  alpha[locale] = alpha.fa;
   alphanumeric[locale] = alphanumeric.fa;
-  decimal[locale] = decimal.fa;
+  decimal[locale] = decimal.ar;
 }
 
 // Source: https://en.wikipedia.org/wiki/Decimal_mark
 export const dotDecimal = ['ar-EG', 'ar-LB', 'ar-LY'];
 export const commaDecimal = [
-  'bg-BG', 'cs-CZ', 'da-DK', 'de-DE', 'el-GR', 'en-ZM', 'es-ES', 'fr-FR', 'id-ID', 'it-IT', 'ku-IQ', 'hu-HU', 'nb-NO',
-  'nn-NO', 'nl-NL', 'pl-PL', 'pt-PT', 'ru-RU', 'sl-SI', 'sr-RS@latin',
-  'sr-RS', 'sv-SE', 'tr-TR', 'uk-UA', 'vi-VN',
+  'bg-BG', 'cs-CZ', 'da-DK', 'de-DE', 'el-GR', 'en-ZM', 'es-ES', 'fr-CA', 'fr-FR',
+  'id-ID', 'it-IT', 'ku-IQ', 'hu-HU', 'nb-NO', 'nn-NO', 'nl-NL', 'pl-PL', 'pt-PT',
+  'ru-RU', 'sl-SI', 'sr-RS@latin', 'sr-RS', 'sv-SE', 'tr-TR', 'uk-UA', 'vi-VN',
 ];
 
 for (let i = 0; i < dotDecimal.length; i++) {
@@ -121,8 +119,8 @@ for (let i = 0; i < commaDecimal.length; i++) {
   decimal[commaDecimal[i]] = ',';
 }
 
-// see #1455
-alpha['fa-IR'] = alpha['fa-IR'];
+alpha['fr-CA'] = alpha['fr-FR'];
+alphanumeric['fr-CA'] = alphanumeric['fr-FR'];
 
 alpha['pt-BR'] = alpha['pt-PT'];
 alphanumeric['pt-BR'] = alphanumeric['pt-PT'];
@@ -132,3 +130,6 @@ decimal['pt-BR'] = decimal['pt-PT'];
 alpha['pl-Pl'] = alpha['pl-PL'];
 alphanumeric['pl-Pl'] = alphanumeric['pl-PL'];
 decimal['pl-Pl'] = decimal['pl-PL'];
+
+// see #1455
+alpha['fa-AF'] = alpha.fa;
diff --git a/src/lib/isMobilePhone.js b/src/lib/isMobilePhone.js
@@ -116,6 +116,7 @@ const phones = {
 
 // aliases
 phones['en-CA'] = phones['en-US'];
+phones['fr-CA'] = phones['en-CA'];
 phones['fr-BE'] = phones['nl-BE'];
 phones['zh-HK'] = phones['en-HK'];
 phones['zh-MO'] = phones['en-MO'];

diff --git a/test/sanitizers.js b/test/sanitizers.js
@@ -268,6 +268,20 @@ describe('Sanitizers', () => {
     });
   });
 
+  it('should score passwords with default options', () => {
+    test({
+      sanitizer: 'isStrongPassword',
+      expect: {
+        abc: false,
+        abcc: false,
+        aBc: false,
+        'Abc123!': false,
+        '!@#$%^&*()': false,
+        'abc123!@f#rA': true,
+      },
+    });
+  });
+
   it('should normalize an email based on domain', () => {
     test({
       sanitizer: 'normalizeEmail',