From 745a3691e2188bde5441c9937f6a808fba1393cc Mon Sep 17 00:00:00 2001 From: Hemal Patel Date: Sun, 9 Dec 2018 15:16:39 +0530 Subject: [PATCH] tests(entry): use extractSummary --- .../entry/cli-override/cli-override.test.js | 12 +++++++----- .../display-entrypoints.test.js | 8 +++++--- .../binCases/entry/multi-file/multi-file.test.js | 16 +++++++++------- .../entry/named-entry/named-entry.test.js | 16 +++++++++------- .../non-hyphenated-args.test.js | 12 +++++++----- 5 files changed, 37 insertions(+), 27 deletions(-) diff --git a/test/binCases/entry/cli-override/cli-override.test.js b/test/binCases/entry/cli-override/cli-override.test.js index c4e4a2493fe..5a4abee7d66 100644 --- a/test/binCases/entry/cli-override/cli-override.test.js +++ b/test/binCases/entry/cli-override/cli-override.test.js @@ -1,6 +1,6 @@ "use strict"; -const { run } = require("../../../testUtils"); +const { run, extractSummary } = require("../../../testUtils"); test("cli-override", () => { const { code, stdout, stderr } = run(__dirname, [ @@ -14,10 +14,12 @@ test("cli-override", () => { "[id].chunk.js" ]); + const summary = extractSummary(stdout); + expect(code).toBe(0); - expect(stdout).toEqual(expect.anything()); - expect(stdout).toContain("cliEntry.js"); - expect(stdout).toContain("index.js"); + expect(summary).toEqual(expect.anything()); + expect(summary).toContain("cliEntry.js"); + expect(summary).toContain("index.js"); expect(stderr).toHaveLength(0); - expect(stdout).toMatchSnapshot(); + expect(summary).toMatchSnapshot(); }); diff --git a/test/binCases/entry/display-entrypoints/display-entrypoints.test.js b/test/binCases/entry/display-entrypoints/display-entrypoints.test.js index 455b501ce21..a5c5b4201b8 100644 --- a/test/binCases/entry/display-entrypoints/display-entrypoints.test.js +++ b/test/binCases/entry/display-entrypoints/display-entrypoints.test.js @@ -1,11 +1,13 @@ "use strict"; -const { run } = require("../../../testUtils"); +const { run, extractSummary } = require("../../../testUtils"); test("display-entrypoints", () => { const { stdout, stderr } = run(__dirname, ["--display-entrypoints", "false"]); - expect(stdout).not.toContain("Entrypoint"); + const summary = extractSummary(stdout); + + expect(summary).not.toContain("Entrypoint"); expect(stderr).toHaveLength(0); - expect(stdout).toMatchSnapshot(); + expect(summary).toMatchSnapshot(); }); diff --git a/test/binCases/entry/multi-file/multi-file.test.js b/test/binCases/entry/multi-file/multi-file.test.js index aaea066b251..83305c16822 100644 --- a/test/binCases/entry/multi-file/multi-file.test.js +++ b/test/binCases/entry/multi-file/multi-file.test.js @@ -1,6 +1,6 @@ "use strict"; -const { run } = require("../../../testUtils"); +const { run, extractSummary } = require("../../../testUtils"); test("multi-file", () => { const { stdout, code, stderr } = run(__dirname, [ @@ -18,12 +18,14 @@ test("multi-file", () => { "async-node" ]); + const summary = extractSummary(stdout); + expect(code).toBe(0); - expect(stdout).toEqual(expect.anything()); - expect(stdout).toContain("null.js"); - expect(stdout).toMatch(/multi.*index\.js.*a\.js/); // should have multi-file entry - expect(stdout).toMatch(/index\.js.*\{0\}/); - expect(stdout).toMatch(/a\.js.*\{0\}/); + expect(summary).toEqual(expect.anything()); + expect(summary).toContain("null.js"); + expect(summary).toMatch(/multi.*index\.js.*a\.js/); // should have multi-file entry + expect(summary).toMatch(/index\.js.*\{0\}/); + expect(summary).toMatch(/a\.js.*\{0\}/); expect(stderr).toHaveLength(0); - expect(stdout).toMatchSnapshot(); + expect(summary).toMatchSnapshot(); }); diff --git a/test/binCases/entry/named-entry/named-entry.test.js b/test/binCases/entry/named-entry/named-entry.test.js index 920b82ebdb7..0802d74c762 100644 --- a/test/binCases/entry/named-entry/named-entry.test.js +++ b/test/binCases/entry/named-entry/named-entry.test.js @@ -1,6 +1,6 @@ "use strict"; -const { run } = require("../../../testUtils"); +const { run, extractSummary } = require("../../../testUtils"); test("named-entry", () => { const { stdout, code, stderr } = run(__dirname, [ @@ -20,12 +20,14 @@ test("named-entry", () => { "production" ]); + const summary = extractSummary(stdout); + expect(code).toBe(0); - expect(stdout).toEqual(expect.anything()); - expect(stdout).toContain("foo.js"); // named entry from --entry foo=./a.js - expect(stdout).toContain("null.js"); - expect(stdout).toMatch(/a\.js.*\{0\}/); - expect(stdout).toMatch(/index\.js.*\{1\}/); + expect(summary).toEqual(expect.anything()); + expect(summary).toContain("foo.js"); // named entry from --entry foo=./a.js + expect(summary).toContain("null.js"); + expect(summary).toMatch(/a\.js.*\{0\}/); + expect(summary).toMatch(/index\.js.*\{1\}/); expect(stderr).toHaveLength(0); - expect(stdout).toMatchSnapshot(); + expect(summary).toMatchSnapshot(); }); diff --git a/test/binCases/entry/non-hyphenated-args/non-hyphenated-args.test.js b/test/binCases/entry/non-hyphenated-args/non-hyphenated-args.test.js index 41456a6aa26..ab175db5058 100644 --- a/test/binCases/entry/non-hyphenated-args/non-hyphenated-args.test.js +++ b/test/binCases/entry/non-hyphenated-args/non-hyphenated-args.test.js @@ -1,6 +1,6 @@ "use strict"; -const { run } = require("../../../testUtils"); +const { run, extractSummary } = require("../../../testUtils"); test("non-hyphenated-args", () => { const { stdout, code, stderr } = run(__dirname, [ @@ -15,10 +15,12 @@ test("non-hyphenated-args", () => { "async-node" ]); + const summary = extractSummary(stdout); + expect(code).toBe(0); - expect(stdout).toEqual(expect.anything()); - expect(stdout).toContain("main.js"); // non-hyphenated arg ./a.js should create chunk "main" - expect(stdout).toMatch(/a\.js.*\{0\}/); // a.js should be in chunk 0 + expect(summary).toEqual(expect.anything()); + expect(summary).toContain("main.js"); // non-hyphenated arg ./a.js should create chunk "main" + expect(summary).toMatch(/a\.js.*\{0\}/); // a.js should be in chunk 0 expect(stderr).toHaveLength(0); - expect(stdout).toMatchSnapshot(); + expect(summary).toMatchSnapshot(); });