fixed auto-update issues

Author: DavertMik

README.md

@@ -2,20 +2,21 @@
 
 An interactive, graphical test runner for CodeceptJS. 
 
-![codepress video](./codepress.gif)
+
+![codepress video](./codeceptui.gif)
 
 ## Quickstart
 
 Install CodeceptUI in a project where CodeceptJS is already used
 
 ```
-npm i @codecept-js/ui#master --save
+npm i @codecept-js/ui --save
 ```
 
 Execute it:
 
 ```
-npx codepress
+npx codecept-ui
 ```
 
 ## Development Mode
@@ -29,10 +30,10 @@ codepress uses the debug package to output debug information. This is useful to
 
 ```
   # verbose: get all debug information
-  DEBUG=codepress:* npx codepress 
+  DEBUG=codepress:* npx codeceptui 
 
   # just get debug output of one module
-  DEBUG=codepress:codeceptjs-factory npx codepress
+  DEBUG=codepress:codeceptjs-factory npx codeceptui
 ```
 
 # Credits

codeceptui.gif

@@ -11,7 +11,10 @@ module.exports = async (req, res) => {
   const { codecept, container } = codeceptjsFactory.getInstance();
 
   const mocha = container.mocha();
-
+  mocha.grep();
+  mocha.files = [];
+  mocha.suite.suites = [];
+  
   const code = eval(req.body.code);
   const test = scenario.test(new Test('new test', code));
   test.id = 'new-test';
@@ -35,7 +38,6 @@ module.exports = async (req, res) => {
   });
 
   event.dispatcher.once(event.all.result, () => {
-    mocha.suite.suites = [];
     pauseEnabled = false;
     debug('testrun finished');
     try {
@@ -44,10 +46,21 @@ module.exports = async (req, res) => {
       debug('ERROR resetting suites', err);
     }
     wsEvents.codeceptjs.exit(0);
+    mocha.suite.suites = [];
   });
 
   debug('codecept.run()');
-  codecept.run();
+  const done = () => {
+    event.emit(event.all.result, codecept);
+    event.emit(event.all.after, codecept);
+  };
+
+  try {
+    event.emit(event.all.before, codecept);
+    global.runner = mocha.run(done);
+  } catch (e) {
+    throw new Error(e);
+  }
 
   return res.status(200).send('OK');
 };

codepress.gif

@@ -22,18 +22,23 @@ class ConsoleRecorderHelper extends Helper {
     page.on('pageerror', async err => {
       debug('Got page error', err);
       wsEvents.console.jsError(err);
+
+      this._addToLog({
+        type: 'error',
+        message: err.toString()
+      });      
     });
     page.on('error', async err => {
       debug('Got error', err);
       wsEvents.console.error(err);
+
+      this._addToLog({
+        type: 'error',
+        message: err.toString()
+      });
     });
 
     page.on('console', async msg => {
-      // Restrict to errors for now
-      if (msg.type() !== 'error') {
-        return;
-      }
-
       // Parse all console.log args
       for (let i = 0; i < msg.args().length; ++i) {
         const arg = msg.args()[i];
@@ -46,14 +51,7 @@ class ConsoleRecorderHelper extends Helper {
           }
         }
 
-        if (!this.helpers.RealtimeReporterHelper) return;
-        const step = this.helpers.RealtimeReporterHelper.step;
-
-        if (!step.logs) step.logs = [];
-
-        step.logs.push({
-          id: uuid,
-          time: Date.now(),
+        this._addToLog({
           type: msg.type(),
           url: msg.location().url,
           lineNumber: msg.location().lineNumber,
@@ -65,6 +63,19 @@ class ConsoleRecorderHelper extends Helper {
 
     debug('Recording console logs is enabled');
   }
+
+  _addToLog(log) {
+
+    if (!this.helpers.RealtimeReporterHelper) return;
+    const step = this.helpers.RealtimeReporterHelper.step;
+
+    if (!step.logs) step.logs = [];
+
+    step.logs.push({ ...log, 
+      id: uuid,
+      time: Date.now(),
+    });    
+  }
 }
 
 module.exports = ConsoleRecorderHelper;

demo.gif

@@ -135,8 +135,8 @@ const takeSnapshot = async (helper, snapshotId, takeScreenshot = false) => {
   try {
     [_, pageUrl, pageTitle, scrollPosition, viewportSize] = await Promise.all([
       takeScreenshot ? saveScreenshot(helper, StepFileName) : Promise.resolve(undefined),
-      helper.grabCurrentActivity ? await helper.grabCurrentActivity() : await helper.grabCurrentUrl(),
-      helper.grabTitle(),
+      helper.grabCurrentActivity ? helper.grabCurrentActivity() : helper.grabCurrentUrl(),
+      helper.grabTitle ? helper.grabTitle() : '',
       helper.grabPageScrollPosition(),
       helper.executeScript(getViewportSize),
     ]);

lib/api/new-test.js

@@ -21,7 +21,10 @@ module.exports = () => {
 
   if (program.config) {
     const configFile = program.config;
-    let configPath = path.join(process.cwd(), configFile);
+    let configPath = configFile;
+    if (!path.isAbsolute(configPath)) {
+      configPath = path.join(process.cwd(), configFile);
+    }
     if (!fs.lstatSync(configPath).isDirectory()) {
       codeceptjsFactory.setConfigFile(path.basename(configPath));
       configPath = path.dirname(configPath);

lib/codeceptjs/console-recorder.helper.js

@@ -58,13 +58,25 @@ const groupByAttribute = attrName => (grouped, feature) => {
   return grouped;
 };
 
+const watchedFiles = () => {
+  const { config } = codeceptjsFactory.getInstance();
+  const watchFiles = [];
+  
+  watchFiles.push(codeceptjsFactory.getConfigFile());
+  watchFiles.push(config.get('tests'));
+  if (config.get('gherkin')) watchFiles.push(config.get().gherkin.features);
+  if (config.get('include')) watchFiles.push(...Object.values(config.get('include')));
+  debug('watching files', watchFiles);
+  return watchFiles.filter(f => !!f);  
+};
+
 // Cache mocha suites
 let suites = [];
 
 // NOTE could not get it to work with absolute paths
 // TODO Setting the default ignore pattern in my cases effectively disabled events
 //    my test files are ending with *.test.js
-chokidar.watch(['./**/*.js', './**/*.feature'], {
+chokidar.watch(watchedFiles(), {
   ignored:  ['**/node_modules/**/*', '**/.git/**/*'],
   ignoreInitial: false, // need to load suites initially
   ignorePermissionErrors: true,

lib/codeceptjs/reporter-utils.js

@@ -4,8 +4,8 @@ const fs = require('fs');
 const path = require('path');
 const mkdir = require('../utils/mkdir');
 
-mkdir(path.join('.', '.codepress'));
-const ScenarioStatusFile = path.join('.', '.codepress', 'scenario-status.json');
+mkdir(path.join(global.output_dir, '.ui'));
+const ScenarioStatusFile = path.join(global.output_dir, '.ui', 'scenario-status.json');
 
 const ScenarioStatus = ['passed', 'failed'];
 
@@ -48,4 +48,4 @@ process.on('SIGINT', () => {
   console.log('Saving status...');
   saveStatus();  
   process.exit();  
-});
+});

lib/commands/init.js

@@ -3,8 +3,8 @@ const fs = require('fs');
 const path = require('path');
 const mkdir = require('../utils/mkdir');
 
-mkdir(path.join('.', '.codepress'));
-const TestRunBaseDir = path.join('.', '.codepress', 'testruns');
+mkdir(path.join(global.output_dir, '.ui'));
+const TestRunBaseDir = path.join(global.output_dir, '.ui', 'testruns');
 mkdir(TestRunBaseDir);
 
 const fileNameFromId = id => `${encodeURIComponent(id)}.json`;