From ec13c2ec656b412151be34cf3a43fb0a113aa158 Mon Sep 17 00:00:00 2001
From: Ajax Davis <thomasalwyndavis@gmail.com>
Date: Wed, 10 Jul 2024 20:57:44 +1000
Subject: [PATCH] fix: correctly use new validator in date specs

---
 package-lock.json  |  4 ++--
 package.json       |  2 +-
 test/dates.spec.js | 52 ++++++++++++++++++++++++----------------------
 3 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5c64f48c..68dfde85 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@jsonresume/schema",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@jsonresume/schema",
-      "version": "1.1.1",
+      "version": "1.1.2",
       "license": "MIT",
       "dependencies": {
         "jsonschema": "^1.4.1"
diff --git a/package.json b/package.json
index 921d14bc..f7becc1f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsonresume/schema",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "JSON Resume Schema",
   "private": false,
   "main": "validator.js",
diff --git a/test/dates.spec.js b/test/dates.spec.js
index b1012c9d..545e3613 100644
--- a/test/dates.spec.js
+++ b/test/dates.spec.js
@@ -1,54 +1,56 @@
-var test = require('tape');
-var ZSchema = require('z-schema');
-const fixtures = require('./__test__/dates.json');
+var test = require("tape");
+var Validator = require("jsonschema").Validator;
+
+const fixtures = require("./__test__/dates.json");
 // var mockDateSchema = require('./__test__/mockDateSchema.json');
 
 const mockDateSchema = {
-  "type": "string",
-  "description": "Mock Date Format",
-  "pattern": "^([1-2][0-9]{3}-[0-1][0-9]-[0-3][0-9]|[1-2][0-9]{3}-[0-1][0-9]|[1-2][0-9]{3})$"
+  type: "string",
+  description: "Mock Date Format",
+  pattern:
+    "^([1-2][0-9]{3}-[0-1][0-9]-[0-3][0-9]|[1-2][0-9]{3}-[0-1][0-9]|[1-2][0-9]{3})$",
 };
 
 function dateValidate(resumeJson, callback) {
-  var callbackWrapper = function(err, valid) {
-    if(err) {
-      callback(err)
-    } else {
-      callback(null, {valid: valid});
-    }
+  var v = new Validator();
+
+  const validation = v.validate(resumeJson, mockDateSchema);
+
+  if (!validation.valid) {
+    return callback(validation.errors, false);
   }
 
-  new ZSchema().validate(resumeJson, mockDateSchema, callbackWrapper);
+  return callback(null, true);
 }
 
-test('dates - YYYY-MM-DD', (t) => {
+test("dates - YYYY-MM-DD", (t) => {
   dateValidate(fixtures.yearMonthDay, (err, valid) => {
-    t.equal(err, null, 'err should be null');
-    t.true(valid, 'valid is true');
+    t.equal(err, null, "err should be null");
+    t.true(valid, "valid is true");
   });
   t.end();
 });
 
-test('dates - YYYY-MM', (t) => {
+test("dates - YYYY-MM", (t) => {
   dateValidate(fixtures.yearMonth, (err, valid) => {
-    t.equal(err, null, 'err should be null');
-    t.true(valid, 'valid is true');
+    t.equal(err, null, "err should be null");
+    t.true(valid, "valid is true");
   });
   t.end();
 });
 
-test('dates - YYYY', (t) => {
+test("dates - YYYY", (t) => {
   dateValidate(fixtures.yearMonthDay, (err, valid) => {
-    t.equal(err, null, 'err should be null');
-    t.true(valid, 'valid is true');
+    t.equal(err, null, "err should be null");
+    t.true(valid, "valid is true");
   });
   t.end();
 });
 
-test('dates - invalid', (t) => {
+test("dates - invalid", (t) => {
   dateValidate(fixtures.invalid, (err, valid) => {
-    t.notEqual(err, null, 'err should contain an error');
-    t.false(valid, 'valid is false');
+    t.notEqual(err, null, "err should contain an error");
+    t.false(valid, "valid is false");
   });
   t.end();
 });