test: e2e exec() now returns an object {stdout,stderr}

Before it was only a string with stdout.

Author: hansl

tests/e2e/tests/commands/config/get.ts

@@ -7,19 +7,19 @@ export default function() {
     .then(() => process.chdir('/'))
     .then(() => expectToFail(() => ng('get', 'defaults.component.inlineStyle')))
     .then(() => ng('get', '--global', 'defaults.component.inlineStyle'))
-    .then(output => {
-      if (!output.match(/false\n?/)) {
-        throw new Error(`Expected "false", received "${JSON.stringify(output)}".`);
+    .then(({ stdout }) => {
+      if (!stdout.match(/false\n?/)) {
+        throw new Error(`Expected "false", received "${JSON.stringify(stdout)}".`);
       }
     })
     .then(() => expectToFail(() => {
       return ng('set', '--global', 'defaults.component.inlineStyle', 'INVALID_BOOLEAN');
     }))
     .then(() => ng('set', '--global', 'defaults.component.inlineStyle', 'true'))
     .then(() => ng('get', '--global', 'defaults.component.inlineStyle'))
-    .then(output => {
-      if (!output.match(/true\n?/)) {
-        throw new Error(`Expected "true", received "${JSON.stringify(output)}".`);
+    .then(({ stdout }) => {
+      if (!stdout.match(/true\n?/)) {
+        throw new Error(`Expected "true", received "${JSON.stringify(stdout)}".`);
       }
     })
     .then(() => ng('set', '--global', 'defaults.component.inlineStyle', 'false'));

tests/e2e/tests/commands/new/check-yarn.ts

@@ -8,9 +8,9 @@ export default function() {
     .then(() => process.chdir(getGlobalVariable('tmp-root')))
     .then(() =>  ng('set', '--global', 'packageManager=default'))
     .then(() =>  ng('new', 'foo'))
-    .then((stdout) => {
+    .then(({ stdout }) => {
       // Assuming yarn is installed and checking for message with yarn.
-      if (!stdout.toString().match(yarnRegEx)) {
+      if (!stdout.match(yarnRegEx)) {
         throw new Error('Should display message to use yarn packageManager');
       }
     });

tests/e2e/tests/lint/lint-no-config-section.ts

@@ -5,15 +5,15 @@ export default function () {
   return Promise.resolve()
     .then(() => ng('set', 'lint', '[]'))
     .then(() => ng('lint'))
-    .then((output) => {
-      if (!output.match(/No lint config\(s\) found\./)) {
+    .then(({ stdout }) => {
+      if (!stdout.match(/No lint config\(s\) found\./)) {
         throw new Error(oneLine`
           Expected to match "No lint configs found."
-          in ${output}.
+          in ${stdout}.
         `);
       }
 
-      return output;
+      return stdout;
     })
     .then((output) => {
       if (!output.match(/If this is not intended, run "ng update"\./)) {

tests/e2e/tests/lint/lint-with-exclude.ts

@@ -9,11 +9,11 @@ export default function () {
     .then(() => ng('set', 'lint.0.exclude', '"**/foo.ts"'))
     .then(() => writeFile(fileName, 'const foo = "";\n'))
     .then(() => ng('lint'))
-    .then((output) => {
-      if (!output.match(/All files pass linting\./)) {
+    .then(({ stdout }) => {
+      if (!stdout.match(/All files pass linting\./)) {
         throw new Error(oneLine`
           Expected to match "All files pass linting."
-          in ${output}.
+          in ${stdout}.
         `);
       }
     });

tests/e2e/tests/lint/lint-with-force.ts

@@ -8,12 +8,12 @@ export default function () {
   return Promise.resolve()
     .then(() => writeFile(fileName, 'const foo = "";\n'))
     .then(() => ng('lint', '--force'))
-    .then((output) => {
-      if (!output.match(/" should be '/)) {
-        throw new Error(`Expected to match "" should be '" in ${output}.`);
+    .then(({ stdout }) => {
+      if (!stdout.match(/" should be '/)) {
+        throw new Error(`Expected to match "" should be '" in ${stdout}.`);
       }
 
-      return output;
+      return stdout;
     })
     .then((output) => {
       if (!output.match(/Lint errors found in the listed files\./)) {

tests/e2e/tests/lint/lint-with-format.ts

@@ -8,11 +8,11 @@ export default function () {
   return Promise.resolve()
     .then(() => writeFile(fileName, 'const foo = "";\n'))
     .then(() => ng('lint', '--format=stylish', '--force'))
-    .then((output) => {
-      if (!output.match(/1:13  quotemark  " should be '/)) {
+    .then(({ stdout }) => {
+      if (!stdout.match(/1:13  quotemark  " should be '/)) {
         throw new Error(oneLine`
           Expected to match "1:13  quotemark  " should be '"
-          in ${output}.
+          in ${stdout}.
         `);
       }
     });

tests/e2e/tests/lint/lint.ts

@@ -3,11 +3,11 @@ import { oneLine } from 'common-tags';
 
 export default function () {
   return ng('lint')
-    .then((output) => {
-      if (!output.match(/All files pass linting\./)) {
+    .then(({ stdout }) => {
+      if (!stdout.match(/All files pass linting\./)) {
         throw new Error(oneLine`
           Expected to match "All files pass linting."
-          in ${output}.
+          in ${stdout}.
         `);
       }
     });

tests/e2e/utils/git.ts

@@ -8,7 +8,7 @@ export function gitClean() {
     .then(() => {
       // Checkout missing files
       return silentGit('status', '--porcelain')
-        .then(output => output
+        .then(({ stdout }) => stdout
           .split(/[\n\r]+/g)
           .filter(line => line.match(/^ D/))
           .map(line => line.replace(/^\s*\S+\s+/, '')))
@@ -19,8 +19,8 @@ export function gitClean() {
 
 export function expectGitToBeClean() {
   return git('status', '--porcelain')
-    .then(output => {
-      if (output != '') {
+    .then(({ stdout }) => {
+      if (stdout != '') {
         throw new Error('Git repo is not clean...');
       }
     });
@@ -29,8 +29,8 @@ export function expectGitToBeClean() {
 export function gitCommit(message: string) {
   return git('add', '-A')
     .then(() => git('status', '--porcelain'))
-    .then(output => {
-      if (output != '') {
+    .then(({ stdout }) => {
+      if (stdout != '') {
         return git('commit', '-am', message);
       }
     });

tests/e2e/utils/process.ts

@@ -1,5 +1,7 @@
 import * as child_process from 'child_process';
 import {blue, yellow} from 'chalk';
+import {getGlobalVariable} from './env';
+import {rimraf, writeFile} from './fs';
 const treeKill = require('tree-kill');
 
 
@@ -75,7 +77,7 @@ function _exec(options: ExecOptions, cmd: string, args: string[]): Promise<Proce
       _processes = _processes.filter(p => p !== childProcess);
 
       if (!error) {
-        resolve(stdout);
+        resolve({ stdout });
       } else {
         err.message += `${error}...\n\nSTDOUT:\n${stdout}\n`;
         reject(err);
@@ -134,9 +136,26 @@ export function silentExecAndWaitForOutputToMatch(cmd: string, args: string[], m
   return _exec({ silent: true, waitForMatch: match }, cmd, args);
 }
 
+
+let npmInstalledEject = false;
 export function ng(...args: string[]) {
   // Auto-add --no-progress to commands that build the app, otherwise we get thousands of lines.
   if (['build', 'serve', 'test', 'e2e', 'xi18n'].indexOf(args[0]) != -1) {
+    // If we have the --eject, use webpack for the test.
+    const argv = getGlobalVariable('argv');
+    if (args[0] == 'build' && argv.eject) {
+      return silentNg('eject', ...args.slice(1), '--force')
+        .then(() => {
+          if (!npmInstalledEject) {
+            npmInstalledEject = true;
+            // We need to run npm install on the first eject.
+            return silentNpm('install');
+          }
+        })
+        .then(() => rimraf('dist'))
+        .then(() => _exec({silent: true}, 'node_modules/.bin/webpack', []));
+    }
+
     return silentNg(...args, '--no-progress');
   } else {
     return _exec({}, 'ng', args);