test: add poll test

Author: filipesilva

.travis.yml

@@ -15,33 +15,36 @@ matrix:
   include:
     - node_js: "6"
       os: linux
-      env: SCRIPT=lint
-    - node_js: "6"
-      os: linux
-      env: SCRIPT=build
-    - node_js: "6"
-      os: linux
-      env: SCRIPT=test
-    - node_js: "6"
-      os: linux
-      env: NODE_SCRIPT="tests/run_e2e.js --glob=tests/build/**"
-    - node_js: "6"
-      os: linux
-      env: NODE_SCRIPT="tests/run_e2e.js --ignore=**/tests/build/**"
-    - node_js: "6"
-      os: linux
-      env: NODE_SCRIPT="tests/run_e2e.js --ng4 --glob=tests/build/**"
-    - node_js: "6"
-      os: linux
-      env: NODE_SCRIPT="tests/run_e2e.js --ng4 --ignore=**/tests/build/**"
+      env: NODE_SCRIPT="tests/run_e2e.js tests/e2e/tests/build/poll.ts"
+    # - node_js: "6"
+    #   os: linux
+    #   env: SCRIPT=lint
+    # - node_js: "6"
+    #   os: linux
+    #   env: SCRIPT=build
+    # - node_js: "6"
+    #   os: linux
+    #   env: SCRIPT=test
+    # - node_js: "6"
+    #   os: linux
+    #   env: NODE_SCRIPT="tests/run_e2e.js --glob=tests/build/**"
+    # - node_js: "6"
+    #   os: linux
+    #   env: NODE_SCRIPT="tests/run_e2e.js --ignore=**/tests/build/**"
+    # - node_js: "6"
+    #   os: linux
+    #   env: NODE_SCRIPT="tests/run_e2e.js --ng4 --glob=tests/build/**"
+    # - node_js: "6"
+    #   os: linux
+    #   env: NODE_SCRIPT="tests/run_e2e.js --ng4 --ignore=**/tests/build/**"
 
     # Optional builds.
-    - node_js: "6"
-      os: linux
-      env: NODE_SCRIPT="tests/run_e2e.js --nightly --ng4"
-    - node_js: "7"
-      os: linux
-      env: NODE_SCRIPT=tests/run_e2e.js
+    # - node_js: "6"
+    #   os: linux
+    #   env: NODE_SCRIPT="tests/run_e2e.js --nightly --ng4"
+    # - node_js: "7"
+    #   os: linux
+    #   env: NODE_SCRIPT=tests/run_e2e.js
 
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DISPLAY=:99.0; fi

packages/@angular/cli/custom-typings.d.ts

@@ -9,6 +9,7 @@ interface IWebpackDevServerConfigurationOptions {
   noInfo?: boolean;
   lazy?: boolean;
   filename?: string;
+  watch?: boolean;
   watchOptions?: {
     aggregateTimeout?: number;
     poll?: number;

packages/@angular/cli/tasks/serve.ts

@@ -19,6 +19,8 @@ export default Task.extend({
   run: function (serveTaskOptions: ServeTaskOptions, rebuildDoneCb: any) {
     const ui = this.ui;
 
+    console.log('### poll', serveTaskOptions.poll)
+
     let webpackCompiler: any;
     const projectConfig = CliConfig.fromProject().config;
     const appConfig = projectConfig.apps[0];

tests/e2e/tests/build/poll.ts

@@ -0,0 +1,26 @@
+import {
+  killAllProcesses,
+  waitForAnyProcessOutputToMatch,
+  silentExecAndWaitForOutputToMatch
+} from '../../utils/process';
+import {appendToFile} from '../../utils/fs';
+import {expectToFail, wait} from '../../utils/utils';
+
+const webpackGoodRegEx = /webpack: Compiled successfully./;
+
+export default function() {
+  return silentExecAndWaitForOutputToMatch('ng', ['serve', '--poll=10000'], webpackGoodRegEx)
+    // Wait before editing a file. Editing too soon seems to trigger a rebuild.
+    .then(() => wait(1000))
+    .then(() => appendToFile('src/main.ts', 'console.log(1);'))
+    .then(() => waitForAnyProcessOutputToMatch(webpackGoodRegEx, 12000))
+    .then(() => appendToFile('src/main.ts', 'console.log(1);'))
+    // No rebuilds should occur for a while
+    .then(() => expectToFail(() => waitForAnyProcessOutputToMatch(webpackGoodRegEx, 6000)))
+    // But a rebuild should happen roughly within the 10 second window.
+    .then(() => waitForAnyProcessOutputToMatch(webpackGoodRegEx, 12000))
+    .then(() => killAllProcesses(), (err: any) => {
+      killAllProcesses();
+      throw err;
+    });
+}

tests/e2e/utils/process.ts

@@ -53,7 +53,7 @@ function _exec(options: ExecOptions, cmd: string, args: string[]): Promise<Proce
     data.toString('utf-8')
       .split(/[\n\r]+/)
       .filter(line => line !== '')
-      .forEach(line => console.log('  ' + line));
+      .forEach(line => console.log((new Date()).toUTCString() + '  ' + line));
   });
   childProcess.stderr.on('data', (data: Buffer) => {
     stderr += data.toString('utf-8');