fix(vest): error message override when no warnings

ealush · Jan 12, 2021 · f59a659 · f59a659
1 parent c1bd6ab
commit f59a659
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/packages/vest/src/utilities/__tests__/schema.test.js b/packages/vest/src/utilities/__tests__/schema.test.js
@@ -81,6 +81,27 @@ describe('schema', () => {
       ...res.getErrors('friends[0].name.middle'),
     ]);
   });
+
+  it('Should return error messages when they should appear', () => {
+    const Name = enforce.loose({
+      name: enforce
+        .loose({
+          first: enforce.isString().isNotEmpty().message('first_name_error'),
+          last: enforce.isString().isNotEmpty().message('last_name_error'),
+        })
+        .message('name_error'),
+    });
+
+    const Schema = schema(Name);
+    const res = Schema({ name: {} });
+
+    expect(res.hasErrors()).toBe(true);
+    expect(res.getErrors()).toEqual({
+      name: ['name_error', 'first_name_error', 'last_name_error'],
+      'name.first': ['first_name_error'],
+      'name.last': ['last_name_error'],
+    });
+  });
 });
 
 const Name = enforce.loose({

diff --git a/packages/vest/src/utilities/schema.js b/packages/vest/src/utilities/schema.js
@@ -31,7 +31,7 @@ export default function schema(enforceSchema) {
       errorMessages[test] = parsedResult[test].errors = Object.keys(
         parsedResult[test].errors
       );
-      errorMessages[test] = parsedResult[test].warnings = Object.keys(
+      warningMessages[test] = parsedResult[test].warnings = Object.keys(
         parsedResult[test].warnings
       );
       _hasErrors = _hasErrors || parsedResult[test].hasErrors;

diff --git a/scripts/release/steps/pushToLatestBranch.js b/scripts/release/steps/pushToLatestBranch.js
@@ -8,6 +8,7 @@ const SCRIPT_PATH = path.resolve(
   filePaths.ROOT_PATH,
   'scripts',
   'release',
+  'steps',
   'push_to_latest_branch.sh'
 );