@lvce-editor/test-worker 6.1.0 → 6.2.0

package/dist/testWorkerMain.js

@@ -1079,10 +1079,55 @@ const sendMessagePortToEditorWorker = async (port, rpcId) => {
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToEditorWorker', port, command, rpcId);
 };
 
+const callFunction = async (fn, args) => {
+  try {
+    await fn(args);
+    return undefined;
+  } catch (error) {
+    return error;
+  }
+};
+
 const formatDuration = duration => {
   return duration.toFixed(2) + 'ms';
 };
 
+const Fail = 'fail';
+const Pass = 'pass';
+
+const executeTest2 = async (name, fn, globals, timestampGenerator) => {
+  const getTimestamp = timestampGenerator;
+  const start = getTimestamp();
+  const error = await callFunction(fn, globals);
+  const end = getTimestamp();
+  const duration = end - start;
+  const formattedDuration = formatDuration(duration);
+  if (error) {
+    return {
+      error,
+      start,
+      end,
+      duration,
+      formattedDuration,
+      name,
+      type: Fail,
+      background: 'red',
+      text: `test failed: ${error}`
+    };
+  }
+  return {
+    error: undefined,
+    start,
+    end,
+    duration,
+    formattedDuration,
+    name,
+    type: Pass,
+    background: 'green',
+    text: `test passed in ${formattedDuration}`
+  };
+};
+
 const printError = error => {
   if (error && error.constructor.name === 'AssertionError') {
     console.error(error.message);
@@ -1096,66 +1141,26 @@ const printTestError = async error => {
   printError(error);
 };
 
-const stringifyError = error => {
-  if (!error) {
-    return `${error}`;
-  }
-  if (error && error.message && error.constructor.name && error.constructor.name !== 'Error' && error.constructor.name !== 'VError') {
-    return `${error}`;
-  }
-  return `${error.message}`;
-};
-
-const Fail = 'fail';
-const Pass = 'pass';
-
 const now = () => {
   return performance.now();
 };
 
-// TODO make this code more functional, returning a test result
-// and a separate function prints out the test result
 const executeTest = async (name, fn, globals = {}) => {
-  let _error;
-  let _start;
-  let _end;
-  let _duration;
-  let _formattedDuration;
-  try {
-    _start = now();
-    await fn(globals);
-    _end = now();
-    _duration = _end - _start;
-    _formattedDuration = formatDuration(_duration);
-    // eslint-disable-next-line no-console
-    console.info(`PASS ${name} in ${_formattedDuration}`);
-  } catch (error) {
-    if (error &&
-    // @ts-ignore
-    error.message.startsWith('Failed to load command TestFrameWork.')) {
-      console.error(error);
-      return;
-    }
-    _error = stringifyError(error);
-    if (!(error instanceof VError)) {
-      error = new VError(error, `Test failed: ${name}`);
-    }
+  const {
+    error,
+    formattedDuration,
+    background,
+    text,
+    type
+  } = await executeTest2(name, fn, globals, now);
+  if (error) {
     await printTestError(error);
-  }
-  let state;
-  let background;
-  let text;
-  if (_error) {
-    state = Fail;
-    background = 'red';
-    text = `test failed: ${_error}`;
   } else {
-    background = 'green';
-    text = `test passed in ${_formattedDuration}`;
-    state = Pass;
+    // eslint-disable-next-line no-console
+    console.info(`PASS ${name} in ${formattedDuration}`);
   }
   // @ts-ignore
-  await invoke$1('TestFrameWork.showOverlay', state, background, text);
+  await invoke$1('TestFrameWork.showOverlay', type, background, text);
 };
 
 const importScript = async url => {
@@ -3503,6 +3508,12 @@ const setWebViewPort = async (uid, port, origin, portType) => {
   await invokeAndTransfer('WebView.setPort', uid, port, origin, portType);
 };
 
+const transferWebViewPort = async (webViewId, port) => {
+  const info = await getWebViewInfo(webViewId);
+  const portType = 'test';
+  await setWebViewPort(info.uid, port, info.origin, portType);
+};
+
 const waitForFirstEventEvent = async port => {
   const {
     resolve,
@@ -3521,9 +3532,7 @@ const createPortRpc = async webViewId => {
   } = getPortTuple();
   const firstEventPromise = waitForFirstEventEvent(port1);
   // TODO ask extension host worker about webview uid
-  const info = await getWebViewInfo(webViewId);
-  const portType = 'test';
-  await setWebViewPort(info.uid, port2, info.origin, portType);
+  await transferWebViewPort(webViewId, port2);
   const firstEvent = await firstEventPromise;
   if (firstEvent.data !== 'ready') {
     throw new Error('unexpected first message');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/test-worker",
-  "version": "6.1.0",
+  "version": "6.2.0",
   "description": "Test Worker",
   "repository": {
     "type": "git",