From 49f5c0435adc48f0da029b89168820a94eb30760 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Tue, 14 Feb 2017 16:12:53 +0000
Subject: [PATCH] test: auto-add --no-progress to ng helper

---
 tests/e2e/tests/i18n/extract-default.ts |  2 +-
 tests/e2e/tests/i18n/extract-output.ts  |  2 +-
 tests/e2e/tests/i18n/extract-xmb.ts     |  2 +-
 tests/e2e/tests/misc/minimal-config.ts  |  4 ++--
 tests/e2e/tests/test/e2e.ts             | 12 ++++++------
 tests/e2e/utils/process.ts              |  3 ++-
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/tests/e2e/tests/i18n/extract-default.ts b/tests/e2e/tests/i18n/extract-default.ts
index 066711600685..fc35236952a2 100644
--- a/tests/e2e/tests/i18n/extract-default.ts
+++ b/tests/e2e/tests/i18n/extract-default.ts
@@ -11,7 +11,7 @@ export default function() {
     .then(() => writeFile(
       join('src/app/i18n-test', 'i18n-test.component.html'),
       '<p i18n>Hello world</p>'))
-    .then(() => ng('xi18n', '--no-progress'))
+    .then(() => ng('xi18n'))
     .then(() => expectFileToExist(join('src', 'messages.xlf')))
     .then(() => expectFileToMatch(join('src', 'messages.xlf'), /Hello world/));
 }
diff --git a/tests/e2e/tests/i18n/extract-output.ts b/tests/e2e/tests/i18n/extract-output.ts
index 87677b5a6864..df11befed240 100644
--- a/tests/e2e/tests/i18n/extract-output.ts
+++ b/tests/e2e/tests/i18n/extract-output.ts
@@ -11,7 +11,7 @@ export default function() {
     .then(() => writeFile(
       join('src/app/i18n-test', 'i18n-test.component.html'),
       '<p i18n>Hello world</p>'))
-    .then(() => ng('xi18n', '--no-progress', '--output-path', 'src/locale'))
+    .then(() => ng('xi18n', '--output-path', 'src/locale'))
     .then(() => expectFileToExist(join('src', 'locale', 'messages.xlf')))
     .then(() => expectFileToMatch(join('src', 'locale', 'messages.xlf'), /Hello world/));
 }
diff --git a/tests/e2e/tests/i18n/extract-xmb.ts b/tests/e2e/tests/i18n/extract-xmb.ts
index 04adaab6549a..368a4e7edaef 100644
--- a/tests/e2e/tests/i18n/extract-xmb.ts
+++ b/tests/e2e/tests/i18n/extract-xmb.ts
@@ -11,7 +11,7 @@ export default function() {
     .then(() => writeFile(
       join('src/app/i18n-test', 'i18n-test.component.html'),
       '<p i18n>Hello world</p>'))
-    .then(() => ng('xi18n', '--no-progress', '--i18n-format', 'xmb'))
+    .then(() => ng('xi18n', '--i18n-format', 'xmb'))
     .then(() => expectFileToExist(join('src', 'messages.xmb')))
     .then(() => expectFileToMatch(join('src', 'messages.xmb'), /Hello world/));
 }
diff --git a/tests/e2e/tests/misc/minimal-config.ts b/tests/e2e/tests/misc/minimal-config.ts
index 420cbf48b94f..5e94c7545619 100644
--- a/tests/e2e/tests/misc/minimal-config.ts
+++ b/tests/e2e/tests/misc/minimal-config.ts
@@ -15,7 +15,7 @@ export default function () {
       }],
       e2e: { protractor: { config: './protractor.conf.js' } }
     })))
-    .then(() => ng('e2e', '--no-progress'))
+    .then(() => ng('e2e'))
     .then(() => writeMultipleFiles({
       './src/script.js': `
         document.querySelector('app-root').innerHTML = '<h1>app works!</h1>';
@@ -40,5 +40,5 @@ export default function () {
         e2e: { protractor: { config: './protractor.conf.js' } }
       }),
     }))
-    .then(() => ng('e2e', '--no-progress'));
+    .then(() => ng('e2e'));
 }
diff --git a/tests/e2e/tests/test/e2e.ts b/tests/e2e/tests/test/e2e.ts
index a40eb25fe83e..772f7d587b30 100644
--- a/tests/e2e/tests/test/e2e.ts
+++ b/tests/e2e/tests/test/e2e.ts
@@ -21,21 +21,21 @@ export default function () {
     // Should fail without serving
     .then(() => expectToFail(() => ng('e2e', '--no-serve')))
     // These should work.
-    .then(() => ng('e2e', '--no-progress'))
-    .then(() => ng('e2e', '--prod', '--no-progress'))
+    .then(() => ng('e2e'))
+    .then(() => ng('e2e', '--prod'))
     // Should use port in baseUrl
-    .then(() => ng('e2e', '--port', '4400', '--no-progress'))
+    .then(() => ng('e2e', '--port', '4400'))
     // Should accept different config file
     .then(() => moveFile('./protractor.conf.js', './renamed-protractor.conf.js'))
-    .then(() => ng('e2e', '--config', './renamed-protractor.conf.js', '--no-progress'))
+    .then(() => ng('e2e', '--config', './renamed-protractor.conf.js'))
     .then(() => moveFile('./renamed-protractor.conf.js', './protractor.conf.js'))
     // Should accept different multiple spec files
     .then(() => moveFile('./e2e/app.e2e-spec.ts', './e2e/renamed-app.e2e-spec.ts'))
     .then(() => copyFile('./e2e/renamed-app.e2e-spec.ts', './e2e/another-app.e2e-spec.ts'))
     .then(() => ng('e2e', '--specs', './e2e/renamed-app.e2e-spec.ts',
-      '--specs', './e2e/another-app.e2e-spec.ts', '--no-progress'))
+      '--specs', './e2e/another-app.e2e-spec.ts'))
     // Should start up Element Explorer
-    .then(() => execAndWaitForOutputToMatch('ng', ['e2e', '--element-explorer', '--no-progress'],
+    .then(() => execAndWaitForOutputToMatch('ng', ['e2e', '--element-explorer'],
       /Element Explorer/))
     .then(() => killAllProcesses(), (err: any) => {
       killAllProcesses();
diff --git a/tests/e2e/utils/process.ts b/tests/e2e/utils/process.ts
index f2110856419a..bec5a7d97011 100644
--- a/tests/e2e/utils/process.ts
+++ b/tests/e2e/utils/process.ts
@@ -135,7 +135,8 @@ export function silentExecAndWaitForOutputToMatch(cmd: string, args: string[], m
 }
 
 export function ng(...args: string[]) {
-  if (args[0] == 'build' || args[0] == 'serve' || args[0] == 'test') {
+  // 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) {
     return silentNg(...args, '--no-progress');
   } else {
     return _exec({}, 'ng', args);