Merge pull request #571 from Geode-solutions/fix/highlight-visibility

fix(componentColor): Add e2e test for specific component style options

Author: BotellaA

tests/e2e/tests/camera_tools.test.js

@@ -9,7 +9,9 @@ import {
   beforeAllTimeout,
   changeColor,
   dragContextMenu,
+  expandComponentsType,
   focusObjectInTree,
+  getTreeRowByText,
   hideObjectInTree,
   hoverViewerCenter,
   loadData,
@@ -93,7 +95,13 @@ test("overlapping objects context menu at top", async () => {
 });
 
 test("visibility off grid and expand brep focus", async () => {
-  await hideObjectInTree(window, "RegularGrid3D");
+  await expandComponentsType(window, "mainObjectTree", "RegularGrid3D");
+  await getTreeRowByText(window, "mainObjectTree", "test")
+    .locator(".mdi-eye")
+    .first()
+    .click({ force: true });
+  await window.waitForTimeout(afterActionWait);
+
   await focusObjectInTree(window, "BRep", "test");
   await window.mouse.move(0, 0);
   await window.waitForTimeout(afterActionWait);

tests/e2e/tests/model.test.js

@@ -9,6 +9,7 @@ import {
   beforeAllTimeout,
   changeColorWithSlider,
   changeColoringStyle,
+  changeComponentColorToBlue,
   changeOpacity,
   expandComponentsType,
   hideObjectInTree,
@@ -170,3 +171,25 @@ test("object tree hover first surface", async () => {
   await hoverModelComponentRow(window, "00000000-");
   await expect(window).toHaveScreenshot();
 });
+
+test("toggle object tree main", async () => {
+  await window.getByTestId("toggleObjectsButton").click();
+  await window.waitForTimeout(afterActionWait);
+  await expect(window).toHaveScreenshot();
+});
+
+test("context menu through non visible surface", async () => {
+  await window
+    .getByTestId("modelComponentsObjectTree")
+    .locator(".tree-row-wrapper", { hasText: "00000000-" })
+    .nth(4)
+    .locator(".mdi-eye-off-outline")
+    .first()
+    .click();
+  await window.waitForTimeout(afterActionWait);
+  const canvas = window.getByTestId("hybridViewer").locator("canvas");
+  const box = await canvas.boundingBox();
+  await viewerContextMenu(window, box.width / 2, box.height / 2);
+  await changeComponentColorToBlue(window, "modelStyleMenu");
+  await expect(window).toHaveScreenshot();
+});

tests/e2e/tests/screenshots/camera_tools.test.js/camera-orientation.png

@@ -44,15 +44,7 @@ async function applyAttribute(
   menuTestId,
   { attributeType, attributeName, colorMap = undefined, min = undefined, max = undefined } = {},
 ) {
-  const menuButton = window.getByTestId(menuTestId);
-  if (
-    !(await menuButton
-      .locator("button.menu-btn")
-      .evaluate((node) => node.classList.contains("v-btn--active")))
-  ) {
-    await menuButton.click();
-    await window.waitForTimeout(afterActionWait);
-  }
+  await ensureMenuOpen(window, menuTestId);
 
   await window.getByTestId("coloringStyleSelector").first().click();
   await window.waitForTimeout(afterActionWait);
@@ -74,16 +66,7 @@ async function applyAttribute(
     .filter({ visible: true })
     .first();
 
-  if ((await option.count()) > 0) {
-    await option.click();
-  } else {
-    await window
-      .locator(".v-overlay-container")
-      .locator(".v-list-item")
-      .filter({ visible: true })
-      .first()
-      .click();
-  }
+  await option.click();
   await window.waitForTimeout(afterActionWait);
 
   if (colorMap) {
@@ -165,20 +148,26 @@ async function highlightData(window, category) {
   await window.waitForTimeout(afterActionWait);
 }
 
+function getTreeRowByText(window, treeTestId, text) {
+  return window
+    .getByTestId(treeTestId)
+    .locator(".tree-row-wrapper")
+    .filter({ hasText: text })
+    .first();
+}
+
 async function expandComponentsType(window, treeId, categoryName) {
-  const tree = window.getByTestId(treeId);
-  const row = tree.locator(".tree-row-wrapper").filter({ hasText: categoryName }).first();
-  const rightChevron = row.locator(".mdi-menu-right").first();
+  const rightChevron = getTreeRowByText(window, treeId, categoryName)
+    .locator(".mdi-menu-right")
+    .first();
   if ((await rightChevron.count()) > 0) {
     await rightChevron.dispatchEvent("click");
     await window.waitForTimeout(afterActionWait);
   }
 }
 
 async function hoverModelComponentRow(window, hasText) {
-  const modelComponentsObjectTree = window.getByTestId("modelComponentsObjectTree");
-  const row = modelComponentsObjectTree.locator(".tree-row-wrapper").filter({ hasText }).first();
-  await row.hover();
+  await getTreeRowByText(window, "modelComponentsObjectTree", hasText).hover();
   await window.waitForTimeout(afterActionWait);
 }
 
@@ -258,24 +247,31 @@ async function dragContextMenu(window, { targetX, targetY } = {}) {
 }
 
 async function hideObjectInTree(window, objectName, treeTestId = "mainObjectTree") {
-  const tree = window.getByTestId(treeTestId);
-  const row = tree.locator(".tree-row-wrapper").filter({ hasText: objectName });
-  await row.locator(".mdi-eye").first().click();
+  await getTreeRowByText(window, treeTestId, objectName)
+    .locator(".mdi-eye")
+    .first()
+    .click({ force: true });
+  await window.waitForTimeout(afterActionWait);
+}
+
+async function focusObjectInTree(window, folderName, objectName) {
+  await expandComponentsType(window, "mainObjectTree", folderName);
+  await getTreeRowByText(window, "mainObjectTree", objectName)
+    .locator("button:has(.mdi-target)")
+    .click();
   await window.waitForTimeout(afterActionWait);
 }
 
 async function showObjectInTree(window, objectName, treeTestId = "mainObjectTree") {
-  const tree = window.getByTestId(treeTestId);
-  const row = tree.locator(".tree-row-wrapper").filter({ hasText: objectName });
-  await row.locator("button:has(.mdi-eye-off-outline, .mdi-eye-minus-outline)").first().click();
+  await getTreeRowByText(window, treeTestId, objectName)
+    .locator(".mdi-eye-off-outline")
+    .first()
+    .click({ force: true });
   await window.waitForTimeout(afterActionWait);
 }
 
-async function focusObjectInTree(window, folderName, objectName) {
-  await expandComponentsType(window, "mainObjectTree", folderName);
-  const mainObjectTree = window.getByTestId("mainObjectTree");
-  const row = mainObjectTree.locator(".tree-row-wrapper").filter({ hasText: objectName }).first();
-  await row.locator("button:has(.mdi-target)").click();
+async function openObjectTreeContextMenu(window, objectName, treeTestId = "mainObjectTree") {
+  await getTreeRowByText(window, treeTestId, objectName).click({ button: "right" });
   await window.waitForTimeout(afterActionWait);
 }
 
@@ -303,6 +299,7 @@ export {
   expandComponentsType,
   focusObjectInTree,
   hideObjectInTree,
+  openObjectTreeContextMenu,
   highlightData,
   hoverModelComponentRow,
   pointsVisibility,
@@ -313,6 +310,7 @@ export {
   hoverViewerCenter,
   showObjectInTree,
   changeColoringStyle,
+  getTreeRowByText,
 };
 
 export { loadData } from "./load.js";