Fix tests

Author: cblanc

test/config.unit.ts

@@ -13,23 +13,6 @@ describe("Config", () => {
       process.env = ENV;
     });
 
-    describe("SERVE_STATIC_ASSET", () => {
-      it("enables serveStaticAssets", () => {
-        process.env["SERVE_STATIC_ASSETS"] = "true";
-        assert.isTrue(configFactory().serveStaticAssets);
-      });
-
-      it("disables serveStaticAssets", () => {
-        process.env["SERVE_STATIC_ASSETS"] = "false";
-        assert.isFalse(configFactory().serveStaticAssets);
-      });
-
-      it("defaults to true for unknown input", () => {
-        process.env["SERVE_STATIC_ASSETS"] = "foo";
-        assert.isTrue(configFactory().serveStaticAssets);
-      });
-    });
-
     describe("HTTP_HEADERS", () => {
       it("is undefined by default", () => {
         assert.isUndefined(configFactory().httpHeaders);

test/helper/attribute_base.suite.ts

@@ -1,4 +1,4 @@
-import { Relation, query } from "../../src/app/models/base";
+import { Relation, query } from "../../api/app/models/base";
 import { assert } from "chai";
 
 const getCount = (o: any) => Object.keys(o).length;

test/helper/index.ts

@@ -1,17 +1,17 @@
 import { join } from "path";
-import { generateMethods, query } from "../../src/app/models/base";
-import { getConfig as configFactory } from "../../src/config/config";
+import { generateMethods, query } from "../../api/app/models/base";
+import { getConfig as configFactory } from "../../api/config/config";
 import * as AttributeBaseSuite from "./attribute_base.suite";
-import * as Base from "../../src/app/models/base";
-import { Postcode } from "../../src/app/models/postcode";
+import * as Base from "../../api/app/models/base";
+import { Postcode } from "../../api/app/models/postcode";
 import removeDiacritics from "./remove_diacritics";
 
-import { unaccent } from "../../src/app/lib/unaccent";
-import * as errors from "../../src/app/lib/errors";
-import * as string from "../../src/app/lib/string";
-import * as timeout from "../../src/app/lib/timeout";
+import { unaccent } from "../../api/app/lib/unaccent";
+import * as errors from "../../api/app/lib/errors";
+import * as string from "../../api/app/lib/string";
+import * as timeout from "../../api/app/lib/timeout";
 
-import app from "../../src/app";
+import app from "../../api/app";
 
 const config = configFactory();
 
@@ -164,7 +164,7 @@ export * from "./type_checking";
 // PG helper methods
 export * from "./pg";
 //Models
-export * from "../../src/app/models/index";
+export * from "../../api/app/models/index";
 
 export {
   // Data

test/helper/pg.ts

@@ -1,7 +1,7 @@
 /**
  * PG helper methods
  */
-import * as Base from "../../src/app/models/base";
+import * as Base from "../../api/app/models/base";
 
 const query = Base.query;
 

test/helper/setup.ts

@@ -17,7 +17,7 @@ import {
   Lsoa,
   Msoa,
   PoliceForceArea,
-} from "../../src/app/models/index";
+} from "../../api/app/models/index";
 import { QueryResult } from "pg";
 
 const NO_RELOAD_DB = !!process.env.NO_RELOAD_DB;

test/helper/type_checking.ts

@@ -1,4 +1,4 @@
-import { Postcode, TerminatedPostcode } from "../../src/app/models/index";
+import { Postcode, TerminatedPostcode } from "../../api/app/models/index";
 import { assert } from "chai";
 
 // Retrieve object size

test/integration.ts

@@ -11,11 +11,11 @@ describe("Pages routes", () => {
   });
 
   describe("/docs", () => {
-    it("should return 200", async () => {
+    it("should return 301", async () => {
       await request(app)
         .get("/docs")
         .expect("Content-Type", /html/)
-        .expect(200);
+        .expect(301);
     });
   });
 });
@@ -31,11 +31,6 @@ describe("Errors", () => {
   });
 });
 
-describe("Misc", () => {
-  it("should return a favicon", async () => {
-    await request(app).get("/favicon.ico").expect(200);
-  });
-});
 
 describe("Utils", () => {
   describe("Health", () => {
@@ -58,21 +53,6 @@ describe("Utils", () => {
   });
 });
 
-describe("Serve static assets", () => {
-  it("serves public/ when enabled", async () => {
-    const config = configFactory();
-    config.serveStaticAssets = true;
-    const newApp = postcodesioApplication(config);
-    await request(newApp).get("/js/app.js").expect(200);
-  });
-  it("does not serve public/ when disabled", async () => {
-    const config = configFactory();
-    config.serveStaticAssets = false;
-    const newApp = postcodesioApplication(config);
-    const response = await request(newApp).get("/js/app.ts").expect(404);
-  });
-});
-
 describe("httpHeaders", () => {
   it("sets arbitrary headers on all HTTP responses", async () => {
     const config = configFactory();