chore(test): fix tests

medfreeman · medfreeman · commit 087bf523af4a · 2018-08-07T02:28:56.000+02:00
Fix `generate` test.
Properly name `generate` test.
Properly handle async operations.
Change `dev` and `generate` tests to use snapshots.
Add `dev` snapshot.
diff --git a/test/__snapshots__/dev.test.js.snap b/test/__snapshots__/dev.test.js.snap
@@ -0,0 +1,16 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`module dev mode admin 1`] = `
+"<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset=\\"utf-8\\" />
+    <meta name=\\"viewport\\" content=\\"width=device-width, initial-scale=1.0\\" />
+    <link href=\\"/admin/config.yml\\" type=\\"text/yaml\\" rel=\\"cms-config-url\\">
+    <title>Content Manager</title>
+  </head>
+  <body>
+  <script type=\\"text/javascript\\" src=\\"/admin/bundle.d1e28a1f3d3e1d943036.js\\"></script></body>
+</html>
+"
+`;
diff --git a/test/config.test.js b/test/config.test.js
@@ -3,10 +3,14 @@ jest.mock("../src/utils/yaml");
 
 import { get, commonBefore, commonAfter } from "./nuxt";
 
-describe("config", () => {
-  beforeAll(commonBefore());
+describe("config", async () => {
+  beforeAll(async () => {
+    await commonBefore()();
+  });
 
-  afterAll(commonAfter);
+  afterAll(async () => {
+    await commonAfter();
+  });
 
   test("netlify-cms.yml", async () => {
     const config = await get("/admin/config.yml");
diff --git a/test/dev.test.js b/test/dev.test.js
@@ -1,9 +1,13 @@
 import { get, commonBefore, commonAfter } from "./nuxt";
 
-describe("module dev mode", () => {
-  beforeAll(commonBefore({ dev: true }));
+describe("module dev mode", async () => {
+  beforeAll(async () => {
+    await commonBefore({ dev: true })();
+  });
 
-  afterAll(commonAfter);
+  afterAll(async () => {
+    await commonAfter();
+  });
 
   test("render", async () => {
     const html = await get("/");
@@ -12,6 +16,6 @@ describe("module dev mode", () => {
 
   test("admin", async () => {
     const html = await get("/admin/");
-    expect(html).toMatch(/.*<script[\s\S]*?>[\s\S]*?<\/script><\/body>/);
+    expect(html).toMatchSnapshot();
   });
 });
diff --git a/test/generate.test.js b/test/generate.test.js
@@ -1,12 +1,16 @@
 import { get, generate, generateAfter } from "./nuxt";
 
-describe("module dev mode", () => {
-  beforeAll(generate());
+describe("module generate mode", async () => {
+  beforeAll(async () => {
+    await generate()();
+  });
 
-  afterAll(generateAfter);
+  afterAll(async () => {
+    await generateAfter();
+  });
 
   test("admin", async () => {
     const html = await get("/admin/");
-    expect(html).toMatch(/.*<script[\s\S]*?>[\s\S]*?<\/script><\/body>/);
+    expect(html).toMatchSnapshot();
   });
 });
diff --git a/test/module.test.js b/test/module.test.js
@@ -1,9 +1,13 @@
 import { get, commonBefore, commonAfter } from "./nuxt";
 
-describe("module", () => {
-  beforeAll(commonBefore());
+describe("module", async () => {
+  beforeAll(async () => {
+    await commonBefore()();
+  });
 
-  afterAll(commonAfter);
+  afterAll(async () => {
+    await commonAfter();
+  });
 
   test("render", async () => {
     const html = await get("/");
diff --git a/test/nuxt.js b/test/nuxt.js
@@ -1,5 +1,3 @@
-import { join } from "path";
-
 import { Nuxt, Builder, Generator } from "nuxt";
 import request from "request-promise-native";
 import Koa from "koa";
@@ -15,12 +13,13 @@ const url = path => `http://localhost:${process.env.PORT}${path}`;
 const get = path => request(url(path));
 
 let nuxt;
+let generator;
 let server;
 
 const serve = () => {
   const app = new Koa();
 
-  app.use(serveStatic(join(nuxt.options.buildDir, "dist")));
+  app.use(serveStatic(generator.distPath));
   server = app.listen(process.env.PORT);
 };
 
@@ -54,7 +53,7 @@ const generate = (config = {}) => async () => {
   // Build a fresh nuxt
   nuxt = new Nuxt(mergedConfig);
   const builder = new Builder(nuxt);
-  const generator = new Generator(nuxt, builder);
+  generator = new Generator(nuxt, builder);
   await generator.generate();
   serve();
 };
