[extension-manager] fixed tests

Signed-off-by: Anton Kosiakov <anton.kosyakov@typefox.io>

Author: akosyakov

generator-theia/package.json

@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@types/fs-extra": "^4.0.2",
-    "@types/request": "^2.0.0",
+    "@types/request": "^2.0.3",
     "@types/semver": "^5.3.32",
     "@types/yargs": "^8.0.2",
     "@types/yeoman-generator": "^1.0.2",

package.json

@@ -8,14 +8,12 @@
     "yo": "^2.0.0"
   },
   "scripts": {
-    "prepare": "yarn run prepare:generator && yarn run prepare:packages",
-    "prepare:generator": "yarn run bootstrap:generator && yarn run build:generator && yarn run link:generator",
-    "bootstrap:generator": "lerna bootstrap --scope generator-theia -- --no-optional",
-    "build:generator": "lerna run prepare --scope generator-theia --stream",
-    "link:generator": "lerna exec --scope generator-theia --stream -- yarn link && yarn link generator-theia",
+    "prepare": "yarn run generator:bootstrap && yarn run generator:build && yarn run prepare:packages",
+    "generator:bootstrap": "node scripts/lerna bootstrap --scope generator-theia --hoist -- --no-optional && node scripts/link-generator",
+    "generator:build": "node scripts/lerna run prepare --scope generator-theia --stream",
     "prepare:packages": "yarn run bootstrap && yarn run clean && yarn run clean:rebuild && yarn run build",
-    "bootstrap": "node scripts/generate && node scripts/lerna bootstrap --scope \"@theia/*\" --hoist -- --no-optional",
-    "refresh": "yarn run build:generator && node scripts/lerna clean --scope \"@theia/*\" --yes && yarn run bootstrap",
+    "bootstrap": "node scripts/generate && node scripts/lerna bootstrap --hoist -- --no-optional",
+    "refresh": "yarn run generator:build && node scripts/lerna clean --scope \"@theia/*\" --yes && yarn run bootstrap",
     "clean": "node scripts/lerna run clean --scope \"@theia/*\" --parallel",
     "build": "node scripts/lerna run build --scope \"@theia/*\" --stream",
     "docs": "node scripts/lerna run docs --scope \"@theia/*\" --stream",

packages/core/extension.package.json

@@ -10,7 +10,7 @@
     "@types/bunyan": "^1.8.0",
     "@types/express": "^4.0.36",
     "@types/ws": "^3.0.2",
-    "@types/yargs": "^8.0.1",
+    "@types/yargs": "^8.0.2",
     "body-parser": "^1.17.2",
     "bunyan": "^1.8.10",
     "electron": "^1.6.11",

packages/core/src/common/disposable.ts

@@ -69,3 +69,21 @@ export class DisposableCollection implements Disposable {
     }
 
 }
+
+const disposedMessage = 'Disposed';
+
+export function disposed(): Error {
+    return new Error(disposedMessage);
+}
+
+export function isDisposed(err: Error | undefined): boolean {
+    return !!err && err.message === disposedMessage;
+}
+
+export function checkDisposed(toDispose?: {
+    readonly disposed: boolean
+}): void {
+    if (!!toDispose && toDispose.disposed) {
+        throw disposed();
+    }
+}

packages/extension-manager/.gitignore

@@ -1 +1 @@
-testproject_temp
+test-resources/*_temp

packages/extension-manager/extension.package.json

@@ -5,13 +5,11 @@
   "dependencies": {
     "@theia/core": "^0.1.1",
     "@theia/filesystem": "^0.1.1",
-    "@types/request": "^2.0.0",
-    "generator-theia": "^0.1.1",
-    "request": "^2.81.0",
-    "showdown": "^1.7.2",
+    "@types/sanitize-html": "^1.13.31",
     "@types/showdown": "^1.4.32",
+    "generator-theia": "^0.1.1",
     "sanitize-html": "^1.14.1",
-    "@types/sanitize-html": "^1.13.31"
+    "showdown": "^1.7.2"
   },
   "theiaExtensions": [
     {

packages/extension-manager/src/node/app-project-installer.spec.ts

@@ -6,14 +6,17 @@
  */
 
 import * as path from 'path';
+import * as temp from 'temp';
 import * as fs from 'fs-extra';
 import * as assert from 'assert';
 import { DidStopInstallationParam } from "../common/extension-protocol";
 import extensionNodeTestContainer from './test/extension-node-test-container';
 import { AppProject } from './app-project';
 
+process.on('unhandledRejection', (reason, promise) => { throw reason; });
+
 let appProject: AppProject;
-const appProjectPath = path.resolve(__dirname, '..', '..', 'test-resources', 'testproject_temp');
+let appProjectPath: string;
 
 export async function assertInstallation(expectation: {
     added?: string[],
@@ -61,7 +64,10 @@ describe("AppProjectInstaller", function () {
 
     beforeEach(function () {
         this.timeout(50000);
-        fs.removeSync(appProjectPath);
+        appProjectPath = temp.mkdirSync({
+            dir: path.resolve(__dirname, '..', '..', 'test-resources'),
+            suffix: '_temp'
+        });
         appProject = extensionNodeTestContainer({
             path: appProjectPath,
             target: 'browser',
@@ -70,16 +76,16 @@ describe("AppProjectInstaller", function () {
         }).get(AppProject);
     });
 
-    afterEach(function () {
+    afterEach(async function () {
         this.timeout(50000);
         appProject.dispose();
+        await appProject.onDispose;
         fs.removeSync(appProjectPath);
     });
 
     it("install local", async function () {
         this.timeout(600000);
-
-        fs.writeJSON(path.resolve(appProjectPath, '.yo-rc.json'), {
+        fs.writeJsonSync(path.resolve(appProjectPath, '.yo-rc.json'), {
             "generator-theia": {
                 "localDependencies": {
                     "@theia/core": "../../../core",
@@ -88,7 +94,7 @@ describe("AppProjectInstaller", function () {
                 "node_modulesPath": "../../../../node_modules"
             }
         });
-        fs.writeJSON(path.resolve(appProjectPath, 'theia.package.json'), {
+        fs.writeJsonSync(path.resolve(appProjectPath, 'theia.package.json'), {
             "private": true,
             "dependencies": {
                 "@theia/core": "0.1.1",
@@ -99,7 +105,7 @@ describe("AppProjectInstaller", function () {
             linked: ['@theia/core', '@theia/filesystem']
         });
 
-        fs.writeJSON(path.resolve(appProjectPath, 'theia.package.json'), {
+        fs.writeJsonSync(path.resolve(appProjectPath, 'theia.package.json'), {
             "private": true,
             "dependencies": {
                 "@theia/core": "0.1.1"
@@ -114,8 +120,12 @@ describe("AppProjectInstaller", function () {
     it("install", async function () {
         this.timeout(1800000);
 
-        fs.writeJSON(path.resolve(appProjectPath, '.yo-rc.json'), {});
-        fs.writeJSON(path.resolve(appProjectPath, 'theia.package.json'), {
+        fs.writeJsonSync(path.resolve(appProjectPath, '.yo-rc.json'), {
+            "generator-theia": {
+                "node_modulesPath": "./node_modules"
+            }
+        });
+        fs.writeJsonSync(path.resolve(appProjectPath, 'theia.package.json'), {
             "private": true,
             "dependencies": {
                 "@theia/core": "0.1.1",
@@ -127,7 +137,7 @@ describe("AppProjectInstaller", function () {
             added: ['@theia/core', '@theia/filesystem']
         });
 
-        fs.writeJSON(path.resolve(appProjectPath, 'theia.package.json'), {
+        fs.writeJsonSync(path.resolve(appProjectPath, 'theia.package.json'), {
             "private": true,
             "dependencies": {
                 "@theia/core": "0.1.1"

packages/extension-manager/src/node/app-project.ts

@@ -12,7 +12,7 @@ import { TheiaBrowserGenerator } from 'generator-theia/generators/browser/browse
 import { TheiaElectronGenerator } from 'generator-theia/generators/electron/electron-generator';
 import {
     MaybePromise, Disposable, DisposableCollection, Event, Emitter, ILogger,
-    CancellationTokenSource, CancellationToken, isCancelled
+    CancellationTokenSource, CancellationToken, isCancelled, isDisposed, checkDisposed
 } from "@theia/core";
 import { FileUri, ServerProcess } from "@theia/core/lib/node";
 
@@ -65,11 +65,19 @@ export class AppProject implements Disposable {
         });
         this.toDispose.push(this.onWillInstallEmitter);
         this.toDispose.push(this.onDidInstallEmitter);
+        this.toDispose.push(Disposable.create(() => this.installationTokenSource.cancel()));
     }
 
     dispose(): void {
         this.toDispose.dispose();
     }
+    get onDispose(): Promise<void> {
+        if (this.toDispose.disposed) {
+            return this.installed;
+        }
+        const disposed = new Promise<void>(resolve => this.toDispose.onDispose(resolve));
+        return Promise.all([disposed, this.installed]).then(() => { });
+    }
 
     get onDidChangePackage(): Event<void> {
         return this.onChangePackageEmitter.event;
@@ -92,9 +100,10 @@ export class AppProject implements Disposable {
     }
 
     load(): Promise<ProjectModel> {
-        return this.generator.then(generator => generator.model);
+        return this.getGenerator().then(generator => generator.model);
     }
-    protected get generator(): Promise<CommonAppGenerator> {
+    protected async getGenerator(): Promise<CommonAppGenerator> {
+        await this.ensureProjectConfigExists();
         const generatorConstructor = this.options.target === 'browser' ? TheiaBrowserGenerator : TheiaElectronGenerator;
         const generator = new generatorConstructor([], {
             env: {
@@ -106,6 +115,17 @@ export class AppProject implements Disposable {
         generator.initializing();
         return generator.configuring().then(() => generator);
     }
+    /**
+     * If the project config does not exist yeoman will pick the parent directory with the config as a project directory.
+     */
+    protected async ensureProjectConfigExists(): Promise<void> {
+        const projectConfig = FileUri.create(this.options.path).resolve('.yo-rc.json').toString();
+        try {
+            await this.fileSystem.createFile(projectConfig, {
+                content: '{}'
+            });
+        } catch { /* exist */ }
+    }
 
     async save(model: MaybePromise<ProjectModel>): Promise<void> {
         const resolved = await model;
@@ -148,9 +168,9 @@ export class AppProject implements Disposable {
     protected installed: Promise<void> = Promise.resolve();
     protected installationTokenSource = new CancellationTokenSource();
     async scheduleInstall(params: InstallParams = { force: false }): Promise<void> {
-        if (this.installationTokenSource) {
-            this.installationTokenSource.cancel();
-        }
+        checkDisposed(this.toDispose);
+        this.installationTokenSource.cancel();
+
         this.installationTokenSource = new CancellationTokenSource();
         const token = this.installationTokenSource.token;
         this.installed = this.installed.then(() => this.install(params, token));
@@ -169,6 +189,9 @@ export class AppProject implements Disposable {
                 this.fireDidInstall();
                 this.serverProcess.restart();
             } catch (err) {
+                if (isDisposed(err)) {
+                    throw err;
+                }
                 if (isCancelled(err)) {
                     this.logger.info('The app installation is cancelled');
                     return;
@@ -184,7 +207,9 @@ export class AppProject implements Disposable {
     }
 
     protected async installer(token?: CancellationToken): Promise<AppProjectInstaller> {
-        const generator = await this.generator;
+        checkDisposed(this.toDispose);
+
+        const generator = await this.getGenerator();
         return this.installerFactory({
             generator,
             projectPath: this.options.path,

packages/extension-manager/src/node/node-extension-server.spec.ts

@@ -8,7 +8,7 @@
 import * as path from 'path';
 import * as fs from 'fs-extra';
 import * as assert from 'assert';
-import { ExtensionChange, ExtensionClient, ExtensionServer } from '../common/extension-protocol';
+import { ExtensionClient, ExtensionServer } from '../common/extension-protocol';
 import extensionNodeTestContainer from './test/extension-node-test-container';
 import { AppProject } from './app-project';
 
@@ -20,9 +20,7 @@ const appProjectPath = path.resolve(__dirname, '..', '..', 'test-resources', 'te
 export function waitForDidChange(): Promise<void> {
     return new Promise(resolve => {
         server.setClient(<ExtensionClient>{
-            onDidChange: function (extensionChange: ExtensionChange) {
-                resolve();
-            }
+            onDidChange: extensionChange => resolve()
         });
     });
 }
@@ -41,13 +39,13 @@ describe("NodeExtensionServer", function () {
         });
         server = container.get(ExtensionServer);
         appProject = container.get(AppProject);
-        return waitForDidChange();
     });
 
-    afterEach(function () {
+    afterEach(async function () {
         this.timeout(50000);
         server.dispose();
         appProject.dispose();
+        await appProject.onDispose;
         fs.removeSync(appProjectPath);
     });