Update dependencies and change to gulp-istanbul for coverage

.travis.yml

@@ -13,11 +13,11 @@ before_script:
   - chmod a+w tests.db
 script:
   - ./src/api/vendor/phpunit/phpunit/phpunit -c test/api/phpunit.xml
-  - gulp test-app && gulp coverage
+  - gulp coverage
 after_success:
   - echo -e "<?php\n  print phpversion();" > version.php
   - curl "https://raw.githubusercontent.com/andreafabrizi/Dropbox-Uploader/master/dropbox_uploader.sh" -o dropbox_uploader.sh
   - chmod +x dropbox_uploader.sh
   - ./dropbox_uploader.sh -f /dev/null upload api-coverage/ coverage-$(php version.php)/
-  - ./dropbox_uploader.sh -f /dev/null upload coverage.html coverage-$(php version.php)/
+  - ./dropbox_uploader.sh -f /dev/null upload coverage/ coverage-$(php version.php)/
 

gulpfile.js

@@ -8,7 +8,7 @@ let gulp = require('gulp'),
     SystemBuilder = require('systemjs-builder'),
 
     mocha = require('gulp-mocha'),
-    coverage = require('gulp-coverage'),
+    coverage = require('gulp-istanbul'),
     phpunit = require('gulp-phpunit'),
 
     concat = require('gulp-concat'),
@@ -33,7 +33,7 @@ let gulp = require('gulp'),
         chartist: 'node_modules/chartist/dist/scss',
         normalize: require('node-normalize-scss').includePaths,
 
-        tests_app: 'test/app/**/*.spec.js',
+        tests_app: 'test/app/**/*.spec.ts',
         tests_api: 'test/api/**/*.php',
 
         ts: 'src/app/**/*.ts',
@@ -59,7 +59,8 @@ gulp.task('clean', () => {
         '.coverrun',
         '.coverdata',
         'api-coverage',
-        'coverage.html',
+        'coverage',
+        'temp',
         'src/api/vendor/'
     ]);
 });
@@ -167,24 +168,43 @@ gulp.task('api', () => {
 
 gulp.task('test', ['test-app', 'test-api']);
 
-gulp.task('test-app', ['tsc'], () => {
-    return;// gulp.src(paths.tests_app)
+gulp.task('test-app', () => {
+    return; // gulp.src(paths.tests_app)
         // .pipe(mocha({
-        //     require: ['./test/app/mocks.js']
+        //     require: [
+        //         'ts-node/register',
+        //         'core-js/es7/reflect',
+        //         './test/app/mocks.js'
+        //     ]
         // }));
 });
 
-gulp.task('coverage', ['tsc'], () => {
-    return;// gulp.src(paths.tests_app)
-        // .pipe(coverage.instrument({
-        //     pattern: ['build/**/*.js']
-        // }))
+gulp.task('coverage-tsc-app', () => {
+    return gulp.src(paths.ts)
+        .pipe(tsProject())
+        .pipe(gulp.dest('temp/src/app/'));
+});
+
+gulp.task('coverage-tsc-tests', ['coverage-tsc-app'], () => {
+    return gulp.src(paths.tests_app)
+        .pipe(tsProject())
+        .pipe(gulp.dest('temp/test/app/'));
+});
+
+gulp.task('coverage-prep', ['coverage-tsc-tests'], () => {
+    return gulp.src('temp/src/**/*.js')
+        .pipe(coverage())
+        .pipe(coverage.hookRequire());
+});
+
+gulp.task('coverage', /*['coverage-prep'],*/ () => {
+    return; // gulp.src('temp/**/*.spec.js')
         // .pipe(mocha({
-        //     require: ['./test/app/mocks.js']
+        //     require: [
+        //         './test/app/mocks.js'
+        //     ]
         // }))
-        // .pipe(coverage.gather())
-        // .pipe(coverage.format())
-        // .pipe(gulp.dest('./'));
+        // .pipe(coverage.writeReports());
 });
 
 gulp.task('api-test-db', () => {

package.json

@@ -27,16 +27,18 @@
   },
   "homepage": "https://github.com/kiswa/TaskBoard#readme",
   "devDependencies": {
-    "@angular/common": "2.4.3",
-    "@angular/compiler": "2.4.3",
-    "@angular/core": "2.4.3",
-    "@angular/forms": "2.4.3",
-    "@angular/http": "2.4.3",
-    "@angular/platform-browser": "2.4.3",
-    "@angular/platform-browser-dynamic": "2.4.3",
-    "@angular/router": "3.4.3",
+    "@angular/common": "2.4.4",
+    "@angular/compiler": "2.4.4",
+    "@angular/core": "2.4.4",
+    "@angular/forms": "2.4.4",
+    "@angular/http": "2.4.4",
+    "@angular/platform-browser": "2.4.4",
+    "@angular/platform-browser-dynamic": "2.4.4",
+    "@angular/router": "3.4.4",
+    "@types/chai": "^3.4.34",
     "@types/chartist": "^0.9.34",
     "@types/core-js": "^0.9.35",
+    "@types/mocha": "^2.2.38",
     "bourbon": "^4.2.7",
     "bourbon-neat": "^1.8.0",
     "chai": "^3.5.0",
@@ -51,30 +53,31 @@
     "gulp-chmod": "^2.0.0",
     "gulp-composer": "^0.4.0",
     "gulp-concat": "^2.6.1",
-    "gulp-coverage": "^0.3.38",
     "gulp-cssimport": "^5.0.0",
     "gulp-cssnano": "^2.1.2",
     "gulp-imagemin": "^3.1.1",
+    "gulp-istanbul": "^1.1.1",
     "gulp-mocha": "^3.0.1",
-    "gulp-phpunit": "^0.21.4",
+    "gulp-phpunit": "^0.21.9",
     "gulp-sass": "^3.1.0",
     "gulp-scss-lint": "^0.4.0",
     "gulp-tslint": "^7.0.1",
     "gulp-typescript": "^3.1.4",
-    "gulp-uglify": "^2.0.0",
+    "gulp-uglify": "^2.0.1",
     "gulp-util": "^3.0.8",
     "merge-stream": "^1.0.1",
     "mock-browser": "^0.92.12",
-    "ng2-dragula": "^1.2.2",
+    "ng2-dragula": "^1.3.0",
     "node-normalize-scss": "^1.4.0",
     "reflect-metadata": "^0.1.9",
     "rxjs": "5.0.3",
     "scss-base": "^1.2.3",
-    "systemjs": "0.19.42",
-    "systemjs-builder": "0.15.34",
+    "systemjs": "0.20.0",
+    "systemjs-builder": "0.16.0",
     "touch": "^1.0.0",
+    "ts-node": "^2.0.0",
     "tslint": "^4.3.1",
     "typescript": "^2.1.5",
-    "zone.js": "^0.7.5"
+    "zone.js": "^0.7.6"
   }
 }