creevey 0.9.0-beta.13 → 0.9.0-beta.14

package/lib/esm/server/master/runner.js

@@ -9,11 +9,9 @@ const mkdirAsync = promisify(mkdir);
 export default class Runner extends EventEmitter {
   pools = {};
   tests = {};
-
   get isRunning() {
     return Object.values(this.pools).some(pool => pool.isRunning);
   }
-
   constructor(config) {
     super();
     this.failFast = config.failFast;
@@ -22,7 +20,6 @@ export default class Runner extends EventEmitter {
     this.browsers = Object.keys(config.browsers);
     this.browsers.map(browser => this.pools[browser] = new Pool(config, browser)).map(pool => pool.on('test', this.handlePoolMessage));
   }
-
   handlePoolMessage = message => {
     const {
       id,
@@ -36,10 +33,9 @@ export default class Runner extends EventEmitter {
       testName,
       storyPath,
       storyId
-    } = test; // TODO Handle 'retrying' status
-
+    } = test;
+    // TODO Handle 'retrying' status
     test.status = status == 'retrying' ? 'failed' : status;
-
     if (!result) {
       this.sendUpdate({
         tests: {
@@ -55,11 +51,9 @@ export default class Runner extends EventEmitter {
       });
       return;
     }
-
     if (!test.results) {
       test.results = [];
     }
-
     test.results.push(result);
     this.sendUpdate({
       tests: {
@@ -84,33 +78,32 @@ export default class Runner extends EventEmitter {
       this.emit('stop');
     }
   };
-
   async init() {
     await Promise.all(Object.values(this.pools).map(pool => pool.init()));
   }
-
   updateTests(testsDiff) {
     const tests = {};
     const removedTests = [];
     Object.entries(testsDiff).forEach(([id, newTest]) => {
       const oldTest = this.tests[id];
-
       if (newTest) {
         if (oldTest) {
-          this.tests[id] = { ...newTest,
+          this.tests[id] = {
+            ...newTest,
             retries: oldTest.retries,
             results: oldTest.results,
             approved: oldTest.approved
           };
-        } else this.tests[id] = newTest; // eslint-disable-next-line @typescript-eslint/no-unused-vars
-
+        } else this.tests[id] = newTest;
 
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
         const {
           story,
           fn,
           ...restTest
         } = newTest;
-        tests[id] = { ...restTest,
+        tests[id] = {
+          ...restTest,
           status: 'unknown'
         };
       } else if (oldTest) {
@@ -136,7 +129,6 @@ export default class Runner extends EventEmitter {
       removedTests
     });
   }
-
   start(ids) {
     if (this.isRunning) return;
     const testsToStart = ids.map(id => this.tests[id]).filter(isDefined).filter(test => !test.skip);
@@ -149,7 +141,8 @@ export default class Runner extends EventEmitter {
         browser,
         testName,
         storyPath
-      }) => ({ ...update,
+      }) => ({
+        ...update,
         [id]: {
           id,
           browser,
@@ -169,7 +162,8 @@ export default class Runner extends EventEmitter {
       } = test;
       const restPath = [...storyPath, testName].filter(isDefined);
       test.status = 'pending';
-      return { ...tests,
+      return {
+        ...tests,
         [browser]: [...(tests[browser] || []), {
           id,
           path: restPath
@@ -179,21 +173,19 @@ export default class Runner extends EventEmitter {
     this.browsers.forEach(browser => {
       const pool = this.pools[browser];
       const tests = testsByBrowser[browser];
-
       if (tests && tests.length > 0 && pool.start(tests)) {
         pool.once('stop', this.handlePoolStop);
       }
     });
   }
-
   stop() {
     if (!this.isRunning) return;
     this.browsers.forEach(browser => this.pools[browser].stop());
   }
-
   get status() {
     const tests = {};
-    Object.values(this.tests).filter(isDefined) // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    Object.values(this.tests).filter(isDefined)
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     .forEach(({
       story,
       fn,
@@ -205,7 +197,6 @@ export default class Runner extends EventEmitter {
       browsers: this.browsers
     };
   }
-
   async approve({
     id,
     retry,
@@ -217,11 +208,9 @@ export default class Runner extends EventEmitter {
     if (!result || !result.images) return;
     const images = result.images[image];
     if (!images) return;
-
     if (!test.approved) {
       test.approved = {};
     }
-
     const {
       browser,
       testName,
@@ -251,9 +240,7 @@ export default class Runner extends EventEmitter {
       }
     });
   }
-
   sendUpdate(data) {
     this.emit('update', data);
   }
-
 }

package/lib/esm/server/master/server.js

@@ -27,17 +27,14 @@ export default function server(reportDir, port, ui) {
       ctx.body = 'pong';
       return;
     }
-
     await next();
   });
-
   if (ui) {
     app.use(async (_, next) => {
       await creeveyApi;
       await next();
     });
   }
-
   app.use(async (ctx, next) => {
     if (ctx.method == 'POST' && ctx.path == '/stories') {
       const {
@@ -57,7 +54,6 @@ export default function server(reportDir, port, ui) {
       }));
       return;
     }
-
     await next();
   });
   app.use(async (ctx, next) => {
@@ -66,8 +62,8 @@ export default function server(reportDir, port, ui) {
         workerId,
         options
       } = ctx.request.body;
-      const worker = Object.values(cluster.workers ?? {}).filter(isDefined).find(worker => worker.process.pid == workerId); // NOTE: Hypothetical case when someone send to us capture req and we don't have a worker with browser session for it
-
+      const worker = Object.values(cluster.workers ?? {}).filter(isDefined).find(worker => worker.process.pid == workerId);
+      // NOTE: Hypothetical case when someone send to us capture req and we don't have a worker with browser session for it
       if (!worker) return;
       await new Promise(resolve => {
         const unsubscribe = subscribeOnWorker(worker, 'stories', message => {
@@ -79,12 +75,11 @@ export default function server(reportDir, port, ui) {
           type: 'capture',
           payload: options
         });
-      }); // TODO Pass screenshot result to show it in inspector
-
+      });
+      // TODO Pass screenshot result to show it in inspector
       ctx.body = 'Ok';
       return;
     }
-
     await next();
   });
   app.use(serve(path.join(__dirname, '../../client/web')));

package/lib/esm/server/messages.js

@@ -1,13 +1,11 @@
 import cluster from 'cluster';
-
 function emitMessage(message) {
   var _process$send, _process;
-
   if (cluster.isWorker && !process.connected) return false;
-  return ((_process$send = (_process = process).send) === null || _process$send === void 0 ? void 0 : _process$send.call(_process, message)) ?? // @ts-expect-error: wrong typings `process.emit` return boolean
+  return ((_process$send = (_process = process).send) === null || _process$send === void 0 ? void 0 : _process$send.call(_process, message)) ??
+  // @ts-expect-error: wrong typings `process.emit` return boolean
   process.emit('message', message);
 }
-
 export function emitWorkerMessage(message) {
   return emitMessage({
     scope: 'worker',
@@ -43,7 +41,6 @@ export function emitShutdownMessage() {
     scope: 'shutdown'
   });
 }
-
 function createHandlers() {
   return Object.assign(Object.create(null), {
     worker: new Set(),
@@ -54,60 +51,48 @@ function createHandlers() {
     shutdown: new Set()
   });
 }
-
 const handlers = createHandlers();
-
 const handler = message => {
   switch (message.scope) {
     case 'worker':
       return handlers.worker.forEach(h => h(message));
-
     case 'stories':
       return handlers.stories.forEach(h => h(message));
-
     case 'test':
       return handlers.test.forEach(h => h(message));
-
     case 'webpack':
       return handlers.webpack.forEach(h => h(message));
-
     case 'docker':
       return handlers.docker.forEach(h => h(message));
-
     case 'shutdown':
       return handlers.shutdown.forEach(h => h(message));
   }
 };
-
 process.on('message', handler);
 export function sendStoriesMessage(target, message) {
   var _target$send;
-
-  (_target$send = target.send) === null || _target$send === void 0 ? void 0 : _target$send.call(target, {
+  (_target$send = target.send) === null || _target$send === void 0 || _target$send.call(target, {
     scope: 'stories',
     ...message
   });
 }
 export function sendTestMessage(target, message) {
   var _target$send2;
-
-  (_target$send2 = target.send) === null || _target$send2 === void 0 ? void 0 : _target$send2.call(target, {
+  (_target$send2 = target.send) === null || _target$send2 === void 0 || _target$send2.call(target, {
     scope: 'test',
     ...message
   });
 }
 export function sendDockerMessage(target, message) {
   var _target$send3;
-
-  (_target$send3 = target.send) === null || _target$send3 === void 0 ? void 0 : _target$send3.call(target, {
+  (_target$send3 = target.send) === null || _target$send3 === void 0 || _target$send3.call(target, {
     scope: 'docker',
     ...message
   });
 }
 export function sendShutdownMessage(target) {
   var _target$send4;
-
-  (_target$send4 = target.send) === null || _target$send4 === void 0 ? void 0 : _target$send4.call(target, {
+  (_target$send4 = target.send) === null || _target$send4 === void 0 || _target$send4.call(target, {
     scope: 'shutdown'
   });
 }
@@ -119,35 +104,30 @@ export function subscribeOn(scope, handler) {
         handlers.worker.add(workerHandler);
         return () => handlers.worker.delete(workerHandler);
       }
-
     case 'stories':
       {
         const storiesHandler = handler;
         handlers.stories.add(storiesHandler);
         return () => handlers.stories.delete(storiesHandler);
       }
-
     case 'test':
       {
         const testHandler = handler;
         handlers.test.add(testHandler);
         return () => handlers.test.delete(testHandler);
       }
-
     case 'webpack':
       {
         const webpackHandler = handler;
         handlers.webpack.add(webpackHandler);
         return () => handlers.webpack.delete(webpackHandler);
       }
-
     case 'docker':
       {
         const dockerHandler = handler;
         handlers.docker.add(dockerHandler);
         return () => handlers.docker.delete(dockerHandler);
       }
-
     case 'shutdown':
       {
         const shutdownHandler = handler;
@@ -159,7 +139,6 @@ export function subscribeOn(scope, handler) {
 const workers = new Map();
 export function subscribeOnWorker(worker, scope, handler) {
   const workerHandlers = workers.get(worker) ?? createHandlers();
-
   if (!workers.has(worker)) {
     workers.set(worker, workerHandlers);
     worker.once('exit', () => workers.delete(worker));
@@ -167,25 +146,19 @@ export function subscribeOnWorker(worker, scope, handler) {
       switch (message.scope) {
         case 'worker':
           return workerHandlers.worker.forEach(h => h(message));
-
         case 'stories':
           return workerHandlers.stories.forEach(h => h(message));
-
         case 'test':
           return workerHandlers.test.forEach(h => h(message));
-
         case 'webpack':
           return workerHandlers.webpack.forEach(h => h(message));
-
         case 'docker':
           return workerHandlers.docker.forEach(h => h(message));
-
         case 'shutdown':
           return workerHandlers.shutdown.forEach(h => h(message));
       }
     });
   }
-
   switch (scope) {
     case 'worker':
       {
@@ -193,35 +166,30 @@ export function subscribeOnWorker(worker, scope, handler) {
         workerHandlers.worker.add(workerHandler);
         return () => workerHandlers.worker.delete(workerHandler);
       }
-
     case 'stories':
       {
         const storiesHandler = handler;
         workerHandlers.stories.add(storiesHandler);
         return () => workerHandlers.stories.delete(storiesHandler);
       }
-
     case 'test':
       {
         const testHandler = handler;
         workerHandlers.test.add(testHandler);
         return () => workerHandlers.test.delete(testHandler);
       }
-
     case 'webpack':
       {
         const webpackHandler = handler;
         workerHandlers.webpack.add(webpackHandler);
         return () => workerHandlers.webpack.delete(webpackHandler);
       }
-
     case 'docker':
       {
         const dockerHandler = handler;
         workerHandlers.docker.add(dockerHandler);
         return () => workerHandlers.docker.delete(dockerHandler);
       }
-
     case 'shutdown':
       {
         const shutdownHandler = handler;