From fef7b24a723832c57003101359668d9767307b97 Mon Sep 17 00:00:00 2001 From: machty Date: Fri, 10 Jan 2025 15:46:27 -0500 Subject: [PATCH 1/6] rm custom-app, see what breaks --- packages/vscode/__fixtures__/custom-app/src/index.custom | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 packages/vscode/__fixtures__/custom-app/src/index.custom diff --git a/packages/vscode/__fixtures__/custom-app/src/index.custom b/packages/vscode/__fixtures__/custom-app/src/index.custom deleted file mode 100644 index 6d3ff8f29..000000000 --- a/packages/vscode/__fixtures__/custom-app/src/index.custom +++ /dev/null @@ -1,5 +0,0 @@ -import Greeting from './Greeting'; - - From 40b6033a988a457c5b640c6d2cec4020d0151f89 Mon Sep 17 00:00:00 2001 From: machty Date: Fri, 10 Jan 2025 16:06:48 -0500 Subject: [PATCH 2/6] unskip and fix a few --- .../__tests__/language-server/diagnostics.test.ts | 4 ++-- packages/vscode/__tests__/smoketest-ember.test.ts | 4 ++-- .../__tests__/smoketest-template-imports.test.ts | 12 +++++++----- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/packages/core/__tests__/language-server/diagnostics.test.ts b/packages/core/__tests__/language-server/diagnostics.test.ts index fc6d0f89a..4b3528fc5 100644 --- a/packages/core/__tests__/language-server/diagnostics.test.ts +++ b/packages/core/__tests__/language-server/diagnostics.test.ts @@ -123,7 +123,7 @@ describe('Language Server: Diagnostics', () => { expect(diagnostics).toMatchObject([ { message: "Property 'foo' does not exist on type '{}'.", - source: 'ts', + source: 'glint', code: 2339, }, ]); @@ -165,7 +165,7 @@ describe('Language Server: Diagnostics', () => { expect(diagnostics).toMatchObject([ { message: "Property 'foo' does not exist on type '{}'.", - source: 'ts', + source: 'glint', code: 2339, }, ]); diff --git a/packages/vscode/__tests__/smoketest-ember.test.ts b/packages/vscode/__tests__/smoketest-ember.test.ts index 4bf5ad89e..e2b459d54 100644 --- a/packages/vscode/__tests__/smoketest-ember.test.ts +++ b/packages/vscode/__tests__/smoketest-ember.test.ts @@ -52,7 +52,7 @@ describe.skip('Smoke test: Ember', () => { expect(languages.getDiagnostics(templateURI)).toMatchObject([ { message: "Property 'message' does not exist on type 'ColocatedLayoutComponent'.", - source: 'ts', + source: 'glint', code: 2339, range: new Range(0, 7, 0, 14), }, @@ -77,7 +77,7 @@ describe.skip('Smoke test: Ember', () => { expect(languages.getDiagnostics(scriptURI)).toMatchObject([ { message: "Property 'foo' does not exist on type 'MyTestContext'.", - source: 'ts', + source: 'glint', code: 2339, range: new Range(17, 13, 17, 16), }, diff --git a/packages/vscode/__tests__/smoketest-template-imports.test.ts b/packages/vscode/__tests__/smoketest-template-imports.test.ts index 6c0a880ad..4a4e342f5 100644 --- a/packages/vscode/__tests__/smoketest-template-imports.test.ts +++ b/packages/vscode/__tests__/smoketest-template-imports.test.ts @@ -14,7 +14,7 @@ import { describe, afterEach, test } from 'mocha'; import { expect } from 'expect'; import { waitUntil } from './helpers/async'; -describe.skip('Smoke test: ETI Environment', () => { +describe('Smoke test: ETI Environment', () => { const rootDir = path.resolve(__dirname, '../../__fixtures__/template-imports-app'); afterEach(async () => { @@ -44,7 +44,7 @@ describe.skip('Smoke test: ETI Environment', () => { expect(languages.getDiagnostics(scriptURI)).toMatchObject([ { message: "Type 'number' is not assignable to type 'string'.", - source: 'ts', + source: 'glint', code: 2322, range: new Range(6, 13, 6, 19), }, @@ -75,12 +75,14 @@ describe.skip('Smoke test: ETI Environment', () => { new Range(new Position(10, 9), new Position(10, 9)), ); - expect(fixes.length).toBe(3); + expect(fixes.length).toBe(4); + + const fix = fixes.find((fix) => fix.title === 'Declare property \'undocumentedProperty\''); - expect(fixes[1].title).toBe(`Declare property 'undocumentedProperty'`); + expect(fix).toBeDefined(); // apply the missing arg fix - await workspace.applyEdit(fixes![1].edit!); + await workspace.applyEdit(fix!.edit!); await waitUntil( () => From 8e8c081f0cee115d0de2e46e28963f7c59687ae6 Mon Sep 17 00:00:00 2001 From: machty Date: Fri, 10 Jan 2025 16:11:20 -0500 Subject: [PATCH 3/6] fix other test --- .../vscode/__tests__/smoketest-template-imports.test.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/vscode/__tests__/smoketest-template-imports.test.ts b/packages/vscode/__tests__/smoketest-template-imports.test.ts index 4a4e342f5..446cbc9a6 100644 --- a/packages/vscode/__tests__/smoketest-template-imports.test.ts +++ b/packages/vscode/__tests__/smoketest-template-imports.test.ts @@ -115,12 +115,14 @@ describe('Smoke test: ETI Environment', () => { new Range(new Position(10, 12), new Position(10, 12)), ); - expect(fixes.length).toBe(3); + expect(fixes.length).toBe(4); + + const fix = fixes.find((fix) => fix.title === 'Declare property \'localProp\''); - expect(fixes[1].title).toBe(`Declare property 'localProp'`); + expect(fix).toBeDefined(); // select ignore - await workspace.applyEdit(fixes![0].edit!); + await workspace.applyEdit(fix!.edit!); await waitUntil( () => From 9973174e68bf274b61cdc3f0f7c844d2ed61839d Mon Sep 17 00:00:00 2001 From: machty Date: Fri, 10 Jan 2025 16:11:54 -0500 Subject: [PATCH 4/6] add breaking tes --- packages/vscode/__tests__/smoketest-template-imports.test.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/vscode/__tests__/smoketest-template-imports.test.ts b/packages/vscode/__tests__/smoketest-template-imports.test.ts index 446cbc9a6..06e8d1fc0 100644 --- a/packages/vscode/__tests__/smoketest-template-imports.test.ts +++ b/packages/vscode/__tests__/smoketest-template-imports.test.ts @@ -92,6 +92,10 @@ describe('Smoke test: ETI Environment', () => { }); }); + test('ensure ci is running', async () => { + throw new Error('wat'); + }); + describe('codeactions locals', () => { test('add local props to a class', async () => { let scriptURI = Uri.file(`${rootDir}/src/Greeting.gts`); From 7d77eea44370946506a9447921b95a29dd854818 Mon Sep 17 00:00:00 2001 From: machty Date: Fri, 10 Jan 2025 16:15:10 -0500 Subject: [PATCH 5/6] prettier --- packages/vscode/__tests__/smoketest-template-imports.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/vscode/__tests__/smoketest-template-imports.test.ts b/packages/vscode/__tests__/smoketest-template-imports.test.ts index 06e8d1fc0..2f2d03284 100644 --- a/packages/vscode/__tests__/smoketest-template-imports.test.ts +++ b/packages/vscode/__tests__/smoketest-template-imports.test.ts @@ -77,7 +77,7 @@ describe('Smoke test: ETI Environment', () => { expect(fixes.length).toBe(4); - const fix = fixes.find((fix) => fix.title === 'Declare property \'undocumentedProperty\''); + const fix = fixes.find((fix) => fix.title === "Declare property 'undocumentedProperty'"); expect(fix).toBeDefined(); @@ -121,7 +121,7 @@ describe('Smoke test: ETI Environment', () => { expect(fixes.length).toBe(4); - const fix = fixes.find((fix) => fix.title === 'Declare property \'localProp\''); + const fix = fixes.find((fix) => fix.title === "Declare property 'localProp'"); expect(fix).toBeDefined(); From fc200370c9f785f0bd4e70ee0e57600583ae6334 Mon Sep 17 00:00:00 2001 From: machty Date: Fri, 10 Jan 2025 16:24:02 -0500 Subject: [PATCH 6/6] rm breaking test --- packages/vscode/__tests__/smoketest-template-imports.test.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/vscode/__tests__/smoketest-template-imports.test.ts b/packages/vscode/__tests__/smoketest-template-imports.test.ts index 2f2d03284..4ba8d2abf 100644 --- a/packages/vscode/__tests__/smoketest-template-imports.test.ts +++ b/packages/vscode/__tests__/smoketest-template-imports.test.ts @@ -92,10 +92,6 @@ describe('Smoke test: ETI Environment', () => { }); }); - test('ensure ci is running', async () => { - throw new Error('wat'); - }); - describe('codeactions locals', () => { test('add local props to a class', async () => { let scriptURI = Uri.file(`${rootDir}/src/Greeting.gts`);