e2e

Author: hansl

.travis.yml

@@ -24,13 +24,6 @@ env:
   - BROWSER_STACK_ACCESS_KEY=BWCd4SynLzdDcv8xtzsB
   - ARCH=linux-x64
   - BROWSER_PROVIDER_READY_FILE=/tmp/angular-material2-build/readyfile
-  # Token for tsd to increase github rate limit
-  # See https://github.com/DefinitelyTyped/tsd#tsdrc
-  # This does not use http://docs.travis-ci.com/user/environment-variables/#Secure-Variables
-  # because those are not visible for pull requests, and those should also be reliable.
-  # This SSO token belongs to github account angular-github-ratelimit-token which has no access
-  # (password is in Valentine)
-  - TSDRC='{"token":"ef474500309daea53d5991b3079159a29520a40b"}'
   # GITHUB_TOKEN_ANGULAR
   - secure: "fq/U7VDMWO8O8SnAQkdbkoSe2X92PVqg4d044HmRYVmcf6YbO48+xeGJ8yOk0pCBwl3ISO4Q2ot0x546kxfiYBuHkZetlngZxZCtQiFT9kyId8ZKcYdXaIW9OVdw3Gh3tQyUwDucfkVhqcs52D6NZjyE2aWZ4/d1V4kWRO/LMgo="
   matrix:

gulpfile.js

@@ -91,13 +91,26 @@ function createExecTask(packageName, executable, args) {
   }
   return function(done) {
     resolveBin(packageName, { executable: executable }, function (err, binPath) {
-      child_process.exec(`${binPath} ${args.join(' ')}`, function (error) {
-        if (error) {
-          console.error(error);
-          throw error;
-        } else {
-          done();
+      if (err) {
+        console.error(err);
+        throw err;
+      }
+
+      const process = child_process.spawn(binPath, args);
+
+      process.stdout.on('data', (data) => {
+        console.log(`stdout: ${data}`);
+      });
+
+      process.stderr.on('data', (data) => {
+        console.log(`stderr: ${data}`);
+      });
+
+      process.on('close', (code) => {
+        if (code != 0) {
+          throw new Error('Process failed with code ' + code);
         }
+        done();
       });
     });
   }
@@ -141,7 +154,7 @@ gulp.task(':build:components:ngc', ['build:components'], createExecTask(
  */
 gulp.task(':build:vendor', function() {
   const npmVendorFiles = [
-    'core-js/client', 'zone.js/dist', 'hammerjs', 'systemjs/dist', 'rxjs', '@angular', 'hammerjs'
+    '@angular', 'core-js/client', 'hammerjs', 'rxjs', 'systemjs/dist', 'zone.js/dist'
   ];
 
   return gulpMerge(
@@ -290,8 +303,9 @@ gulp.task('serve:e2eapp', ['build:e2eapp'], function(done) {
 
   stopE2eServer = function() {
     stream.emit('kill');
-    done();
   };
+
+  return stream;
 });
 
 gulp.task(':serve:e2eapp:stop', function() {
@@ -323,22 +337,16 @@ gulp.task(':test:protractor', createExecTask(
   'protractor', [path.join(__dirname, 'test/protractor.conf.js')]
 ));
 
-gulp.task(':test:protractor:and-stop', function(done) {
-  gulpRunSequence(
-    ':test:protractor',
-    ':serve:e2eapp:stop',
-    done
-  );
-});
-
 gulp.task(':e2e:done', function() {
   process.exit(0);
 });
 
 gulp.task('e2e', function(done) {
   gulpRunSequence(
     ':test:protractor:setup',
-    ['serve:e2eapp', ':test:protractor:and-stop'],
+    'serve:e2eapp',
+    ':test:protractor',
+    ':serve:e2eapp:stop',
     ':e2e:done',
     done
   );
@@ -363,7 +371,9 @@ gulp.task('build:release', function(done) {
  * Continuous Integration.
  */
 gulp.task('ci:lint', ['lint', 'stylelint']);
-gulp.task('ci:test', ['test:single-run']);
+gulp.task('ci:test', ['test:single-run'], function() {
+  process.exit(0);
+});
 gulp.task('ci:e2e', ['e2e']);
 gulp.task('ci:extract-metadata', [':build:components:ngc']);
 gulp.task('ci:forbidden-identifiers', function() {

test/protractor.conf.js

@@ -13,14 +13,13 @@ const config = {
   useAllAngular2AppRoots: true,
   specs: [ path.join(__dirname, '../e2e/**/*.e2e.ts') ],
   baseUrl: E2E_BASE_URL,
-  allScriptsTimeout: 30000,
-  getPageTimeout: 30000,
+  allScriptsTimeout: 120000,
+  getPageTimeout: 120000,
   jasmineNodeOpts: {
-    defaultTimeoutInterval: 60000,
+    defaultTimeoutInterval: 120000,
   }
 };
 
-
 if (process.env['TRAVIS']) {
   const key = require('../scripts/sauce/sauce_config');
   config.sauceUser = process.env['SAUCE_USERNAME'];