test: fix e2e tests with latest devkit

hansl · hansl · commit 4dcbf389897c · 2018-04-03T02:25:37.000-07:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -41,11 +41,11 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "angular/angular-devkit-architect-builds#779e8fc",
-    "@angular-devkit/core": "angular/angular-devkit-core-builds#779e8fc",
-    "@angular-devkit/schematics": "angular/angular-devkit-schematics-builds#779e8fc",
-    "@schematics/angular": "angular/schematics-angular-builds#779e8fc",
-    "@schematics/update": "angular/schematics-update-builds#779e8fc",
+    "@angular-devkit/architect": "angular/angular-devkit-architect-builds#c11c6ca",
+    "@angular-devkit/core": "angular/angular-devkit-core-builds#c11c6ca",
+    "@angular-devkit/schematics": "angular/angular-devkit-schematics-builds#c11c6ca",
+    "@schematics/angular": "angular/schematics-angular-builds#c11c6ca",
+    "@schematics/update": "angular/schematics-update-builds#c11c6ca",
     "ajv": "^6.1.1",
     "chalk": "~2.2.0",
     "common-tags": "^1.3.1",
@@ -56,9 +56,10 @@
     "node-modules-path": "^1.0.0",
     "opn": "~5.1.0",
     "resolve": "^1.1.7",
-    "rxjs": "^5.5.8",
+    "rxjs": "^6.0.0-rc.0",
     "semver": "^5.3.0",
     "silent-error": "^1.0.0",
+    "symbol-observable": "^1.2.0",
     "yargs-parser": "^9.0.2"
   },
   "devDependencies": {
diff --git a/packages/@angular/cli/models/architect-command.ts b/packages/@angular/cli/models/architect-command.ts
@@ -1,11 +1,14 @@
 import { experimental } from '@angular-devkit/core';
 import { NodeJsSyncHost, createConsoleLogger } from '@angular-devkit/core/node';
-import { Architect, TargetSpecifier } from '@angular-devkit/architect';
+import {
+  Architect, BuilderDescription, BuildEvent,
+  TargetSpecifier
+} from '@angular-devkit/architect';
 import { Command, Option } from './command';
-import { from } from 'rxjs/observable/from';
+import { of } from 'rxjs';
+import { from } from 'rxjs';
 import { concatMap, map, tap, toArray } from 'rxjs/operators';
 import { WorkspaceLoader } from '../models/workspace-loader';
-import { of } from 'rxjs/observable/of';
 const stringUtils = require('ember-cli-string-utils');
 
 
@@ -31,7 +34,7 @@ export abstract class ArchitectCommand extends Command {
 
   target: string | undefined;
 
-  public async initialize(options: any) {
+  public async initialize(options: any): Promise<void> {
     return this._loadWorkspaceAndArchitect().pipe(
       concatMap(() => {
         let targetSpec: TargetSpecifier;
@@ -64,10 +67,11 @@ export abstract class ArchitectCommand extends Command {
         const builderConfig = this._architect.getBuilderConfiguration(targetSpec);
 
         return this._architect.getBuilderDescription(builderConfig).pipe(
-          tap((builderDesc) => this.mapArchitectOptions(builderDesc.schema))
+          tap<BuilderDescription>(builderDesc => { this.mapArchitectOptions(builderDesc.schema); })
         );
       })
-    ).toPromise();
+    ).toPromise()
+      .then(() => {});
   }
 
   public validate(options: any) {
@@ -148,9 +152,10 @@ export abstract class ArchitectCommand extends Command {
 
   protected async runArchitectTarget(targetSpec: TargetSpecifier): Promise<number> {
     const runSingleTarget = (targetSpec: TargetSpecifier) => this._architect.run(
-      this._architect.getBuilderConfiguration(targetSpec), { logger: this._logger }
+      this._architect.getBuilderConfiguration(targetSpec),
+      { logger: this._logger }
     ).pipe(
-      map(buildEvent => buildEvent.success ? 0 : 1)
+      map((buildEvent: BuildEvent) => buildEvent.success ? 0 : 1)
     );
 
     if (!targetSpec.project && this.target) {
@@ -174,9 +179,11 @@ export abstract class ArchitectCommand extends Command {
     const workspaceLoader = new WorkspaceLoader(this._host);
 
     return workspaceLoader.loadWorkspace().pipe(
-      tap(workspace => this._workspace = workspace),
-      concatMap(workspace => new Architect(workspace).loadArchitect()),
-      tap(architect => this._architect = architect),
+      tap((workspace: experimental.workspace.Workspace) => this._workspace = workspace),
+      concatMap((workspace: experimental.workspace.Workspace) => {
+        return new Architect(workspace).loadArchitect();
+      }),
+      tap((architect: Architect) => this._architect = architect),
     );
   }
 }
diff --git a/packages/@angular/cli/models/schematic-command.ts b/packages/@angular/cli/models/schematic-command.ts
@@ -300,7 +300,7 @@ export abstract class SchematicCommand extends Command {
     const workspaceLoader = new WorkspaceLoader(this._host);
 
     workspaceLoader.loadWorkspace().pipe(take(1))
-      .subscribe(workspace => this._workspace = workspace);
+      .subscribe((workspace: experimental.workspace.Workspace) => this._workspace = workspace);
   }
 
   private readDefaults(collectionName: string, schematicName: string, options: any): any {
diff --git a/packages/@angular/cli/models/workspace-loader.ts b/packages/@angular/cli/models/workspace-loader.ts
@@ -7,8 +7,7 @@ import {
   normalize,
   virtualFs
 } from '@angular-devkit/core';
-import { Observable } from 'rxjs/Observable';
-import { of } from 'rxjs/observable/of';
+import { Observable, of } from 'rxjs';
 import { concatMap, tap } from 'rxjs/operators';
 import * as fs from 'fs';
 import { homedir } from 'os';
diff --git a/packages/@angular/cli/package.json b/packages/@angular/cli/package.json
@@ -42,9 +42,10 @@
     "node-modules-path": "^1.0.0",
     "opn": "~5.1.0",
     "resolve": "^1.1.7",
-    "rxjs": "^5.5.8",
+    "rxjs": "^6.0.0-rc.0",
     "semver": "^5.1.0",
     "silent-error": "^1.0.0",
+    "symbol-observable": "^1.2.0",
     "yargs-parser": "^9.0.2"
   },
   "ng-update": {
diff --git a/tests/e2e/tests/basic/scripts-array.ts b/tests/e2e/tests/basic/scripts-array.ts
@@ -40,8 +40,8 @@ export default function () {
         { input: 'src/cstring-script.js' },
         { input: 'src/input-script.js' },
         { input: 'src/lazy-script.js', lazy: true },
-        { input: 'src/pre-rename-script.js', output: 'renamed-script' },
-        { input: 'src/pre-rename-lazy-script.js', output: 'renamed-lazy-script', lazy: true }
+        { input: 'src/pre-rename-script.js', bundleName: 'renamed-script' },
+        { input: 'src/pre-rename-lazy-script.js', bundleName: 'renamed-lazy-script', lazy: true }
       ];
     }))
     .then(() => ng('build', '--extract-css'))
diff --git a/tests/e2e/tests/basic/styles-array.ts b/tests/e2e/tests/basic/styles-array.ts
@@ -22,8 +22,8 @@ export default function () {
         { input: 'src/string-style.css' },
         { input: 'src/input-style.css' },
         { input: 'src/lazy-style.css', lazy: true },
-        { input: 'src/pre-rename-style.css', output: 'renamed-style' },
-        { input: 'src/pre-rename-lazy-style.css', output: 'renamed-lazy-style', lazy: true }
+        { input: 'src/pre-rename-style.css', bundleName: 'renamed-style' },
+        { input: 'src/pre-rename-lazy-style.css', bundleName: 'renamed-lazy-style', lazy: true }
       ];
     }))
     .then(() => ng('build', '--extract-css'))
@@ -32,7 +32,10 @@ export default function () {
     .then(() => expectFileToMatch('dist/test-project/styles.css', '.input-style'))
     .then(() => expectFileToMatch('dist/test-project/lazy-style.css', '.lazy-style'))
     .then(() => expectFileToMatch('dist/test-project/renamed-style.css', '.pre-rename-style'))
-    .then(() => expectFileToMatch('dist/test-project/renamed-lazy-style.css', '.pre-rename-lazy-style'))
+    .then(() => expectFileToMatch(
+      'dist/test-project/renamed-lazy-style.css',
+      '.pre-rename-lazy-style',
+    ))
     // index.html lists the right bundles
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <link rel="stylesheet" href="styles.css">
diff --git a/tests/e2e/tests/build/environment.ts b/tests/e2e/tests/build/environment.ts
@@ -11,8 +11,8 @@ export default function() {
       appArchitect.build.configurations['prod-env'] = {
         fileReplacements: [
           {
-            from: 'src/environments/environment.ts',
-            to: 'src/environments/environment.prod.ts'
+            src: 'src/environments/environment.ts',
+            replaceWith: 'src/environments/environment.prod.ts'
           }
         ],
       };
diff --git a/tests/e2e/tests/build/platform-server.ts b/tests/e2e/tests/build/platform-server.ts
@@ -42,13 +42,13 @@ export default function () {
         options: {
           outputPath: 'dist/test-project-server',
           main: 'src/main.server.ts',
-          tsConfig: 'tsconfig.server.json'
+          tsConfig: 'src/tsconfig.server.json'
         }
       };
     }))
-    .then(() => writeFile('./tsconfig.server.json', `
+    .then(() => writeFile('./src/tsconfig.server.json', `
       {
-        "extends": "../../tsconfig.json",
+        "extends": "../tsconfig.json",
         "compilerOptions": {
           "outDir": "../dist-server",
           "baseUrl": "./",
@@ -60,7 +60,7 @@ export default function () {
           "**/*.spec.ts"
         ],
         "angularCompilerOptions": {
-          "entryModule": "src/app/app.server.module#AppServerModule"
+          "entryModule": "app/app.server.module#AppServerModule"
         }
       }
     `))
diff --git a/tests/e2e/utils/process.ts b/tests/e2e/utils/process.ts
@@ -1,9 +1,10 @@
 import * as child_process from 'child_process';
 import {blue, yellow} from 'chalk';
-import {Subject, Observable} from 'rxjs';
+import {Observable, concat, defer, EMPTY, from} from 'rxjs';
+import {repeat, takeLast} from 'rxjs/operators';
 import {getGlobalVariable} from './env';
 import {rimraf} from './fs';
-import {wait} from './utils';
+import {catchError} from "rxjs/internal/operators";
 const treeKill = require('tree-kill');
 
 
@@ -152,16 +153,17 @@ export function execAndWaitForOutputToMatch(cmd: string, args: string[], match:
     // happened just before the build (e.g. `git clean`).
     // This seems to be due to host file system differences, see
     // https://nodejs.org/docs/latest/api/fs.html#fs_caveats
-    return Observable.fromPromise(_exec({ waitForMatch: match }, cmd, args))
-      .concat(
-        Observable.defer(() =>
-          Observable.fromPromise(waitForAnyProcessOutputToMatch(match, 2500))
-            .repeat(20)
-            .catch(_x => Observable.empty())
-        )
-      )
-      .takeLast(1)
-      .toPromise();
+    return concat(
+      from(
+        _exec({ waitForMatch: match }, cmd, args)
+      ),
+      defer(() => waitForAnyProcessOutputToMatch(match, 2500)).pipe(
+        repeat(20),
+        catchError(() => EMPTY),
+      ),
+    ).pipe(
+      takeLast(1),
+    ).toPromise();
   } else {
     return _exec({ waitForMatch: match }, cmd, args);
   }
diff --git a/tests/e2e_runner.ts b/tests/e2e_runner.ts
@@ -73,30 +73,31 @@ function lastLogger() {
   return logStack[logStack.length - 1];
 }
 
-(console as any).debug = (msg: string, ...args: any[]) => {
-  const logger = lastLogger();
-  if (logger) {
-    logger.debug(msg, { args });
-  }
-};
-console.log = (msg: string, ...args: any[]) => {
-  const logger = lastLogger();
-  if (logger) {
-    logger.info(msg, { args });
-  }
-};
-console.warn = (msg: string, ...args: any[]) => {
-  const logger = lastLogger();
-  if (logger) {
-    logger.warn(msg, { args });
-  }
-};
-console.error = (msg: string, ...args: any[]) => {
-  const logger = lastLogger();
-  if (logger) {
-    logger.error(msg, { args });
-  }
-};
+// This code doesn't work and I have no idea why and no intention to investigate at this point.
+// (console as any).debug = (msg: string, ...args: any[]) => {
+//   const logger = lastLogger();
+//   if (logger) {
+//     logger.debug(msg, { args });
+//   }
+// };
+// console.log = (msg: string, ...args: any[]) => {
+//   const logger = lastLogger();
+//   if (logger) {
+//     logger.info(msg, { args });
+//   }
+// };
+// console.warn = (msg: string, ...args: any[]) => {
+//   const logger = lastLogger();
+//   if (logger) {
+//     logger.warn(msg, { args });
+//   }
+// };
+// console.error = (msg: string, ...args: any[]) => {
+//   const logger = lastLogger();
+//   if (logger) {
+//     logger.error(msg, { args });
+//   }
+// };
 
 const testGlob = argv.glob || 'tests/**/*.ts';
 let currentFileName = null;

Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ export abstract class SchematicCommand extends Command {`
`300`	`300`	`const workspaceLoader = new WorkspaceLoader(this._host);`
`301`	`301`
`302`	`302`	`workspaceLoader.loadWorkspace().pipe(take(1))`
`303`		`- .subscribe(workspace => this._workspace = workspace);`
	`303`	`+ .subscribe((workspace: experimental.workspace.Workspace) => this._workspace = workspace);`
`304`	`304`	`}`
`305`	`305`
`306`	`306`	`private readDefaults(collectionName: string, schematicName: string, options: any): any {`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ export default function() {`
`11`	`11`	`appArchitect.build.configurations['prod-env'] = {`
`12`	`12`	`fileReplacements: [`
`13`	`13`	`{`
`14`		`- from: 'src/environments/environment.ts',`
`15`		`- to: 'src/environments/environment.prod.ts'`
	`14`	`+ src: 'src/environments/environment.ts',`
	`15`	`+ replaceWith: 'src/environments/environment.prod.ts'`
`16`	`16`	`}`
`17`	`17`	`],`
`18`	`18`	`};`