Merged PR 145115: Improve kjhtml

Shahak Yosef · Shahak Yosef · commit 015419bf737e · 2021-02-07T08:48:37.000Z
Fixes two problems:
- Auto watch doesn't re-run tests on file changes
- Closing tests window doesn't close the test process in the command line
diff --git a/gulpfile.js b/gulpfile.js
@@ -12,6 +12,7 @@ var ghPages = require('gulp-gh-pages'),
   moment = require('moment'),
   karma = require('karma'),
   typedoc = require('gulp-typedoc'),
+  watch = require('gulp-watch'),
   webpack = require('webpack'),
   webpackStream = require('webpack-stream'),
   webpackConfig = require('./webpack.config'),
@@ -213,5 +214,21 @@ gulp.task('test:js', 'Run js tests', function (done) {
         captureTimeout: argv.timeout || 60000
     },  function() {
       done();
-  }).start();
+  })
+  .on('browser_register', (browser) => {
+    if (argv.chrome) {
+        browser.socket.on('disconnect', function (reason) {
+          if (reason === "transport close" || reason === "transport error") {
+              done(0);
+              process.exit(0);
+          }
+      });
+    }
+  })
+  .start();
+  if (argv.chrome) {
+    return watch(["src/**/*.ts", "test/**/*.ts"], function () {
+        runSequence('compile:spec');
+    });
+  }
 });
diff --git a/karma.conf.js b/karma.conf.js
@@ -8,7 +8,6 @@ else if (argv.firefox) {
   browserName = 'Firefox'
 }
 const flags = [
-  '--disable-gpu',
   '--disable-extensions',
   '--no-proxy-server',
   '--js-flags="--max_old_space_size=6500"',
@@ -34,7 +33,7 @@ module.exports = function (config) {
       'karma-spec-reporter',
       'karma-phantomjs-launcher',
       'karma-coverage',
-      'karma-jasmine-html-reporter',
+      'karma-jasmine-html-reporter'
     ],
     customLaunchers: {
       'Chrome_headless': {
@@ -49,8 +48,8 @@ module.exports = function (config) {
         { type: 'text-summary' }
       ]
     },
-    logLevel: argv.debug ? config.LOG_DEBUG : config.LOG_INFO,
     retryLimit: 0,
+    logLevel: argv.debug ? config.LOG_DEBUG : config.LOG_INFO,
     client: {
       clearContext: false, // leave Jasmine Spec Runner output visible in browser
       args: argv.logMessages ? ['logMessages'] : []
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "prestart": "cd demo && npm install",
     "test": "gulp test",
     "gulp": "gulp",
-    "testc": "npm test -- --chrome --watch"
+    "tests": "npm test -- --chrome --watch --debug"
   },
   "keywords": [
     "microsoft",
@@ -55,6 +55,7 @@
     "gulp-replace": "^0.5.4",
     "gulp-typedoc": "^2.0.0",
     "gulp-typescript": "^4.0.1",
+    "gulp-watch": "^5.0.1",
     "gulp4-run-sequence": "^1.0.0",
     "http-server": "^0.12.1",
     "ignore-loader": "^0.1.1",
