test: quality of life updates for e2e tests

- update vscode version
- use __dirname for resolving test file locations to be more fault tolerant of potential errors in directory resolution
- wait for definitions to be available during activation rather than waiting a set time

Author: atscott

integration/e2e/definition_spec.ts

@@ -1,14 +1,13 @@
 import * as vscode from 'vscode';
+
 import {APP_COMPONENT} from '../test_constants';
-import {activate} from './helper';
 
-const DEFINITION_COMMAND = 'vscode.executeDefinitionProvider';
-const APP_COMPONENT_URI = vscode.Uri.file(APP_COMPONENT);
+import {activate, APP_COMPONENT_URI, DEFINITION_COMMAND} from './helper';
 
 describe('Angular Ivy LS', () => {
   beforeAll(async () => {
     await activate(APP_COMPONENT_URI);
-  }, 25000 /* 25 seconds */);
+  });
 
   it(`returns definition for variable in template`, async () => {
     // vscode Position is zero-based

integration/e2e/helper.ts

@@ -1,10 +1,32 @@
 import * as vscode from 'vscode';
+import {APP_COMPONENT} from '../test_constants';
+
+export const DEFINITION_COMMAND = 'vscode.executeDefinitionProvider';
+export const APP_COMPONENT_URI = vscode.Uri.file(APP_COMPONENT);
 
 function sleep(ms: number) {
   return new Promise(resolve => setTimeout(resolve, ms));
 }
 
-export async function activate(uri: vscode.Uri) {
+export async function activate(uri: vscode.Uri, timeoutSeconds = 20) {
+  await waitForAngularDefinitions(timeoutSeconds);
   await vscode.window.showTextDocument(uri);
-  await sleep(20 * 1000);  // Wait for server activation, including ngcc run
+}
+
+async function waitForAngularDefinitions(timeoutSeconds: number) {
+  await vscode.window.showTextDocument(APP_COMPONENT_URI);
+  //   template: `<h1>Hello {{name}}</h1>`,
+  //                          ^-------- here
+  const position = new vscode.Position(4, 25);
+  let tries = 0;
+  let definitions: vscode.LocationLink[]|undefined;
+  while ((definitions?.length ?? 0) < 1 && tries < timeoutSeconds) {
+    definitions = await vscode.commands.executeCommand<vscode.LocationLink[]>(
+        DEFINITION_COMMAND, APP_COMPONENT_URI, position);
+    await sleep(1000);
+    tries++;
+  }
+  if (definitions === undefined || definitions.length === 0) {
+    fail('Waiting for Angular definitions to be available timed out.');
+  }
 }

integration/e2e/index.ts

@@ -9,7 +9,7 @@ async function main() {
   try {
     await runTests({
       // Keep version in sync with vscode engine version in package.json
-      version: '1.56.0',
+      version: '1.56.2',
       extensionDevelopmentPath: EXT_DEVELOPMENT_PATH,
       extensionTestsPath: EXT_TESTS_PATH,
       launchArgs: [

integration/e2e/jasmine.ts

@@ -4,12 +4,14 @@ export async function run(): Promise<void> {
   const jasmine = new Jasmine({});
 
   jasmine.loadConfig({
-    spec_dir: 'dist/integration/e2e',
+    spec_dir: __dirname,
     spec_files: [
       '*_spec.js',
     ],
   });
 
+  console.log(`Expecting to run ${jasmine.specFiles.length} specs.`);
+
   if (jasmine.specFiles.length === 0) {
     throw new Error('No specs found');
   }