[Fix] validatePastFirstError: actually respect the option

caolan · Mar 13, 2024 · 45cfb3f · 45cfb3f
1 parent 9f118a8
commit 45cfb3f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/lib/fields.js b/lib/fields.js
@@ -52,10 +52,10 @@ exports.string = function (options) {
                     if (!b.error) {
                         v(form, b, function (v_err) {
                             b.error = v_err ? String(v_err) : null;
-                            asyncCallback(null);
+                            asyncCallback(b.error);
                         });
                     } else {
-                        asyncCallback(null);
+                        asyncCallback(b.error);
                     }
                 }, function (err) {
                     callback(err, b);

diff --git a/test/test-form.js b/test/test-form.js
@@ -68,7 +68,7 @@ test('bind with missing field in data keeps field in form', function (t) {
 });
 
 test('validate', function (t) {
-    t.plan(11);
+    t.plan(12);
     var form = forms.create({
         field1: forms.fields.string(),
         field2: forms.fields.string({
@@ -163,7 +163,7 @@ test('validate invalid data', function (t) {
                 callback('validation error 2');
             }]
         })
-    });
+    }, { validatePastFirstError: true });
     formObject.bind({ field1: '1', field2: '2' }).validate(function (err, f) {
         t.equal(f.isValid(), false);
         t.equal(

diff --git a/test/test-render.js b/test/test-render.js
@@ -92,7 +92,7 @@ var testWrap = function (tag) {
                     callback('validation error after field');
                 }]
             })
-        });
+        }, { validatePastFirstError: true });
         formObject.bind({ field_name: 'val', field_name_error_after: 'foo' }).validate(function (err, f) {
             t.equal(
                 f.toHTML(forms.render[tag]),
@@ -124,7 +124,7 @@ var testWrap = function (tag) {
                     callback('validation error after field');
                 }]
             })
-        });
+        }, { validatePastFirstError: true });
         f2.bind({ field_name: 'val', field_name_error_after: 'foo' }).validate(function (err, f) {
             t.equal(
                 f.toHTML(forms.render[tag]),
@@ -148,8 +148,6 @@ var testWrap = function (tag) {
                 '<p class="error_msg">validation error after field</p>'
             );
         });
-
-        t.end();
     });
 
     test(tag + ' multipleCheckbox', function (t) {
@@ -295,7 +293,7 @@ test('table bound error', function (t) {
                 callback('validation error after field');
             }]
         })
-    });
+    }, { validatePastFirstError: true });
     formObject.bind({ field_name: 'val', field_name_error_after: 'foo' }).validate(function (err, f) {
         t.equal(
             f.toHTML(forms.render.table),
@@ -331,7 +329,7 @@ test('table bound error', function (t) {
                 callback('validation error after field');
             }]
         })
-    });
+    }, { validatePastFirstError: true });
     f2.bind({ field_name: 'val', field_name_error_after: 'foo' }).validate(function (err, f) {
         t.equal(
             f.toHTML(forms.render.table),
@@ -358,6 +356,4 @@ test('table bound error', function (t) {
             '<p class="error_msg">validation error after field</p>'
         );
     });
-
-    t.end();
 });