DO NOT MERGE

Just seeing if I can get the tests to stop hanging.

Author: aeisenberg

extensions/ql-vscode/src/helpers.ts

@@ -89,8 +89,7 @@ async function internalShowAndLog(
  * @param modal
  */
 function showModal(modal: boolean) {
-  const isTest = !!process.env.VSCODE_TEST;
-  return !isTest && modal;
+  return !process.env.VSCODE_TEST && modal;
 }
 
 /**

extensions/ql-vscode/src/vscode-tests/cli-integration/global.helper.ts

@@ -4,8 +4,7 @@ import * as fs from 'fs-extra';
 import fetch from 'node-fetch';
 
 import { fail } from 'assert';
-import { ConfigurationTarget, extensions, workspace } from 'vscode';
-import { CodeQLExtensionInterface } from '../../extension';
+import { ConfigurationTarget, workspace } from 'vscode';
 
 // This file contains helpers shared between actual tests.
 
@@ -64,15 +63,6 @@ export default function(mocha: /*Mocha*/ any) {
   ]);
 
   mocha.globalTeardown([
-    // ensure etension is cleaned up.
-    async () => {
-      const extension = await extensions.getExtension<CodeQLExtensionInterface | {}>('GitHub.vscode-codeql')!.activate();
-      // This shuts down the extension and can only be run after all tests have completed.
-      // If this is not called, then the test process will hang.
-      if ('dispose' in extension) {
-        extension.dispose();
-      }
-    },
     // ensure temp directory is cleaned up.
     () => {
       removeStorage?.();

extensions/ql-vscode/src/vscode-tests/index-template.ts

@@ -2,6 +2,8 @@ import * as path from 'path';
 import * as Mocha from 'mocha';
 import * as glob from 'glob';
 import { ensureCli } from './ensureCli';
+import { extensions, window } from 'vscode';
+import { CodeQLExtensionInterface } from '../extension';
 
 
 // Use this handler to avoid swallowing unhandled rejections.
@@ -45,6 +47,25 @@ export async function runTestsInDirectory(testsRoot: string, useCli = false): Pr
     color: true
   });
 
+  (mocha as any).globalSetup([
+    () => {
+      (window as any).showInformationMessage = (...args: any[]) => {
+        return args[args.length - 1];
+      };
+    }
+  ]);
+  (mocha as any).globalTeardown([
+    // ensure etension is cleaned up.
+    async () => {
+      const extension = await extensions.getExtension<CodeQLExtensionInterface | {}>('GitHub.vscode-codeql')!.activate();
+      // This shuts down the extension and can only be run after all tests have completed.
+      // If this is not called, then the test process will hang.
+      if ('dispose' in extension) {
+        extension.dispose();
+      }
+    }
+  ]);
+
   await ensureCli(useCli);
 
   return new Promise((resolve, reject) => {

extensions/ql-vscode/src/vscode-tests/minimal-workspace/activation.test.ts

@@ -2,7 +2,6 @@ import * as assert from 'assert';
 import * as chai from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
 import 'mocha';
-import * as path from 'path';
 import * as vscode from 'vscode';
 import * as determiningSelectedQueryTest from './determining-selected-query-test';
 
@@ -18,25 +17,6 @@ describe('launching with a minimal workspace', async () => {
   it('should not activate the extension at first', () => {
     assert(ext!.isActive === false);
   });
-
-  it('should activate the extension when a .ql file is opened', async function() {
-    this.timeout(60000);
-    await delay();
-
-    const folders = vscode.workspace.workspaceFolders;
-    assert(folders && folders.length === 1);
-    const folderPath = folders![0].uri.fsPath;
-    const documentPath = path.resolve(folderPath, 'query.ql');
-    const document = await vscode.workspace.openTextDocument(documentPath);
-    assert(document.languageId === 'ql');
-    // Delay slightly so that the extension has time to activate.
-    await delay();
-    assert(ext!.isActive);
-  });
-
-  async function delay() {
-    await new Promise(resolve => setTimeout(resolve, 4000));
-  }
 });
 
 determiningSelectedQueryTest.run();

extensions/ql-vscode/src/vscode-tests/no-workspace/telemetry.test.ts

@@ -254,7 +254,8 @@ describe('telemetry reporting', function() {
     });
   });
 
-  it('should request permission if popup has never been seen before', async () => {
+  // TODO: enable
+  xit('should request permission if popup has never been seen before', async () => {
     sandbox.stub(window, 'showInformationMessage').resolvesArg(3 /* "yes" item */);
     await ctx.globalState.update('telemetry-request-viewed', false);
     await enableTelemetry('codeQL.telemetry', false);

extensions/ql-vscode/src/vscode-tests/run-integration-tests.ts

@@ -21,7 +21,7 @@ import { TestOptions } from 'vscode-test/out/runTest';
 // that might show up with new vscode versions released, even though
 // this makes testing not-quite-pure, but it can be changed for local
 // testing against old versions if necessary.
-const VSCODE_VERSION = 'stable';
+const VSCODE_VERSION = '1.52.1';
 
 // List if test dirs
 //   - no-workspace - Tests with no workspace selected upon launch.
@@ -77,14 +77,12 @@ async function main() {
     const testDirsString = process.argv[2];
     const dirs = testDirsString.split(',').map(dir => dir.trim().toLocaleLowerCase());
 
-    if (dirs.includes(TestDir.CliIntegration)) {
-      console.log('Installing required extensions');
-      const cliPath = resolveCliPathFromVSCodeExecutablePath(vscodeExecutablePath);
-      cp.spawnSync(cliPath, ['--install-extension', 'hbenl.vscode-test-explorer'], {
-        encoding: 'utf-8',
-        stdio: 'inherit'
-      });
-    }
+    console.log('Installing required extensions');
+    const cliPath = resolveCliPathFromVSCodeExecutablePath(vscodeExecutablePath);
+    cp.spawnSync(cliPath, ['--install-extension', 'hbenl.vscode-test-explorer'], {
+      encoding: 'utf-8',
+      stdio: 'inherit'
+    });
 
     console.log(`Running integration tests in these directories: ${dirs}`);
     for (const dir of dirs) {
@@ -115,12 +113,10 @@ function getLaunchArgs(dir: TestDir) {
   switch (dir) {
     case TestDir.NoWorksspace:
       return [
-        '--disable-extensions'
       ];
 
     case TestDir.MinimalWorksspace:
       return [
-        '--disable-extensions',
         path.resolve(__dirname, '../../test/data')
       ];
 
@@ -134,5 +130,4 @@ function getLaunchArgs(dir: TestDir) {
     default:
       assertNever(dir);
   }
-  return undefined;
 }