Make bundle tests check diagnostic snapshots

ark120202 · ark120202 · commit 11c3ee4e95a0 · 2019-12-12T17:09:16.000Z
diff --git a/test/unit/__snapshots__/bundle.spec.ts.snap b/test/unit/__snapshots__/bundle.spec.ts.snap
@@ -0,0 +1,7 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`LuaLibImportKind.Inline generates a warning: diagnostics 1`] = `"warning TSTL: Using 'luaBundle' with 'luaLibImport: \\"inline\\"' might generate duplicate code. It is recommended to use 'luaLibImport: \\"require\\"'"`;
+
+exports[`luaEntry doesn't exist: diagnostics 1`] = `"error TSTL: Could not find bundle entry point 'entry.ts'. It should be a file in the project."`;
+
+exports[`no entry point: diagnostics 1`] = `"error TSTL: 'luaBundleEntry' is required when 'luaBundle' is enabled."`;
diff --git a/test/unit/bundle.spec.ts b/test/unit/bundle.spec.ts
@@ -1,20 +1,8 @@
 import * as path from "path";
 import * as ts from "typescript";
-import { DiagnosticCategory } from "typescript";
 import { LuaLibImportKind } from "../../src";
-import { couldNotFindBundleEntryPoint } from "../../src/transpilation/diagnostics";
 import * as util from "../util";
 
-test("no entry point", () => {
-    util.testBundle``
-        .setOptions({ luaBundleEntry: undefined })
-        .expectToHaveDiagnostic(
-            d =>
-                d.messageText === `'luaBundleEntry' is required when 'luaBundle' is enabled.` &&
-                d.category === DiagnosticCategory.Error
-        );
-});
-
 test("import module -> main", () => {
     util.testBundle`
         export { value } from "./module";
@@ -24,14 +12,14 @@ test("import module -> main", () => {
 });
 
 test("bundle file name", () => {
-    const { diagnostics, transpiledFiles } = util.testModule`
+    const { transpiledFiles } = util.testModule`
     export { value } from "./module";
 `
         .addExtraFile("module.ts", "export const value = true")
         .setOptions({ luaBundle: "mybundle.lua", luaBundleEntry: "main.ts" })
+        .expectToHaveNoDiagnostics()
         .getLuaResult();
 
-    expect(diagnostics.length).toBe(0);
     expect(transpiledFiles.length).toBe(1);
     expect(transpiledFiles[0].fileName).toBe(
         path.join(ts.sys.getCurrentDirectory(), "mybundle.lua").replace(/\\/g, "/")
@@ -87,35 +75,23 @@ test("entry point in directory", () => {
         .expectToEqual({ value: true });
 });
 
-test.each([LuaLibImportKind.Inline, LuaLibImportKind.Require])("LuaLib %p", lualibOption => {
-    const testBundle = util.testBundle`
+test("LuaLibImportKind.Require", () => {
+    util.testBundle`
         export const result = [1, 2];
         result.push(3);
-    `.setOptions({ luaLibImport: lualibOption });
-
-    if (lualibOption === LuaLibImportKind.Inline) {
-        testBundle.expectToHaveDiagnostic(d => d.category === DiagnosticCategory.Warning);
-    } else {
-        expect(testBundle.getLuaResult().diagnostics).toEqual([]);
-    }
-    expect(testBundle.getLuaExecutionResult()).toEqual({ result: [1, 2, 3] });
+    `
+        .setOptions({ luaLibImport: LuaLibImportKind.Require })
+        .expectToEqual({ result: [1, 2, 3] });
 });
 
-test("LuaBundle and LuaLibImport.Inline generate warning", () => {
-    const testBundle = util.testBundle`
+test("LuaLibImportKind.Inline generates a warning", () => {
+    util.testBundle`
         export const result = [1, 2];
         result.push(3);
     `
         .setOptions({ luaLibImport: LuaLibImportKind.Inline })
-        .expectToHaveDiagnostic(
-            d =>
-                d.category === DiagnosticCategory.Warning &&
-                d.messageText ===
-                    `Using 'luaBundle' with 'luaLibImport: "inline"' might generate duplicate code. ` +
-                        `It is recommended to use 'luaLibImport: "require"'`
-        );
-
-    expect(testBundle.getLuaExecutionResult()).toEqual({ result: [1, 2, 3] }); // Result should still be the same
+        .expectDiagnosticsToMatchSnapshot(true)
+        .expectToEqual({ result: [1, 2, 3] });
 });
 
 test("cyclic imports", () => {
@@ -136,6 +112,10 @@ test("cyclic imports", () => {
         .expectToEqual(new util.ExecutionError("stack overflow"));
 });
 
+test("no entry point", () => {
+    util.testBundle``.setOptions({ luaBundleEntry: undefined }).expectDiagnosticsToMatchSnapshot(true);
+});
+
 test("luaEntry doesn't exist", () => {
-    util.testBundle``.setEntryPoint("entry.ts").expectToHaveExactDiagnostic(couldNotFindBundleEntryPoint("entry.ts"));
+    util.testBundle``.setEntryPoint("entry.ts").expectDiagnosticsToMatchSnapshot(true);
 });
