fix(test): fix basic test setup

robwormald · robwormald · commit 4054abda3666 · 2016-04-26T15:13:50.000-07:00
diff --git a/gulpfile.js b/gulpfile.js
@@ -1506,6 +1506,10 @@ process.on('beforeExit', function() {
 
 
 var firstTask = true;
+
+
+
+
 gulp.on('task_start', (e) => {
   if (firstTask) {
     firstTask = false;
@@ -1516,3 +1520,33 @@ gulp.on('task_start', (e) => {
 });
 gulp.on('task_stop', (e) => {analytics.buildSuccess('gulp ' + e.task, e.duration * 1000)});
 gulp.on('task_err', (e) => {analytics.buildError('gulp ' + e.task, e.duration * 1000)});
+
+
+
+//new stuff for @angular///
+var gulpWatch = require('gulp-watch');
+var gulpExec = require('gulp-exec');
+var spawn = require('child_process').spawn;
+
+gulp.task('@angular:watch', (cb) => {
+  gulpWatch('modules/@angular/**/*.ts', (changedFile) => {
+    console.log(changedFile)
+    gulp.start('@angular:compile', cb);
+  });
+});
+
+gulp.task('@angular:compile', (cb) => {
+  var tscRun = spawn('tsc', ['-p', 'modules/@angular']);
+
+  tscRun.stdout.on('data', function (data) {
+    console.log('stdout: ' + data);
+  });
+
+  tscRun.stderr.on('data', function (data) {
+    console.log('stderr: ' + data);
+  });
+
+  tscRun.on('exit', function (code) {
+    console.log('child process exited with code ' + code);
+  });
+});
diff --git a/package.json b/package.json
@@ -63,6 +63,7 @@
     "gulp-clang-format": "^1.0.23",
     "gulp-concat": "^2.5.2",
     "gulp-connect": "^2.3.1",
+    "gulp-exec": "^2.1.2",
     "gulp-gzip": "^1.2.0",
     "gulp-insert": "^0.5.0",
     "gulp-load-plugins": "^1.0.0",
@@ -72,8 +73,9 @@
     "gulp-shell": "^0.5.1",
     "gulp-sourcemaps": "^1.6.0",
     "gulp-tslint": "^4.3.4",
-    "gulp-typescript": "^2.10.0",
+    "gulp-typescript": "^2.13.0",
     "gulp-uglify": "^1.2.0",
+    "gulp-watch": "^4.3.5",
     "hash-files": "^1.0.0",
     "jasmine": "^2.4.1",
     "jpm": "1.0.0",
diff --git a/test-main.js b/test-main.js
@@ -12,15 +12,44 @@ System.config({
   defaultJSExtensions: true,
   paths: {
     'benchpress/*': 'dist/js/dev/es5/benchpress/*.js',
-    'angular2/*': 'dist/js/dev/es5/angular2/*.js',
+    '@angular/*': 'dist/@angular/*.js',
     'rxjs/*': 'node_modules/rxjs/*.js'
+  },
+  packages: {
+    '@angular/facade': {
+      main: 'index'
+    },
+    '@angular/core': {
+      main: 'index'
+    },
+    '@angular/compiler': {
+      main: 'index'
+    },
+    '@angular/common': {
+      main: 'index'
+    },
+    '@angular/testing': {
+      main: 'index'
+    },
+    '@angular/router': {
+      main: 'index'
+    },
+    '@angular/upgrade': {
+      main: 'index'
+    },
+    '@angular/platform-browser': {
+      main: 'index'
+    },
+    // '@angular/platform-browser/testing': {
+    //   main: 'index'
+    // }
   }
 });
 
 // Set up the test injector, then import all the specs, execute their `main()`
 // method and kick off Karma (Jasmine).
-System.import('angular2/testing').then(function(testing) {
-  return System.import('angular2/platform/testing/browser').then(function(testing_platform_browser) {
+System.import('@angular/testing').then(function(testing) {
+  return System.import('@angular/testing/browser').then(function(testing_platform_browser) {
     testing.setBaseTestProviders(testing_platform_browser.TEST_BROWSER_PLATFORM_PROVIDERS,
                                  testing_platform_browser.TEST_BROWSER_APPLICATION_PROVIDERS);
   });
@@ -30,6 +59,7 @@ System.import('angular2/testing').then(function(testing) {
     .filter(onlySpecFiles)
     .map(window.file2moduleName)        // Normalize paths to module names.
     .map(function(path) {
+      console.log(path)
       return System.import(path).then(function(module) {
         if (module.hasOwnProperty('main')) {
           module.main();
