Final stuff to revert

Perryvw · Perryvw · commit 2308ebf9910f · 2019-11-27T20:38:23.000+01:00
diff --git a/test/setup.ts b/test/setup.ts
@@ -33,7 +33,7 @@ expect.extend({
     toHaveDiagnostics(diagnostics: ts.Diagnostic[]): jest.CustomMatcherResult {
         expect(diagnostics).toBeInstanceOf(Array);
         // @ts-ignore
-        const matcherHint = this.utils.matcherHint("toHaveErrorDiagnostics", undefined, "", this);
+        const matcherHint = this.utils.matcherHint("toHaveDiagnostics", undefined, "", this);
 
         const diagnosticMessages = ts.formatDiagnosticsWithColorAndContext(diagnostics, {
             getCurrentDirectory: () => "",
diff --git a/test/unit/modules/resolution.spec.ts b/test/unit/modules/resolution.spec.ts
@@ -82,7 +82,7 @@ test("doesn't resolve paths out of root dir", () => {
         .setMainFileName("src/main.ts")
         .setOptions({ rootDir: "./src" })
         .disableSemanticCheck()
-        .expectToHaveErrorDiagnostics();
+        .expectToHaveDiagnostics();
 });
 
 test.each([
diff --git a/test/util.ts b/test/util.ts
@@ -350,13 +350,13 @@ export abstract class TestBuilder {
         return this;
     }
 
-    public expectToHaveErrorDiagnostics(): this {
+    public expectToHaveDiagnostics(): this {
         expect(this.getLuaDiagnostics()).toHaveDiagnostics();
         return this;
     }
 
     public expectToHaveDiagnosticOfError(error: Error): this {
-        this.expectToHaveErrorDiagnostics();
+        this.expectToHaveDiagnostics();
         expect(this.getLuaDiagnostics()).toHaveLength(1);
         const firstDiagnostic = this.getLuaDiagnostics()[0];
         expect(firstDiagnostic).toMatchObject({ messageText: error.message });

Original file line number	Diff line number	Diff line change
`@@ -350,13 +350,13 @@ export abstract class TestBuilder {`
`350`	`350`	`return this;`
`351`	`351`	`}`
`352`	`352`
`353`		`- public expectToHaveErrorDiagnostics(): this {`
	`353`	`+ public expectToHaveDiagnostics(): this {`
`354`	`354`	`expect(this.getLuaDiagnostics()).toHaveDiagnostics();`
`355`	`355`	`return this;`
`356`	`356`	`}`
`357`	`357`
`358`	`358`	`public expectToHaveDiagnosticOfError(error: Error): this {`
`359`		`- this.expectToHaveErrorDiagnostics();`
	`359`	`+ this.expectToHaveDiagnostics();`
`360`	`360`	`expect(this.getLuaDiagnostics()).toHaveLength(1);`
`361`	`361`	`const firstDiagnostic = this.getLuaDiagnostics()[0];`
`362`	`362`	`expect(firstDiagnostic).toMatchObject({ messageText: error.message });`