Skip to content

Commit

Permalink
test and lint
Browse files Browse the repository at this point in the history
  • Loading branch information
EmmaLRussell committed Feb 3, 2025
1 parent 655e376 commit abd65c6
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 7 deletions.
8 changes: 4 additions & 4 deletions src/controllers/testPageController.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Request, Response } from "express";
import {AppLocals} from "../types/app.js";
import { AppLocals } from "../types/app.js";

export class TestPageController {
static getTestPage = (req: Request, res: Response) => {
const { rootDir } = req.app.locals as AppLocals;
res.sendFile(`${rootDir}/static/test.html`);
}
}
res.sendFile(`${rootDir}/static/test.html`); // TODO: use path
};
}
2 changes: 1 addition & 1 deletion src/routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { IndexController } from "./controllers/indexController";
import { TileController } from "./controllers/tileController";
import notFound from "./errors/notFound";
import { MetadataController } from "./controllers/metadataController";
import {TestPageController} from "./controllers/testPageController.js";
import { TestPageController } from "./controllers/testPageController.js";

export const registerRoutes = () => {
const router = Router();
Expand Down
2 changes: 0 additions & 2 deletions static/test.html
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@ <h1>GROUT Test Page</h1>
map.options.minZoom = 3;
map.setMaxBounds(map.getBounds());


//const nameProp = "NAME_1";
const groutServers = {
"local": "http://localhost:5000",
"mrcdata": "https://mrcdata.dide.ic.ac.uk/grout"
Expand Down
19 changes: 19 additions & 0 deletions tests/unit/controllers/testPageController.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { describe, expect, test, vi } from "vitest";
import { TestPageController } from "../../../src/controllers/testPageController";

describe("TestPageController", () => {
test("sends test page file", () => {
const req = {
app: {
locals: {
rootDir: "testRoot"
}
}
} as any;
const res = {
sendFile: vi.fn()
} as any;
TestPageController.getTestPage(req, res);
expect(res.sendFile).toHaveBeenCalledWith("testRoot/static/test.html");
});
});
6 changes: 6 additions & 0 deletions tests/unit/routes.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { IndexController } from "../../src/controllers/indexController";
import { TileController } from "../../src/controllers/tileController";
import notFound from "../../src/errors/notFound";
import { MetadataController } from "../../src/controllers/metadataController";
import { TestPageController } from "../../src/controllers/testPageController";

const { mockRouterConstructor, mockRouter } = vi.hoisted(() => {
const mockRouter = {
Expand Down Expand Up @@ -38,6 +39,11 @@ describe("registerRoutes", () => {
"/tile/:dataset/:level/:z/:x/:y",
TileController.getTile
);
expect(mockRouter.get).toHaveBeenNthCalledWith(
4,
"/test",
TestPageController.getTestPage
);
expect(mockRouter.use).toHaveBeenCalledWith(notFound);
});
});

0 comments on commit abd65c6

Please sign in to comment.