chore(test): improve tests

Use koa instead of `nuxt.listen`
Update `jest` devDependency to `^23.5.0`

Author: medfreeman

package.json

@@ -47,7 +47,7 @@
     "eslint-plugin-jest": "^21.1.0",
     "git-exec-and-restage": "^1.0.1",
     "husky": "^0.14.3",
-    "jest": "^23.4.2",
+    "jest": "^23.5.0",
     "koa": "^2.3.0",
     "koa-static": "^5.0.0",
     "lint-staged": "^7.0.1",

test/config.test.js

@@ -5,7 +5,7 @@ import { get, commonBefore, commonAfter } from "./nuxt";
 
 describe("config", async () => {
   beforeAll(async () => {
-    await commonBefore()();
+    await commonBefore();
   });
 
   afterAll(async () => {

test/dev.test.js

@@ -2,7 +2,7 @@ import { get, commonBefore, commonAfter } from "./nuxt";
 
 describe("module dev mode", async () => {
   beforeAll(async () => {
-    await commonBefore({ dev: true })();
+    await commonBefore({ dev: true });
   });
 
   afterAll(async () => {

test/generate.test.js

@@ -1,12 +1,12 @@
-import { get, generate, generateAfter } from "./nuxt";
+import { get, generate, commonAfter } from "./nuxt";
 
 describe("module generate mode", async () => {
   beforeAll(async () => {
-    await generate()();
+    await generate();
   });
 
   afterAll(async () => {
-    await generateAfter();
+    await commonAfter();
   });
 
   test("admin", async () => {

test/module.test.js

@@ -2,7 +2,7 @@ import { get, commonBefore, commonAfter } from "./nuxt";
 
 describe("module", async () => {
   beforeAll(async () => {
-    await commonBefore()();
+    await commonBefore();
   });
 
   afterAll(async () => {

test/nuxt.js

@@ -16,35 +16,36 @@ let nuxt;
 let generator;
 let server;
 
-const serve = () => {
+const serve = (isStatic = false) => {
   const app = new Koa();
 
-  app.use(serveStatic(generator.distPath));
+  app.use(
+    !isStatic
+      ? ctx => {
+          ctx.status = 200;
+          ctx.respond = false;
+          ctx.req.ctx = ctx;
+          nuxt.render(ctx.req, ctx.res);
+        }
+      : serveStatic(generator.distPath)
+  );
   server = app.listen(process.env.PORT);
 };
 
-const stopServe = () => {
-  server.close();
-};
-
-const commonBefore = (config = {}) => async () => {
+const commonBefore = async (config = {}) => {
   const mergedConfig = {
     ...baseConfig,
     ...config
   };
 
   // Build a fresh nuxt
   nuxt = new Nuxt(mergedConfig);
-  await new Builder(nuxt).build();
-  await nuxt.listen(process.env.PORT);
-};
-
-const commonAfter = async () => {
-  // Close all opened resources
-  await nuxt.close();
+  const builder = new Builder(nuxt);
+  await builder.build();
+  serve();
 };
 
-const generate = (config = {}) => async () => {
+const generate = async (config = {}) => {
   const mergedConfig = {
     ...baseConfig,
     ...config
@@ -55,12 +56,13 @@ const generate = (config = {}) => async () => {
   const builder = new Builder(nuxt);
   generator = new Generator(nuxt, builder);
   await generator.generate();
-  serve();
+  serve(true);
 };
 
-const generateAfter = async () => {
-  await commonAfter();
-  stopServe();
+const commonAfter = async () => {
+  // Close all opened resources
+  server.close();
+  await nuxt.close();
 };
 
-export { get, commonBefore, commonAfter, generate, generateAfter };
+export { get, commonBefore, commonAfter, generate };