cleanup tests

cityssm · Oct 13, 2023 · b3093ea · b3093ea
1 parent 6599be6
commit b3093ea
Show file tree

Hide file tree

Showing 15 changed files with 277 additions and 241 deletions.
diff --git a/test/0_purgeTestingDatabases.js b/test/0_purgeTestingDatabases.js
@@ -1,10 +1,10 @@
-import * as assert from "assert";
-import { unlink } from "fs";
-import { parkingDB_testing, nhtsaDB_testing } from "../data/databasePaths.js";
-import { initializeDatabase as initializeParkingDatabase } from "../database/parkingDB/initializeDatabase.js";
-import { initNHTSADB } from "../database/initializeDatabase.js";
-describe("Reinitialize " + parkingDB_testing, () => {
-    it("Purges " + parkingDB_testing, (done) => {
+import * as assert from 'node:assert';
+import { unlink } from 'node:fs';
+import { parkingDB_testing, nhtsaDB_testing } from '../data/databasePaths.js';
+import { initNHTSADB } from '../database/nhtsaDB/initializeDatabase.js';
+import { initializeDatabase as initializeParkingDatabase } from '../database/parkingDB/initializeDatabase.js';
+describe('Reinitialize ' + parkingDB_testing, () => {
+    it('Purges ' + parkingDB_testing, (done) => {
         unlink(parkingDB_testing, (error) => {
             if (error) {
                 assert.fail();
@@ -15,13 +15,13 @@ describe("Reinitialize " + parkingDB_testing, () => {
             done();
         });
     });
-    it("Creates " + parkingDB_testing, () => {
+    it('Creates ' + parkingDB_testing, () => {
         const success = initializeParkingDatabase();
         assert.ok(success);
     });
 });
-describe("Reinitialize " + nhtsaDB_testing, () => {
-    it("Purges " + nhtsaDB_testing, (done) => {
+describe('Reinitialize ' + nhtsaDB_testing, () => {
+    it('Purges ' + nhtsaDB_testing, (done) => {
         unlink(nhtsaDB_testing, (error) => {
             if (error) {
                 assert.fail();
@@ -32,7 +32,7 @@ describe("Reinitialize " + nhtsaDB_testing, () => {
             done();
         });
     });
-    it("Creates " + nhtsaDB_testing, () => {
+    it('Creates ' + nhtsaDB_testing, () => {
         const success = initNHTSADB();
         assert.ok(success);
     });

diff --git a/test/0_purgeTestingDatabases.ts b/test/0_purgeTestingDatabases.ts
@@ -1,47 +1,44 @@
-/* eslint-disable unicorn/filename-case */
+/* eslint-disable unicorn/filename-case, eslint-comments/disable-enable-pair */
 
-import * as assert from "assert";
+import * as assert from 'node:assert'
+import { unlink } from 'node:fs'
 
-import { unlink } from "fs";
+import { parkingDB_testing, nhtsaDB_testing } from '../data/databasePaths.js'
+import { initNHTSADB } from '../database/nhtsaDB/initializeDatabase.js'
+import { initializeDatabase as initializeParkingDatabase } from '../database/parkingDB/initializeDatabase.js'
 
-import { parkingDB_testing, nhtsaDB_testing } from "../data/databasePaths.js";
-import { initializeDatabase as initializeParkingDatabase } from "../database/parkingDB/initializeDatabase.js";
-import { initNHTSADB } from "../database/initializeDatabase.js";
-
-describe("Reinitialize " + parkingDB_testing, () => {
-
-  it("Purges " + parkingDB_testing, (done) => {
+describe('Reinitialize ' + parkingDB_testing, () => {
+  it('Purges ' + parkingDB_testing, (done) => {
     unlink(parkingDB_testing, (error) => {
       if (error) {
         assert.fail()
       } else {
-        assert.ok(true);
+        assert.ok(true)
       }
-      done();
-    });
-  });
-
-  it("Creates " + parkingDB_testing, () => {
-    const success = initializeParkingDatabase();
-    assert.ok(success);
-  });
-});
-
-describe("Reinitialize " + nhtsaDB_testing, () => {
-
-  it("Purges " + nhtsaDB_testing, (done) => {
+      done()
+    })
+  })
+
+  it('Creates ' + parkingDB_testing, () => {
+    const success = initializeParkingDatabase()
+    assert.ok(success)
+  })
+})
+
+describe('Reinitialize ' + nhtsaDB_testing, () => {
+  it('Purges ' + nhtsaDB_testing, (done) => {
     unlink(nhtsaDB_testing, (error) => {
       if (error) {
         assert.fail()
       } else {
-        assert.ok(true);
+        assert.ok(true)
       }
-      done();
-    });
-  });
-
-  it("Creates " + nhtsaDB_testing, () => {
-    const success = initNHTSADB();
-    assert.ok(success);
-  });
-});
+      done()
+    })
+  })
+
+  it('Creates ' + nhtsaDB_testing, () => {
+    const success = initNHTSADB()
+    assert.ok(success)
+  })
+})
diff --git a/test/2_configFunctions.js b/test/2_configFunctions.js
@@ -1,22 +1,23 @@
-import * as assert from "assert";
-import * as configFunctions from "../helpers/functions.config.js";
-describe("helpers/configFunctions", () => {
-    describe("#getProperty", () => {
-        it("should include string value for property \"parkingTickets.ticketNumber.fieldLabel\"", () => {
-            assert.strictEqual(typeof configFunctions.getProperty("parkingTickets.ticketNumber.fieldLabel"), "string");
+import * as assert from 'node:assert';
+import * as configFunctions from '../helpers/functions.config.js';
+describe('helpers/configFunctions', () => {
+    describe('#getProperty', () => {
+        it('should include string value for property "parkingTickets.ticketNumber.fieldLabel"', () => {
+            assert.strictEqual(typeof configFunctions.getProperty('parkingTickets.ticketNumber.fieldLabel'), 'string');
         });
-        it("should return a string from function property \"parkingTickets.ticketNumber.nextTicketNumberFn\"", () => {
-            assert.strictEqual(typeof configFunctions.getProperty("parkingTickets.ticketNumber.nextTicketNumberFn")(""), "string");
+        it('should return a string from function property "parkingTickets.ticketNumber.nextTicketNumberFn"', () => {
+            assert.strictEqual(typeof configFunctions.getProperty('parkingTickets.ticketNumber.nextTicketNumberFn')(''), 'string');
         });
     });
-    describe("#getParkingTicketStatus()", () => {
-        it("should include a ticket status \"paid\"", () => {
-            assert.ok(configFunctions.getParkingTicketStatus("paid"));
+    describe('#getParkingTicketStatus()', () => {
+        it('should include a ticket status "paid"', () => {
+            assert.ok(configFunctions.getParkingTicketStatus('paid'));
         });
     });
-    describe("#getLicencePlateLocationProperties()", () => {
-        it("should include the location \"CA\", \"ON\"", () => {
-            assert.strictEqual(configFunctions.getLicencePlateLocationProperties("CA", "ON").licencePlateProvinceAlias, "Ontario");
+    describe('#getLicencePlateLocationProperties()', () => {
+        it('should include the location "CA", "ON"', () => {
+            assert.strictEqual(configFunctions.getLicencePlateLocationProperties('CA', 'ON')
+                .licencePlateProvinceAlias, 'Ontario');
         });
     });
 });
diff --git a/test/2_configFunctions.ts b/test/2_configFunctions.ts
@@ -1,33 +1,43 @@
-/* eslint-disable unicorn/filename-case */
-
-import * as assert from "assert";
-
-import * as configFunctions from "../helpers/functions.config.js";
-
-
-describe("helpers/configFunctions", () => {
-
-  describe("#getProperty", () => {
-    it("should include string value for property \"parkingTickets.ticketNumber.fieldLabel\"", () => {
-      assert.strictEqual(typeof configFunctions.getProperty("parkingTickets.ticketNumber.fieldLabel"), "string");
-    });
-
-    it("should return a string from function property \"parkingTickets.ticketNumber.nextTicketNumberFn\"", () => {
-      assert.strictEqual(typeof configFunctions.getProperty("parkingTickets.ticketNumber.nextTicketNumberFn")(""), "string");
-    });
-
-
-  });
-
-  describe("#getParkingTicketStatus()", () => {
-    it("should include a ticket status \"paid\"", () => {
-      assert.ok(configFunctions.getParkingTicketStatus("paid"));
-    });
-  });
-
-  describe("#getLicencePlateLocationProperties()", () => {
-    it("should include the location \"CA\", \"ON\"", () => {
-      assert.strictEqual(configFunctions.getLicencePlateLocationProperties("CA", "ON").licencePlateProvinceAlias, "Ontario");
-    });
-  });
-});
+/* eslint-disable unicorn/filename-case, eslint-comments/disable-enable-pair */
+
+import * as assert from 'node:assert'
+
+import * as configFunctions from '../helpers/functions.config.js'
+
+describe('helpers/configFunctions', () => {
+  describe('#getProperty', () => {
+    it('should include string value for property "parkingTickets.ticketNumber.fieldLabel"', () => {
+      assert.strictEqual(
+        typeof configFunctions.getProperty(
+          'parkingTickets.ticketNumber.fieldLabel'
+        ),
+        'string'
+      )
+    })
+
+    it('should return a string from function property "parkingTickets.ticketNumber.nextTicketNumberFn"', () => {
+      assert.strictEqual(
+        typeof configFunctions.getProperty(
+          'parkingTickets.ticketNumber.nextTicketNumberFn'
+        )(''),
+        'string'
+      )
+    })
+  })
+
+  describe('#getParkingTicketStatus()', () => {
+    it('should include a ticket status "paid"', () => {
+      assert.ok(configFunctions.getParkingTicketStatus('paid'))
+    })
+  })
+
+  describe('#getLicencePlateLocationProperties()', () => {
+    it('should include the location "CA", "ON"', () => {
+      assert.strictEqual(
+        configFunctions.getLicencePlateLocationProperties('CA', 'ON')
+          .licencePlateProvinceAlias,
+        'Ontario'
+      )
+    })
+  })
+})
diff --git a/test/_globals.d.ts b/test/_globals.d.ts
@@ -1,6 +1,6 @@
 /// <reference types="qs" />
-import type { Request } from "express";
-import type { Session } from "express-session";
+import type { Request } from 'express';
+import type { Session } from 'express-session';
 export declare const testView = "*testView";
 export declare const testUpdate = "*testUpdate";
 export declare const testAdmin = "*testAdmin";

diff --git a/test/_globals.js b/test/_globals.js
@@ -1,10 +1,10 @@
-import * as configFunctions from "../helpers/functions.config.js";
-export const testView = "*testView";
-export const testUpdate = "*testUpdate";
-export const testAdmin = "*testAdmin";
+import * as configFunctions from '../helpers/functions.config.js';
+export const testView = '*testView';
+export const testUpdate = '*testUpdate';
+export const testAdmin = '*testAdmin';
 export const portNumber = 4000;
 export const fakeViewOnlySession = {
-    id: "",
+    id: '',
     cookie: undefined,
     destroy: undefined,
     regenerate: undefined,
@@ -13,7 +13,7 @@ export const fakeViewOnlySession = {
     save: undefined,
     touch: undefined,
     user: {
-        userName: configFunctions.getProperty("users.testing")[0],
+        userName: configFunctions.getProperty('users.testing')[0],
         userProperties: {
             canUpdate: false,
             isAdmin: false,
@@ -22,7 +22,7 @@ export const fakeViewOnlySession = {
     }
 };
 export const fakeAdminSession = {
-    id: "",
+    id: '',
     cookie: undefined,
     destroy: undefined,
     regenerate: undefined,
@@ -31,7 +31,7 @@ export const fakeAdminSession = {
     save: undefined,
     touch: undefined,
     user: {
-        userName: configFunctions.getProperty("users.testing")[0],
+        userName: configFunctions.getProperty('users.testing')[0],
         userProperties: {
             canUpdate: true,
             isAdmin: true,

diff --git a/test/_globals.ts b/test/_globals.ts
@@ -1,19 +1,16 @@
-import type { Request } from "express";
-import type { Session } from "express-session";
+import type { Request } from 'express'
+import type { Session } from 'express-session'
 
-import * as configFunctions from "../helpers/functions.config.js";
+import * as configFunctions from '../helpers/functions.config.js'
 
+export const testView = '*testView'
+export const testUpdate = '*testUpdate'
+export const testAdmin = '*testAdmin'
 
-export const testView = "*testView";
-export const testUpdate = "*testUpdate";
-export const testAdmin = "*testAdmin";
-
-
-export const portNumber = 4000;
-
+export const portNumber = 4000
 
 export const fakeViewOnlySession: Session = {
-  id: "",
+  id: '',
   cookie: undefined,
   destroy: undefined,
   regenerate: undefined,
@@ -22,18 +19,17 @@ export const fakeViewOnlySession: Session = {
   save: undefined,
   touch: undefined,
   user: {
-    userName: configFunctions.getProperty("users.testing")[0],
+    userName: configFunctions.getProperty('users.testing')[0],
     userProperties: {
       canUpdate: false,
       isAdmin: false,
       isOperator: false
     }
   }
-};
-
+}
 
 export const fakeAdminSession: Session = {
-  id: "",
+  id: '',
   cookie: undefined,
   destroy: undefined,
   regenerate: undefined,
@@ -42,18 +38,17 @@ export const fakeAdminSession: Session = {
   save: undefined,
   touch: undefined,
   user: {
-    userName: configFunctions.getProperty("users.testing")[0],
+    userName: configFunctions.getProperty('users.testing')[0],
     userProperties: {
       canUpdate: true,
       isAdmin: true,
       isOperator: true
     }
   }
-};
-
+}
 
 export const fakeRequest: Request = {
-  async * [Symbol.asyncIterator]() { },
+  async *[Symbol.asyncIterator]() {},
   _destroy: undefined,
   _read: undefined,
   accepted: undefined,
@@ -135,17 +130,12 @@ export const fakeRequest: Request = {
   url: undefined,
   wrap: undefined,
   xhr: undefined
+}
 
-};
-
-
-export const fakeViewOnlyRequest =
-  Object.assign({}, fakeRequest, {
-    session: fakeViewOnlySession
-  });
-
+export const fakeViewOnlyRequest = Object.assign({}, fakeRequest, {
+  session: fakeViewOnlySession
+})
 
-export const fakeAdminRequest =
-  Object.assign({}, fakeRequest, {
-    session: fakeAdminSession
-  });
+export const fakeAdminRequest = Object.assign({}, fakeRequest, {
+  session: fakeAdminSession
+})