Merge pull request #3 from AlexanderMoskovkin/rework-merge-1

Small logging fixes

Author: AlexanderMoskovkin

README.md

@@ -152,7 +152,7 @@ fixture `Check logged user`
     });
 
 test('My test with logged user', async t => {
-    // perform any action here as a logger user
+    // perform any action here as a logged user
 });
 ```
 

lib/controller.js

@@ -28,7 +28,8 @@ class Controller extends EventEmitter {
         this.testRunner.on(this.testRunner.TEST_RUN_STARTED, () => logger.testsStarted());
 
         this.testRunner.on(this.testRunner.TEST_RUN_DONE_EVENT, e => {
-            logger.testsFinished();
+            if (!this.restarting)
+                logger.testsFinished();
 
             this.running = false;
 

lib/index.js

@@ -32,7 +32,6 @@ process.stdin.on('keypress', function (ch, key) {
 
         else if (key.name === 'w')
             controller.toggleWatching();
-
     }
 });
 

lib/log-update-async-hook/cli-cursor.js

@@ -4,36 +4,37 @@ var restoreCursor = require('./restore-cursor');
 var hidden = false;
 
 exports.show = function (stream) {
-	var s = stream || process.stderr;
+    var s = stream || process.stderr;
 
-	if (!s.isTTY) {
-		return;
-	}
+    if (!s.isTTY) {
+        return;
+    }
 
-	hidden = false;
-	s.write('\u001b[?25h');
+    hidden = false;
+    s.write('\u001b[?25h');
 };
 
 exports.hide = function (stream) {
-	var s = stream || process.stderr;
+    var s = stream || process.stderr;
 
-	if (!s.isTTY) {
-		return;
-	}
+    if (!s.isTTY) {
+        return;
+    }
 
-	restoreCursor();
-	hidden = true;
-	s.write('\u001b[?25l');
+    restoreCursor();
+    hidden = true;
+    s.write('\u001b[?25l');
 };
 
 exports.toggle = function (force, stream) {
-	if (force !== undefined) {
-		hidden = force;
-	}
-
-	if (hidden) {
-		exports.show(stream);
-	} else {
-		exports.hide(stream);
-	}
+    if (force !== undefined) {
+        hidden = force;
+    }
+
+    if (hidden) {
+        exports.show(stream);
+    }
+    else {
+        exports.hide(stream);
+    }
 };

lib/log-update-async-hook/index.js

@@ -1,33 +1,35 @@
 'use strict';
 var ansiEscapes = require('ansi-escapes');
-var wrapAnsi = require('wrap-ansi');
-var cliCursor = require('./cli-cursor');
+var wrapAnsi    = require('wrap-ansi');
+var cliCursor   = require('./cli-cursor');
 
 
 function main (stream) {
-	var prevLineCount = 0;
-
-	var render = function () {
-		cliCursor.hide();
-		var out = [].join.call(arguments, ' ') + '\n';
-		out = wrapAnsi(out, process.stdout.columns || 80, {wordWrap: false});
-		stream.write(ansiEscapes.eraseLines(prevLineCount) + out);
-		prevLineCount = out.split('\n').length;
-	};
-
-	render.clear = function () {
-		stream.write(ansiEscapes.eraseLines(prevLineCount));
-		prevLineCount = 0;
-	};
-
-	render.done = function () {
-		prevLineCount = 0;
-		cliCursor.show();
-	};
-
-	return render;
+    var prevLineCount = 0;
+
+    var render = function () {
+        cliCursor.hide();
+
+        var out = [].join.call(arguments, ' ') + '\n';
+
+        out     = wrapAnsi(out, process.stdout.columns || 80, { wordWrap: false });
+        stream.write(ansiEscapes.eraseLines(prevLineCount) + out);
+        prevLineCount = out.split('\n').length;
+    };
+
+    render.clear = function () {
+        stream.write(ansiEscapes.eraseLines(prevLineCount));
+        prevLineCount = 0;
+    };
+
+    render.done = function () {
+        prevLineCount = 0;
+        cliCursor.show();
+    };
+
+    return render;
 }
 
-module.exports = main(process.stdout);
+module.exports        = main(process.stdout);
 module.exports.stderr = main(process.stderr);
 module.exports.create = main;

lib/log-update-async-hook/restore-cursor.js

@@ -3,7 +3,7 @@ var onetime  = require('onetime');
 var exitHook = require('async-exit-hook');
 
 module.exports = onetime(function () {
-	exitHook(function () {
-		process.stderr.write('\u001b[?25h');
-	});
+    exitHook(function () {
+        process.stderr.write('\u001b[?25h');
+    });
 });

lib/logger/base.js

@@ -5,6 +5,7 @@ module.exports = class BaseLogger {
         this.testingStarted = false;
         this.aborted        = false;
         this.running        = false;
+        this.watching       = true;
 
         process.stdout.write = (...args) => this._onStdoutWrite(...args);
 
@@ -21,15 +22,16 @@ You can use the following keys in the terminal:
 
 `,
 
-            sourceChanged:        'Sources have been changed. Test run is starting...',
-            testRunStarting:      'Test run is starting...',
-            testRunStarted:       'Test run in progress...',
-            testRunStopping:      'Current test run is stopping...',
-            testRunFinished:      'Make changes in the source files or press ctrl+r to restart test run.',
-            fileWatchingEnabled:  'File watching enabled. Save changes in your files to run tests.',
-            fileWatchingDisabled: 'File watching disabled.',
-            nothingToStop:        'There are no tests running at the moment.',
-            testCafeStopping:     'Stopping TestCafe Live...'
+            sourceChanged:              'Sources have been changed. Test run is starting...',
+            testRunStarting:            'Test run is starting...',
+            testRunStarted:             'Test run in progress...',
+            testRunStopping:            'Current test run is stopping...',
+            testRunFinishedWatching:    'Make changes in the source files or press ctrl+r to restart test run.',
+            testRunFinishedNotWatching: 'Press ctrl+r to restart test run.',
+            fileWatchingEnabled:        'File watching enabled. Save changes in your files to run tests.',
+            fileWatchingDisabled:       'File watching disabled.',
+            nothingToStop:              'There are no tests running at the moment.',
+            testCafeStopping:           'Stopping TestCafe Live...'
         };
     }
 
@@ -72,7 +74,7 @@ You can use the following keys in the terminal:
     testsFinished () {
         this.running = false;
 
-        this._status(this.MESSAGES.testRunFinished);
+        this._status(this.watching ? this.MESSAGES.testRunFinishedWatching : this.MESSAGES.testRunFinishedNotWatching);
     }
 
     stopRunning () {
@@ -84,6 +86,8 @@ You can use the following keys in the terminal:
     }
 
     toggleWatching (enable) {
+        this.watching = enable;
+
         if (enable)
             this._status(this.MESSAGES.fileWatchingEnabled);
         else

lib/test-run-controller.js

@@ -15,7 +15,9 @@ const testRunCtorFactory = function (callbacks, command) {
             super(test, browserConnection, screenshotCapturer, warningLog, opts);
 
             this[liveTestRunStorage] = { test, stopping: false, stop: false, isInRoleInitializing: false };
+
             created(this, test);
+
             this.injectable.scripts.push('/testcafe-live.js');
 
             registerStopHandler(this, () => {

lib/test-runner.js

@@ -1,12 +1,12 @@
 'use strict';
 
-const fs                 = require('fs');
-const path               = require('path');
-const EventEmitter       = require('events');
-const Module             = require('module');
-const createTestCafe     = require('testcafe');
-const remotesWizard      = require('testcafe/lib/cli/remotes-wizard');
-const TestRunController  = require('./test-run-controller');
+const fs                = require('fs');
+const path              = require('path');
+const EventEmitter      = require('events');
+const Module            = require('module');
+const createTestCafe    = require('testcafe');
+const remotesWizard     = require('testcafe/lib/cli/remotes-wizard');
+const TestRunController = require('./test-run-controller');
 
 const CLIENT_JS = fs.readFileSync(path.join(__dirname, './client/index.js'));
 
@@ -213,8 +213,6 @@ module.exports = class TestRunner extends EventEmitter {
     run () {
         let runError = null;
 
-        //this._resolveAllTestRunPromises();
-
         let testRunPromise = null;
 
         if (!this.tcRunner) {