Merge pull request #666 from easyops-cn/jojiang/ui-test

fix(): little optimization
easyops-cn · Dec 1, 2023 · 9034b5a · 9034b5a
2 parents 4c0bcc0 + 0264d9d
commit 9034b5a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 18 deletions.
diff --git a/bricks/ui-test/src/data-providers/preview/inspector.ts b/bricks/ui-test/src/data-providers/preview/inspector.ts
@@ -139,6 +139,7 @@ export function matchBrickElements(
     return {
       brick: conf.brick,
       element: conf.element,
+      shadowDom: conf.shadowDom,
       targets: conf.targets.map((target) => ({
         ...target,
         selectors: cloneDeep(target.selectors),
@@ -176,12 +177,14 @@ export function matchBrickElements(
                 if (hostElement.dataset.testid) {
                   hostBrickData = {
                     type: "testid",
+                    shadowDom: conf.shadowDom,
                     value: hostElement.dataset.testid,
                     tag,
                   };
                 } else if (hostElement.id) {
                   hostBrickData = {
                     type: "id",
+                    shadowDom: conf.shadowDom,
                     value: hostElement.id,
                     tag,
                   };

diff --git a/bricks/ui-test/src/data-providers/preview/interfaces.ts b/bricks/ui-test/src/data-providers/preview/interfaces.ts
@@ -15,6 +15,7 @@ export interface InspectSelector {
   value: string;
   tag: string;
   isolate?: boolean;
+  shadowDom?: boolean;
   eq?: number;
 }
 

diff --git a/shared/ui-test/src/data/bricks/basic-bricks.ts b/shared/ui-test/src/data/bricks/basic-bricks.ts
@@ -1,24 +1,6 @@
 import { BrickCommandConf } from "../../interfaces.js";
 
 export const basicBricks: BrickCommandConf[] = [
-  {
-    brick: "basic-bricks.general-button",
-    targets: [
-      {
-        selectors: [
-          {
-            type: "testid",
-            value: "button",
-          },
-        ],
-        actions: [
-          {
-            name: "click",
-          },
-        ],
-      },
-    ],
-  },
   {
     brick: "basic-bricks.general-custom-buttons",
     targets: [
@@ -64,6 +46,7 @@ export const basicBricks: BrickCommandConf[] = [
   },
   {
     brick: "basic-bricks.general-drawer",
+    shadowDom: true,
     targets: [
       {
         selectors: [
@@ -93,6 +76,7 @@ export const basicBricks: BrickCommandConf[] = [
   },
   {
     brick: "basic-bricks.general-modal",
+    shadowDom: true,
     targets: [
       {
         selectors: [