Rework

Author: AlexanderMoskovkin

README.md

@@ -57,8 +57,6 @@ TestCafe Live watches files that you pass as the `src` argument and files that a
 
 When the tests are done, browsers stay on the last opened page so you can work with it and explore it by using the browser's developer tools.
 
-See the [VIDEO]().
-
 ### Commands
 
 - ctrl+s - stop current run;

lib/controller.js

@@ -103,6 +103,8 @@ class Controller extends EventEmitter {
             this.restarting = true;
 
             this.stop().then(() => {
+                logger.testsFinished();
+
                 this.restarting = false;
                 this.running    = false;
 

lib/index.js

@@ -1,41 +1,39 @@
 'use strict';
 
-(() => {
-    const CLIArgumentParser = require('testcafe/lib/cli/argument-parser');
-    const exitHook          = require('async-exit-hook');
-    const keypress          = require('keypress');
-    const controller        = require('./controller');
+const CLIArgumentParser = require('testcafe/lib/cli/argument-parser');
+const exitHook          = require('async-exit-hook');
+const keypress          = require('keypress');
+const controller        = require('./controller');
 
-    const tcArguments = new CLIArgumentParser();
+const tcArguments = new CLIArgumentParser();
 
-    exitHook(cb => {
-        controller.exit()
-            .then(cb);
-    });
+exitHook(cb => {
+    controller.exit()
+        .then(cb);
+});
 
-    tcArguments.parse(process.argv)
-        .then(() => controller.init(tcArguments));
+tcArguments.parse(process.argv)
+    .then(() => controller.init(tcArguments));
 
 
-    // Listen commands
-    keypress(process.stdin);
+// Listen commands
+keypress(process.stdin);
 
-    process.stdin.on('keypress', function (ch, key) {
-        if (key && key.ctrl) {
-            if (key.name === 's')
-                controller.stop();
+process.stdin.on('keypress', function (ch, key) {
+    if (key && key.ctrl) {
+        if (key.name === 's')
+            controller.stop();
 
-            else if (key.name === 'r')
-                controller.restart();
+        else if (key.name === 'r')
+            controller.restart();
 
-            else if (key.name === 'c')
-                controller.exit().then(() => process.exit(0));
+        else if (key.name === 'c')
+            controller.exit().then(() => process.exit(0));
 
-            else if (key.name === 'w')
-                controller.toggleWatching();
+        else if (key.name === 'w')
+            controller.toggleWatching();
 
-        }
-    });
+    }
+});
 
-    process.stdin.setRawMode(true);
-})();
+process.stdin.setRawMode(true);

lib/live-run-ctor-factory.js

@@ -1,33 +1,35 @@
 const querystring = require('querystring');
-const BaseLogger  = require('./base');
+const BaseLogger = require('./base');
 
-// HACK: we use own sources for 'log-update-async-hook' to don't use the same
-// module with TestCafe. Otherwise it can lead to log updating mutual influence.
-const logUpdate = require('../log-update-async-hook');
+const logUpdate = require('log-update-async-hook');
+
+// NOTE: clear the cache to don't use the same scope with TestCafe.
+// Otherwise it can lead to log updating mutual influence.
+delete require.cache[require.resolve('log-update-async-hook')];
 
 
 const ansiEscapesCodeRe = /%1B%5B(\d*[A-KSTsun]|\d*%3B\d*H)/g;
 
 module.exports = class UpdatingLogger extends BaseLogger {
-    constructor () {
+    constructor() {
         super();
 
         this.appUpdatedLog = '';
         this.currentReport = '';
-        this.statusMsg     = '';
-        this.writing       = false;
-        this.aborted       = false;
-        this.running       = false;
+        this.statusMsg = '';
+        this.writing = false;
+        this.aborted = false;
+        this.running = false;
     }
 
-    _onStdoutWrite (msg) {
+    _onStdoutWrite(msg) {
         if (this.writing || !this.testingStarted)
             this._write(msg);
         else {
             const escapedMsg = querystring.escape(msg);
 
             if (msg.indexOf('Error: Test run aborted') > -1) {
-                this.aborted       = true;
+                this.aborted = true;
                 this.currentReport = '';
             }
             else if (ansiEscapesCodeRe.test(escapedMsg) || /DEBUGGER PAUSE:|DEBUGGER PAUSE ON FAILED TEST:/.test(msg))
@@ -39,20 +41,20 @@ module.exports = class UpdatingLogger extends BaseLogger {
         }
     }
 
-    _status (msg) {
+    _status(msg) {
         this.statusMsg = msg;
         this._log();
     }
 
-    _log () {
+    _log() {
         this.writing = true;
 
         logUpdate(this._generateMsg());
 
         this.writing = false;
     }
 
-    _generateMsg () {
+    _generateMsg() {
         let separator = '\n-----------------------------\n\n';
 
         let appUpdatedLog = this.appUpdatedLog && this.running ? `
@@ -84,13 +86,13 @@ module.exports = class UpdatingLogger extends BaseLogger {
         return separator + report + appUpdatedLog + status;
     }
 
-    runTests (sourcesChanged) {
+    runTests(sourcesChanged) {
         this.currentReport = '';
 
         super.runTests(sourcesChanged);
     }
 
-    testsFinished () {
+    testsFinished() {
         this.appUpdatedLog = null;
 
         super.testsFinished();