Merge pull request #535 from Tyriar/534_phantomjs

[mirror_xterm.js.git] / gulpfile.js

diff --git a/gulpfile.js b/gulpfile.js
index 144b8831682520d540e63da17ee635d610483d0c..8aa86b115979fd9dc81f72009e243e6baf33807e 100644 (file)
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -3,11 +3,12 @@ const buffer = require('vinyl-buffer');
 const fs = require('fs-extra');
 const gulp = require('gulp');
 const merge = require('merge-stream');
+const mocha = require('gulp-mocha');
+const mochaPhantomJs = require('gulp-mocha-phantomjs');
 const sorcery = require('sorcery');
 const source = require('vinyl-source-stream');
 const sourcemaps = require('gulp-sourcemaps');
 const ts = require('gulp-typescript');
-const tsify = require('tsify');
 
 
 let buildDir = process.env.BUILD_DIR || 'build';
@@ -53,7 +54,6 @@ gulp.task('browserify', ['tsc'], function() {
     packageCache: {}
   };
   let bundleStream = browserify(browserifyOptions)
-        .plugin(tsify)
         .bundle()
         .pipe(source('xterm.js'))
         .pipe(buffer())
@@ -70,6 +70,15 @@ gulp.task('browserify', ['tsc'], function() {
   return merge(bundleStream, copyAddons, copyStylesheets);
 });
 
+gulp.task('test-mocha', function () {
+  return gulp.src(['lib/*test.js', 'lib/**/*test.js'], {read: false})
+      .pipe(mocha())
+});
+
+gulp.task('test-mocha-phantomjs', function () {
+  return gulp.src('test-harness.html')
+      .pipe(mochaPhantomJs());
+});
 
 /**
  * Use `sorcery` to resolve the source map chain and point back to the TypeScript files.
@@ -83,5 +92,5 @@ gulp.task('sorcery', ['browserify'], function () {
 });
 
 gulp.task('build', ['sorcery']);
-
+gulp.task('test', ['test-mocha', 'test-mocha-phantomjs']);
 gulp.task('default', ['build']);