test(node): add task to run a subset of tests on node

`npm run test-node` or `gulp test/node` will now run tests
on node.js. These are also run on TravisCI. Clean up gulp
build.

.travis.yml

@@ -24,4 +24,4 @@ before_script:
 
 script:
   - node_modules/.bin/karma start karma-sauce.conf.js
-
+  - node_modules/.bin/gulp test/node

DEVELOPER.md

@@ -16,6 +16,10 @@ In a separate process, run the WebSockets server:
 
 `npm run ws-server`
 
-Run the tests using Karma:
+Run the browser tests using Karma:
 
 `npm test`
+
+Run the node.js tests:
+
+`npm run test-node`

gulpfile.js

@@ -48,13 +48,19 @@ function generateBrowserScript(inFile, outFile, minify, callback) {
   });
 }
 
-gulp.task('compile', function(){
-  gulp.src([
-    'typings/browser/ambient/node/index.d.ts',
-    'typings/browser/ambient/es6-promise/index.d.ts',
-    'lib/utils.ts',
-    'lib/zone.ts',
-  ]).pipe(typescript({ target: 'es5', "declaration": true })).pipe(gulp.dest('./build/'))
+// This is equivalent to `npm run tsc`.
+gulp.task('compile', function(cb) {
+  var spawn = require('child_process').spawn;
+  spawn('./node_modules/.bin/tsc', {stdio: 'inherit'}).on('close', function(exitCode) {
+    if (exitCode) {
+      var err = new Error('TypeScript compiler failed');
+      // The stack is not useful in this context.
+      err.showStack = false;
+      cb(err);
+    } else {
+      cb();
+    }
+  });
 });
 
 gulp.task('build/zone.js.d.ts', ['compile'], function() {
@@ -121,3 +127,27 @@ gulp.task('build', [
   'build/async-test.js',
   'build/sync-test.js'
 ]);
+
+gulp.task('test/node', ['compile'], function(cb) {
+  var JasmineRunner = require('jasmine');
+  var jrunner = new JasmineRunner();
+
+  var specFiles = ['build/test/node_entry_point.js'];
+
+  jrunner.configureDefaultReporter({showColors: true});
+
+  jrunner.onComplete(function(passed) {
+    if (!passed) {
+      var err = new Error('Jasmine node tests failed.');
+      // The stack is not useful in this context.
+      err.showStack = false;
+      cb(err);
+    } else {
+      cb();
+    }
+  });
+  jrunner.projectBaseDir = __dirname;
+  jrunner.specDir = '';
+  jrunner.addSpecFiles(specFiles);
+  jrunner.execute();
+});

package.json

@@ -20,6 +20,7 @@
     "tsc": "./node_modules/.bin/tsc",
     "tsc:w": "./node_modules/.bin/tsc -w",
     "test": "karma start karma.conf.js",
+    "test-node": "./node_modules/.bin/gulp test/node",
     "serve": "python -m SimpleHTTPServer 8000"
   },
   "repository": {
@@ -39,6 +40,7 @@
     "gulp-tsc": "^1.1.4",
     "gulp-uglify": "^1.2.0",
     "gulp-util": "^3.0.7",
+    "jasmine": "^2.4.1",
     "jasmine-core": "^2.2.0",
     "karma": "^0.13.14",
     "karma-chrome-launcher": "^0.2.1",

test/browser/browser.spec.ts

@@ -0,0 +1,99 @@
+describe('Zone', function () {
+  var rootZone = Zone.current;
+
+  describe('hooks', function () {
+    it('should allow you to override alert/prompt/confirm', function () {
+      var alertSpy = jasmine.createSpy('alert');
+      var promptSpy = jasmine.createSpy('prompt');
+      var confirmSpy = jasmine.createSpy('confirm');
+      var spies = {
+        'alert': alertSpy,
+        'prompt': promptSpy,
+        'confirm': confirmSpy
+      };
+      var myZone = Zone.current.fork({
+        name: 'spy',
+        onInvoke: (parentZoneDelegate: ZoneDelegate, currentZone: Zone, targetZone: Zone,
+                   callback: Function, applyThis: any, applyArgs: any[], source: string): any =>
+        {
+          if (source) {
+            spies[source].apply(null, applyArgs);
+          } else {
+            return parentZoneDelegate.invoke(targetZone, callback, applyThis, applyArgs, source);
+          }
+        }
+      });
+
+      myZone.run(function () {
+        alert('alertMsg');
+        prompt('promptMsg', 'default');
+        confirm('confirmMsg');
+      });
+
+      expect(alertSpy).toHaveBeenCalledWith('alertMsg');
+      expect(promptSpy).toHaveBeenCalledWith('promptMsg', 'default');
+      expect(confirmSpy).toHaveBeenCalledWith('confirmMsg');
+    });
+
+    describe('eventListener hooks', function () {
+      var button;
+      var clickEvent;
+
+      beforeEach(function () {
+        button = document.createElement('button');
+        clickEvent = document.createEvent('Event');
+        clickEvent.initEvent('click', true, true);
+        document.body.appendChild(button);
+      });
+
+      afterEach(function () {
+        document.body.removeChild(button);
+      });
+
+      it('should support addEventListener', function () {
+        var hookSpy = jasmine.createSpy('hook');
+        var eventListenerSpy = jasmine.createSpy('eventListener');
+        var zone = rootZone.fork({
+          name: 'spy',
+          onScheduleTask: (parentZoneDelegate: ZoneDelegate, currentZone: Zone, targetZone: Zone,
+                                task: Task): any => {
+            hookSpy();
+            return parentZoneDelegate.scheduleTask(targetZone, task);
+          }
+        });
+
+        zone.run(function() {
+          button.addEventListener('click', eventListenerSpy);
+        });
+
+        button.dispatchEvent(clickEvent);
+
+        expect(hookSpy).toHaveBeenCalled();
+        expect(eventListenerSpy).toHaveBeenCalled();
+      });
+
+      it('should support removeEventListener', function () {
+        var hookSpy = jasmine.createSpy('hook');
+        var eventListenerSpy = jasmine.createSpy('eventListener');
+        var zone = rootZone.fork({
+          name: 'spy',
+          onCancelTask: (parentZoneDelegate: ZoneDelegate, currentZone: Zone, targetZone: Zone,
+                              task: Task): any => {
+            hookSpy();
+            return parentZoneDelegate.cancelTask(targetZone, task);
+          }
+        });
+
+        zone.run(function() {
+          button.addEventListener('click', eventListenerSpy);
+          button.removeEventListener('click', eventListenerSpy);
+        });
+
+        button.dispatchEvent(clickEvent);
+
+        expect(hookSpy).toHaveBeenCalled();
+        expect(eventListenerSpy).not.toHaveBeenCalled();
+      });
+    });
+  });
+});

test/browser_entry_point.ts

@@ -11,9 +11,8 @@ import '../lib/zone-spec/wtf';
 import './test-env-setup';
 
 // List all tests here:
-import './common/microtasks.spec';
-import './common/zone.spec';
-import './common/util.spec';
+import './common_tests';
+import './browser/browser.spec';
 import './browser/element.spec';
 import './browser/FileReader.spec';
 import './browser/HTMLImports.spec';

test/common/zone.spec.ts

@@ -31,104 +31,8 @@ describe('Zone', function () {
 
       expect(errorSpy).toHaveBeenCalled();
     });
-
-
-    it('should allow you to override alert/prompt/confirm', function () {
-      var alertSpy = jasmine.createSpy('alert');
-      var promptSpy = jasmine.createSpy('prompt');
-      var confirmSpy = jasmine.createSpy('confirm');
-      var spies = {
-        'alert': alertSpy,
-        'prompt': promptSpy,
-        'confirm': confirmSpy
-      };
-      var myZone = Zone.current.fork({
-        name: 'spy',
-        onInvoke: (parentZoneDelegate: ZoneDelegate, currentZone: Zone, targetZone: Zone,
-                   callback: Function, applyThis: any, applyArgs: any[], source: string): any =>
-        {
-          if (source) {
-            spies[source].apply(null, applyArgs);
-          } else {
-            return parentZoneDelegate.invoke(targetZone, callback, applyThis, applyArgs, source);
-          }
-        }
-      });
-
-      myZone.run(function () {
-        alert('alertMsg');
-        prompt('promptMsg', 'default');
-        confirm('confirmMsg');
-      });
-
-      expect(alertSpy).toHaveBeenCalledWith('alertMsg');
-      expect(promptSpy).toHaveBeenCalledWith('promptMsg', 'default');
-      expect(confirmSpy).toHaveBeenCalledWith('confirmMsg');
-    });
-
-    describe('eventListener hooks', function () {
-      var button;
-      var clickEvent;
-
-      beforeEach(function () {
-        button = document.createElement('button');
-        clickEvent = document.createEvent('Event');
-        clickEvent.initEvent('click', true, true);
-        document.body.appendChild(button);
-      });
-
-      afterEach(function () {
-        document.body.removeChild(button);
-      });
-
-      it('should support addEventListener', function () {
-        var hookSpy = jasmine.createSpy('hook');
-        var eventListenerSpy = jasmine.createSpy('eventListener');
-        var zone = rootZone.fork({
-          name: 'spy',
-          onScheduleTask: (parentZoneDelegate: ZoneDelegate, currentZone: Zone, targetZone: Zone,
-                                task: Task): any => {
-            hookSpy();
-            return parentZoneDelegate.scheduleTask(targetZone, task);
-          }
-        });
-
-        zone.run(function() {
-          button.addEventListener('click', eventListenerSpy);
-        });
-
-        button.dispatchEvent(clickEvent);
-
-        expect(hookSpy).toHaveBeenCalled();
-        expect(eventListenerSpy).toHaveBeenCalled();
-      });
-
-      it('should support removeEventListener', function () {
-        var hookSpy = jasmine.createSpy('hook');
-        var eventListenerSpy = jasmine.createSpy('eventListener');
-        var zone = rootZone.fork({
-          name: 'spy',
-          onCancelTask: (parentZoneDelegate: ZoneDelegate, currentZone: Zone, targetZone: Zone,
-                              task: Task): any => {
-            hookSpy();
-            return parentZoneDelegate.cancelTask(targetZone, task);
-          }
-        });
-
-        zone.run(function() {
-          button.addEventListener('click', eventListenerSpy);
-          button.removeEventListener('click', eventListenerSpy);
-        });
-
-        button.dispatchEvent(clickEvent);
-
-        expect(hookSpy).toHaveBeenCalled();
-        expect(eventListenerSpy).not.toHaveBeenCalled();
-      });
-    });
   });
 
-
   it('should allow zones to be run from within another zone', function () {
     var zoneA = Zone.current.fork({ name: 'A' });
     var zoneB = Zone.current.fork({ name: 'B' });

test/common_tests.ts

@@ -0,0 +1,3 @@
+import './common/microtasks.spec';
+import './common/zone.spec';
+import './common/util.spec';

test/node_entry_point.ts

@@ -0,0 +1,11 @@
+// Setup tests for Zone without microtask support
+import '../lib/zone';
+import '../lib/node/node';
+import '../lib/zone-spec/long-stack-trace';
+
+// Setup test environment
+import './test-env-setup';
+
+// List all tests here:
+import './common_tests';
+import './zone-spec/long-stack-trace-zone.spec';