Revitalize tests

README.md

@@ -54,6 +54,9 @@ parameter to programmatically refresh the column cache, such as in situations in
 which the underlying data has been changed (editing, adding, etc).
 
 ## Running
+NOTICE: To start the API, run "yarn run start". To run the unit tests, run `tsc`, which will create a test directory called "v2test", this can be changed in tsconfig.json. Then run `yarn run test` to run the tests. All information below this notice in the "Running" section is potentially deprecated and needs to be reviewed.
+
+===============================================================================
 
 To start the API simply run `node server.js` which will start a process on
 port 5050. Note that the default port was changed from 5000 to 5050 to avoid a

package.json

@@ -2,7 +2,7 @@
   "name": "macrostrat-api",
   "version": "3.0.0-dev",
   "description": "The API for SCIENCE",
-  "main": "server.js",
+  "main": "server.ts",
   "repository": {
     "type": "git",
     "url": "https://github.com/UW-Macrostrat/macrostrat-api.git"
@@ -11,7 +11,7 @@
     "start": "nodemon --watch v2 --exec ts-node --transpileOnly server.ts",
     "docker": "docker build -t macrostrat-api . && docker run --rm -it -p 5000:5000 macrostrat-api",
     "serve": "ts-node --transpileOnly server.ts",
-    "test": "mocha ./v2",
+    "test": "mocha --require ts-node/register/transpile-only './v2test/test/test.js'",
     "defs": "ts-node --transpileOnly ./v2/utilities/validateDefs.ts",
     "build-defs": "ts-node --transpileOnly ./v2/utilities/getOutputFields.ts",
     "build-changes": "grip ./v2/CHANGELOG.md --export ./v2/changes.html"
@@ -63,14 +63,15 @@
     "turf-buffer": "^1.0.4",
     "turf-point": "^0.1.6",
     "turf-voronoi": "git+https://github.com/Turfjs/turf-voronoi.git",
-    "typescript": "^5.3.3",
+    "typescript": "^5.4.4",
     "underscore": "^1.8.3",
     "universal-analytics": "^0.4.6",
     "wellknown": "^0.3.0",
     "yesql": "^7.0.0"
   },
   "devDependencies": {
-    "mocha": "^1.21.4",
+    "@types/mocha": "^10.0.6",
+    "mocha": "^10.4.0",
     "node-uuid": "^1.4.3",
     "nodemon": "^3.0.3",
     "prettier": "^3.2.3",

server.ts

@@ -1,8 +1,8 @@
 var express = require("express"),
   bodyParser = require("body-parser"),
   //v1 = require("./v1"),
-  v2 = require("./v2"),
-  defs = require("./v2/defs"),
+  v2 = require("./v2test"),
+  defs = require("./v2test/defs"),
   app = express();
 
 var ua = require("universal-analytics");
@@ -67,3 +67,4 @@ if (!module.parent) {
 }
 
 module.exports = app;
+//export { app };

tsconfig.json

@@ -1,6 +1,11 @@
 {
-  "compilerOptions": {
-    "moduleResolution": "NodeNext",
-    "module": "NodeNext",
-  },
+    "compilerOptions": {
+        "target": "es6",
+        "module": "commonjs",
+        "outDir": "./v2test",
+        "strict": true
+    },
+    "include": ["./v2/**/*.ts"],
+    "exclude": ["node_modules"]
 }
+

v2/index.ts

@@ -106,3 +106,4 @@ api.use(function (err, req, res, next) {
 });
 
 module.exports = api;
+//export {api};

v2/test/settings.ts

@@ -1,6 +1,7 @@
-module.exports = {
-  port: 5555,
+module.exports  = {
+  port: 5550,
   get host() {
     return "http://localhost:" + this.port;
   },
 };
+//export {toExport};

v2/test/test.ts

@@ -1,7 +1,8 @@
 var should = require("should");
 var settings = require("./settings");
-var app = require("../../server");
-
+//import { toExport as settings } from "./settings";
+var app = require("../../server.ts");
+//import { app } from "../../server";
 app.port = settings.port;
 
 app.start();

v2/test/v2Tests/columns.ts

@@ -5,7 +5,7 @@ module.exports = function () {
 
   it("should return metadata", function (done) {
     request(settings.host)
-      .get("/api/v2/columns")
+      .get("/v2/columns")
       .expect(validators.aSuccessfulRequest)
       .expect(validators.json)
       .expect(validators.metadata)
@@ -17,7 +17,7 @@ module.exports = function () {
 
   it("should return a sample", function (done) {
     request(settings.host)
-      .get("/api/v2/columns?sample")
+      .get("/v2/columns?sample")
       .expect(validators.aSuccessfulRequest)
       .expect(validators.json)
       .expect(validators.aSample)
@@ -29,7 +29,7 @@ module.exports = function () {
 
   it("should accept an interval name", function (done) {
     request(settings.host)
-      .get("/api/v2/columns?interval_name=Permian")
+      .get("/v2/columns?interval_name=Permian")
       .expect(validators.aSuccessfulRequest)
       .expect(validators.json)
       .expect(validators.atLeastOneResult)