Changed regex to split

validatorjs · Oct 30, 2021 · a276b6b · a276b6b
1 parent 61a3b48
commit a276b6b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/lib/contains.js b/src/lib/contains.js
@@ -11,7 +11,9 @@ export default function contains(str, elem, options) {
   assertString(str);
   options = merge(options, defaulContainsOptions);
 
-  const regex = new RegExp(toString(elem), `g${options.ignoreCase ? 'i' : ''}`);
+  if (options.ignoreCase) {
+    return str.toLowerCase().split(toString(elem).toLowerCase()).length > options.minOccurrences;
+  }
 
-  return (str.match(regex) || []).length >= options.minOccurrences;
+  return str.split(toString(elem)).length > options.minOccurrences;
 }
diff --git a/test/validators.js b/test/validators.js
@@ -4245,7 +4245,7 @@ describe('Validators', () => {
       args: ['foo', {
         minOccurrences: 2,
       }],
-      valid: ['foofoofoo', '12foo124foo', 'fofooofoooofoooo'],
+      valid: ['foofoofoo', '12foo124foo', 'fofooofoooofoooo', 'foo1foo'],
       invalid: ['foo', 'foobar', 'Fooofoo', 'foofo'],
     });
   });