fix: oneOf, notOneOf swallowing multiple errors (#1434)

Co-authored-by: Adam Jenkins <adam.jenkins@aptos.com>
jquense · Aug 4, 2021 · 7842afb · 7842afb
1 parent 7576cd8
commit 7842afb
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/src/schema.ts b/src/schema.ts
@@ -381,8 +381,10 @@ export default abstract class BaseSchema<
     let initialTests = [];
 
     if (this._typeError) initialTests.push(this._typeError);
-    if (this._whitelistError) initialTests.push(this._whitelistError);
-    if (this._blacklistError) initialTests.push(this._blacklistError);
+
+    let finalTests = [];
+    if (this._whitelistError) finalTests.push(this._whitelistError);
+    if (this._blacklistError) finalTests.push(this._blacklistError);    
 
     runTests(
       {
@@ -398,7 +400,7 @@ export default abstract class BaseSchema<
 
         runTests(
           {
-            tests: this.tests,
+            tests: this.tests.concat(finalTests),
             args,
             path,
             sync,

diff --git a/test/string.js b/test/string.js
@@ -227,6 +227,26 @@ describe('String types', () => {
     ]);
   });
 
+  it('should check allowed values at the end',() => {
+    return Promise.all([
+      string()
+        .required('Required')
+        .notOneOf([ref('$someKey')])
+        .validate('',{context:{someKey:''}})
+        .should.be.rejected().then(err => {
+          err.type.should.equal('required')
+        }),
+      object({
+        email:string().required('Email Required'),
+        password:string().required('Password Required').notOneOf([ref('email')]),
+      }).validate({email:'',password:''},{abortEarly:false})
+      .should.be.rejected().then(err => {
+        err.errors.should.include('Email Required');
+        err.errors.should.include('Password Required');
+      })
+    ]);
+  });
+
   it('should validate transforms', function () {
     return Promise.all([
       string().trim().isValid(' 3  ').should.eventually().equal(true),