debugging

Author: filipesilva

.travis.yml

@@ -1,4 +1,5 @@
-sudo: false
+dist: trusty
+sudo: required
 env:
   - NODE_VERSION=5 SCRIPT=lint
   - NODE_VERSION=5 SCRIPT=test

addon/ng2/tasks/e2e.ts

@@ -8,9 +8,10 @@ module.exports = Task.extend({
     var ui = this.ui;
 
     return new Promise((resolve) => {
-      exec(`npm run e2e -- ${this.project.ngConfig.e2e.protractor.config}`, (err, stdout) => {
+      exec(`npm run e2e -- ${this.project.ngConfig.e2e.protractor.config}`, (err, stdout, stderr) => {
         ui.writeLine(stdout);
         if (err) {
+          ui.writeLine(stderr);
           ui.writeLine(chalk.red('Some end-to-end tests failed, see above.'));
         } else {
           ui.writeLine(chalk.green('All end-to-end tests pass.'));

tests/e2e/e2e_workflow.spec.js

@@ -9,8 +9,6 @@ var conf = require('ember-cli/tests/helpers/conf');
 var sh = require('shelljs');
 var treeKill = require('tree-kill');
 var child_process = require('child_process');
-var Promise = require('ember-cli/lib/ext/promise');
-var execPromise = Promise.denodeify(child_process.exec);
 var ng = require('../helpers/ng');
 var root = path.join(process.cwd(), 'tmp');
 
@@ -61,12 +59,12 @@ describe('Basic end-to-end Workflow', function () {
     expect(path.basename(process.cwd())).to.equal('test-project');
   });
 
-  it('Supports production builds via `ng build --environment=production`', function() {
+  it('Supports production builds via `ng build -prod`', function() {
     this.timeout(420000);
 
-    // Can't user the `ng` helper because somewhere the environment gets
+    // Can't use the `ng` helper because somewhere the environment gets
     // stuck to the first build done
-    sh.exec(`${ngBin} build --environment=production`);
+    sh.exec(`${ngBin} build -prod`);
     expect(existsSync(path.join(process.cwd(), 'dist'))).to.be.equal(true);
     var appBundlePath = path.join(process.cwd(), 'dist', 'app', 'index.js');
     var appBundleContent = fs.readFileSync(appBundlePath, { encoding: 'utf8' });
@@ -117,26 +115,36 @@ describe('Basic end-to-end Workflow', function () {
   });
 
   it('Serve and run e2e tests after initial build', function () {
-    this.timeout(420000);
+    this.timeout(240000);
 
     var ngServePid;
 
     function executor(resolve, reject) {
-      var serveFailedMsg = 'ng serve command failed';
-      var e2eFailedMsg = 'ng serve command failed';
-      var child = child_process.exec('ng serve');
-      ngServePid = child.pid;
-
-      child.stdout.on('data', (data) => {
-        if (/^Build successful/.test(data)) {
-          resolve(execPromise('ng e2e').catch(() => Promise.reject(e2eFailedMsg)));
+      var serveProcess = child_process.exec(`${ngBin} serve`);
+      var startedProtractor = false;
+      ngServePid = serveProcess.pid;
+
+      serveProcess.stdout.on('data', (data) => {
+        if (/Build successful/.test(data) && !startedProtractor) {
+          startedProtractor = true;
+          child_process.exec(`${ngBin} e2e`, (error, stdout, stderr) => {
+            if (error !== null) {
+              reject(stderr)
+            } else {
+              resolve();
+            }
+          });
         } else if (/ failed with:/.test(data)) {
-          reject(serveFailedMsg);
+          reject(data);
         }
       });
 
-      child.stderr.on('data', () => reject(serveFailedMsg));
-      child.on('close', (code) => code === 0 ? resolve() : reject(serveFailedMsg));
+      serveProcess.stderr.on('data', (data) => {
+        reject(data);
+      });
+      serveProcess.on('close', (code) => {
+        code === 0 ? resolve() : reject('ng serve command closed with error')
+      });
     }
 
     return new Promise(executor)
@@ -407,28 +415,38 @@ describe('Basic end-to-end Workflow', function () {
         expect('build failed where it should have succeeded').to.equal('');
       });
   });
-
-  it('Serve and run e2e tests after final build', function () {
-    this.timeout(420000);
+  
+  it('Serve and run e2e tests after all other commands', function () {
+    this.timeout(240000);
 
     var ngServePid;
 
     function executor(resolve, reject) {
-      var serveFailedMsg = 'ng serve command failed';
-      var e2eFailedMsg = 'ng serve command failed';
-      var child = child_process.exec(`${ngBin} serve`);
-      ngServePid = child.pid;
-
-      child.stdout.on('data', (data) => {
-        if (/^Build successful/.test(data)) {
-          resolve(execPromise(`${ngBin} e2e`).catch(() => Promise.reject(e2eFailedMsg)));
+      var serveProcess = child_process.exec(`${ngBin} serve`);
+      var startedProtractor = false;
+      ngServePid = serveProcess.pid;
+
+      serveProcess.stdout.on('data', (data) => {
+        if (/Build successful/.test(data) && !startedProtractor) {
+          startedProtractor = true;
+          child_process.exec(`${ngBin} e2e`, (error, stdout, stderr) => {
+            if (error !== null) {
+              reject(stderr)
+            } else {
+              resolve();
+            }
+          });
         } else if (/ failed with:/.test(data)) {
-          reject(serveFailedMsg);
+          reject(data);
         }
       });
 
-      child.stderr.on('data', () => reject(serveFailedMsg));
-      child.on('close', (code) => code === 0 ? resolve() : reject(serveFailedMsg));
+      serveProcess.stderr.on('data', (data) => {
+        reject(data);
+      });
+      serveProcess.on('close', (code) => {
+        code === 0 ? resolve() : reject('ng serve command closed with error')
+      });
     }
 
     return new Promise(executor)
@@ -440,4 +458,15 @@ describe('Basic end-to-end Workflow', function () {
         throw new Error(msg);
       });
   });
+  
+  it('Still Supports production builds after all other commands`', function() {
+    this.timeout(420000);
+    
+    sh.exec(`${ngBin} build -prod`);
+    expect(existsSync(path.join(process.cwd(), 'dist'))).to.be.equal(true);
+    var appBundlePath = path.join(process.cwd(), 'dist', 'app', 'index.js');
+    var appBundleContent = fs.readFileSync(appBundlePath, { encoding: 'utf8' });
+    expect(appBundleContent).to.include('production:!0');
+    expect(sh.exec('git status --porcelain').output).to.be.equal(undefined);
+  });
 });