Fix: Tagged releases deploys only

Fix: Web worker working with jest

Author: codeasashu

.github/workflows/gh-pages.yml

@@ -4,8 +4,6 @@ on:
   push:
     branches:
       - main
-  pull_request:
-
 jobs:
   deploy:
     runs-on: ubuntu-20.04

__jest__/setup-after-env.js

@@ -1,5 +1,11 @@
 import '@testing-library/jest-dom/extend-expect';
 import * as matchers from 'jest-extended';
+import Worker from './workerStub';
+
+window.Worker = Worker;
+
+jest.mock('../src/Stores/lintStore', () => require('../__mocks__/lintStore'));
+
 expect.extend(matchers);
 //import {createSerializer} from 'enzyme-to-json';
 

__jest__/workerStub.js

@@ -0,0 +1,12 @@
+class Worker {
+  constructor(stringUrl) {
+    this.url = stringUrl;
+    this.onmessage = () => {};
+  }
+
+  postMessage(msg) {
+    this.onmessage(msg);
+  }
+}
+
+export default Worker;

__mocks__/lintStore.js

@@ -0,0 +1,16 @@
+const LintStore = {
+  __esModule: true,
+  default: () => ({
+    errors: [],
+    warning: [],
+    info: [],
+    hints: [],
+    spec: {},
+
+    lint: () => {},
+    activate: () => {},
+    handleWorkerMessage: () => {},
+  }),
+};
+
+module.exports = LintStore;

src/Stores/lintStore.js

@@ -36,15 +36,19 @@ class LintStore {
   }
 
   handleWorkerMessage({data}) {
-    const results = data.results;
-    this.errors = results.filter(
-      (r) => r.severity === DiagnosticSeverity.Error,
-    );
-    this.warning = results.filter(
-      (r) => r.severity === DiagnosticSeverity.Warning,
-    );
-    this.hints = results.filter((r) => r.severity === DiagnosticSeverity.Hint);
-    this.info = results.filter((r) => r.severity === DiagnosticSeverity.Info);
+    if (data && Object.prototype.hasOwnProperty.call(data, 'results')) {
+      const results = data.results;
+      this.errors = results.filter(
+        (r) => r.severity === DiagnosticSeverity.Error,
+      );
+      this.warning = results.filter(
+        (r) => r.severity === DiagnosticSeverity.Warning,
+      );
+      this.hints = results.filter(
+        (r) => r.severity === DiagnosticSeverity.Hint,
+      );
+      this.info = results.filter((r) => r.severity === DiagnosticSeverity.Info);
+    }
   }
 }
 

src/components/Content/__tests__/content.test.js

@@ -1,6 +1,5 @@
 import React from 'react';
 import userEvent from '@testing-library/user-event';
-import {Classes} from '@blueprintjs/core';
 import {Classes as PopoverClasses} from '@blueprintjs/popover2';
 import {
   act,
@@ -10,7 +9,7 @@ import {
   within,
 } from '../../../../test-utils';
 import Content from '../index';
-import {fireEvent, prettyDOM} from '@testing-library/dom';
+import {fireEvent} from '@testing-library/dom';
 
 describe('Content tests', () => {
   describe('Schema tests', () => {

src/components/Sidebar/__tests__/Sidebar.test.js

@@ -24,6 +24,7 @@ describe('Sidebar tests', () => {
   };
 
   beforeEach(() => {
+    console.warn = jest.fn();
     const popover = getPopover();
     expect(popover).toBeNull();
   });
@@ -271,7 +272,7 @@ describe('Sidebar tests', () => {
       await act(async () => {
         await fireEvent.contextMenu(childNode);
       });
-      const menuItems = getContextMenuItems();
+      const menuItems = getContextMenuItems(`tree-ctxmenu-${childName}`);
       await act(async () => {
         await userEvent.click(menuItems[0].querySelector('a'));
       });
@@ -368,13 +369,15 @@ describe('Sidebar tests', () => {
     await act(async () => {
       fireEvent.contextMenu(childNode);
     });
-    const menuItems = getContextMenuItems();
+    const menuItems = getContextMenuItems(`tree-ctxmenu-/users`);
     // Delete path
     act(() => {
       userEvent.click(menuItems[0].querySelector('a'));
     });
 
-    const editItem = getNodeFromSidebar(NodeTypes.Path).querySelector('input');
+    const editItem = screen
+      .getByLabelText(NodeTypes.Path)
+      .querySelector('input');
     expect(editItem).toHaveValue(`/users`);
     await act(async () => {
       await userEvent.type(editItem, `/abc{Enter}`);
@@ -444,7 +447,7 @@ describe('Sidebar tests', () => {
     await act(async () => {
       await fireEvent.contextMenu(childNode);
     });
-    const menuItems = getContextMenuItems();
+    const menuItems = getContextMenuItems(`tree-ctxmenu-/users`);
     // Delete operation
     act(() => {
       userEvent.click(menuItems[2].querySelector('a'));
@@ -496,21 +499,6 @@ function getChildNodeType(parentNodeType) {
   }
 }
 
-async function addChildNode(nodeType, name) {
-  const parentNode = await getNodeFromSidebar(nodeType);
-  const addNewBtnLabel = getAddButtonLabel(nodeType);
-  await clickAddNewItem(parentNode, addNewBtnLabel);
-
-  const editableItem = await screen.getAllByRole(/edititem/);
-  expect(editableItem).toHaveLength(1);
-  const editableInput = getEditableInput(editableItem[0]);
-  await act(async () => {
-    // Enter the new item name and press enter
-    await userEvent.type(editableInput, `${name}{Enter}`);
-  });
-  return getNodeFromSidebar(getChildNodeType(nodeType));
-}
-
 async function clickAddNewItem(menuItem, addBtnLabel) {
   await act(async () => {
     await fireEvent.contextMenu(menuItem);
@@ -529,8 +517,8 @@ function getNodeFromSidebar(nodeType) {
   return screen.getByLabelText(nodeType);
 }
 
-function getContextMenuItems() {
-  const popover = getPopover();
+function getContextMenuItems(name) {
+  const popover = getPopover(name);
   return within(popover).queryAllByRole('listitem');
 }
 
@@ -541,7 +529,10 @@ function getEditableInput(containerElem, shouldRaiseException = false) {
     : within(containerElem).queryByRole(/textbox/);
 }
 
-function getPopover() {
+function getPopover(name) {
+  if (name) {
+    return document.querySelector(`ul[data-testid="${name}"]`);
+  }
   return document.querySelector(
     `.${PopoverClasses.POPOVER2}.${Classes.MINIMAL}`,
   );

src/components/Tree/TreeRow.js

@@ -24,8 +24,8 @@ const getItems = (items) =>
     }
   });
 
-const SidebarContextMenu = ({items}) => {
-  return <Menu>{getItems(items)}</Menu>;
+const SidebarContextMenu = ({items, ...props}) => {
+  return <Menu {...props}>{getItems(items)}</Menu>;
 };
 
 SidebarContextMenu.propTypes = {
@@ -108,7 +108,13 @@ const TreeRow = observer((props) => {
     const menuItems = node ? generateContextMenu(node) : undefined;
     if (menuItems !== undefined && menuItems.length > 0) {
       return (
-        <ContextMenu2 content={<SidebarContextMenu items={menuItems} />}>
+        <ContextMenu2
+          content={
+            <SidebarContextMenu
+              items={menuItems}
+              data-testid={`tree-ctxmenu-${node.name}`}
+            />
+          }>
           <div
             key={node.id}
             data-testid={`tree-row-${node.id}`}

src/worker/lint.worker.js

@@ -2,14 +2,17 @@ const {Spectral} = require('@stoplight/spectral-core');
 const {oas} = require('@stoplight/spectral-rulesets');
 
 self.onmessage = async ({data}) => {
-  const results = await lintSpec(data.spec);
-  self.postMessage({msg: 'worker', spec: data.spec, results});
+  if (Object.prototype.hasOwnProperty.call(data, 'spec') && data.spec) {
+    const results = await lintSpec(data.spec);
+    self.postMessage({msg: 'worker', spec: data.spec, results});
+  }
 };
 
 const lintSpec = (spec) => {
   const spectral = new Spectral();
   spectral.setRuleset({
     extends: oas,
   });
+  console.log('worker11', spec);
   return spectral.run(spec);
 };