Merge remote-tracking branch 'origin/feature/shibui-2380' into featur…

…e/shibui-2380
TIER · Oct 25, 2022 · 95708fb · 95708fb
2 parents 9a6337d + e4c9b24
commit 95708fb
Show file tree

Hide file tree

Showing 16 changed files with 573 additions and 464 deletions.
diff --git a/backend/src/integration/resources/SHIBUI-1333.side b/backend/src/integration/resources/SHIBUI-1333.side
@@ -2290,11 +2290,11 @@
       "id": "951a21c9-4cd3-4989-8dc0-77760ca0dc95",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)",
+      "target": "css=div:nth-child(8) .text-truncate",
       "targets": [
-        ["css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:position"],
+        ["css=div:nth-child(8) .text-truncate", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[8]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//div[8]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'responder-id-123')]", "xpath:innerText"]
       ],
       "value": "responder-id-123"

diff --git a/backend/src/integration/resources/SHIBUI-1334-1.side b/backend/src/integration/resources/SHIBUI-1334-1.side
@@ -2022,13 +2022,13 @@
       "id": "43b130ff-e8a5-493d-a418-f1f8623f1de3",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(8) .text-truncate",
+      "target": "css=div:nth-child(10) .text-truncate",
       "targets": [
-        ["css=div:nth-child(8) .text-truncate", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[8]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//div[8]/div/span[2]", "xpath:position"]
+        ["css=div:nth-child(10) .text-truncate", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[10]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//div[10]/div/span[2]", "xpath:position"]
       ],
-      "value": "false"
+      "value": "true"
     }, {
       "id": "1406d7e4-907d-4359-8de8-a40206f0993e",
       "comment": "",
@@ -2312,11 +2312,11 @@
       "id": "951a21c9-4cd3-4989-8dc0-77760ca0dc95",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)",
+      "target": "css=div:nth-child(8) .text-truncate",
       "targets": [
-        ["css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:position"],
+        ["css=div:nth-child(8) .text-truncate", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[8]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//div[8]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'responder-id-123')]", "xpath:innerText"]
       ],
       "value": "responder-id-123"
@@ -2748,7 +2748,7 @@
       "id": "bde2bbbb-df66-4e07-a770-ec9125fe3e81",
       "comment": "",
       "command": "pause",
-      "target": "5000",
+      "target": "7000",
       "targets": [],
       "value": ""
     }, {

diff --git a/backend/src/integration/resources/SHIBUI-1364-1.side b/backend/src/integration/resources/SHIBUI-1364-1.side
@@ -2364,7 +2364,11 @@
       "command": "waitForElementEditable",
       "target": "css=#filters > div:nth-child(3) > div:nth-child(2) > div > button",
       "targets": [
-        ["css=.d-flex:nth-child(3) > .border-primary:nth-child(2) .svg-inline--fa", "css:finder"]
+        ["css=.d-flex:nth-child(3) > .border-primary:nth-child(2) .mx-auto", "css:finder"],
+        ["xpath=(//button[@type='button'])[6]", "xpath:attributes"],
+        ["xpath=//div[@id='filters']/div[3]/div[2]/div/button", "xpath:idRelative"],
+        ["xpath=//div[2]/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Compare')]", "xpath:innerText"]
       ],
       "value": "30000"
     }, {
@@ -2373,7 +2377,7 @@
       "command": "click",
       "target": "css=#filters > div:nth-child(3) > div:nth-child(2) > div > button",
       "targets": [
-        ["css=.d-flex:nth-child(3) > .border-primary:nth-child(2) .svg-inline--fa", "css:finder"]
+        ["css=.d-flex:nth-child(3) > .border-primary:nth-child(2) path", "css:finder"]
       ],
       "value": ""
     }, {

diff --git a/backend/src/integration/resources/SHIBUI-1385-1.side b/backend/src/integration/resources/SHIBUI-1385-1.side
diff --git a/backend/src/integration/resources/SHIBUI-1407-1.side b/backend/src/integration/resources/SHIBUI-1407-1.side
diff --git a/backend/src/integration/resources/SHIBUI-1674-1.side b/backend/src/integration/resources/SHIBUI-1674-1.side
@@ -348,9 +348,9 @@
       "id": "56f49fe8-340c-46fa-bda9-0b3c0de98bdb",
       "comment": "",
       "command": "mouseOver",
-      "target": "css=.row:nth-child(1) > .col-12:nth-child(1) > .mb-3:nth-child(1) path:nth-child(1)",
+      "target": "css=.row:nth-child(5) .svg-inline--fa:nth-child(2)",
       "targets": [
-        ["css=.row:nth-child(1) > .col-12:nth-child(1) > .mb-3:nth-child(1) path:nth-child(1)", "css:finder"]
+        ["css=.row:nth-child(5) .svg-inline--fa:nth-child(2)", "css:finder"]
       ],
       "value": ""
     }, {
@@ -385,7 +385,7 @@
       "id": "54a74399-69aa-4412-85c2-a5bbb543d8be",
       "comment": "",
       "command": "mouseOver",
-      "target": "css=.row:nth-child(9) path:nth-child(1)",
+      "target": "css=.row:nth-child(11) path:nth-child(1)",
       "targets": [
         ["css=.row:nth-child(9) path:nth-child(1)", "css:finder"]
       ],
@@ -719,7 +719,7 @@
       "id": "2928ba27-b934-499e-8dda-8441dbbb463d",
       "comment": "",
       "command": "mouseOver",
-      "target": "css=.row:nth-child(8) path:nth-child(1)",
+      "target": "css=.row:nth-child(10) path:nth-child(1)",
       "targets": [
         ["css=.row:nth-child(8) path:nth-child(1)", "css:finder"]
       ],

diff --git a/backend/src/integration/resources/SHIBUI-1674-2.side b/backend/src/integration/resources/SHIBUI-1674-2.side
@@ -170,6 +170,19 @@
         ["xpath=//li[2]/button", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "93443481-aa70-4742-8501-a4a562235ae7",
+      "comment": "",
+      "command": "waitForElementEditable",
+      "target": "id=root_xmlId",
+      "targets": [
+        ["id=root_xmlId", "id"],
+        ["css=#root_xmlId", "css:finder"],
+        ["xpath=//input[@id='root_xmlId']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[2]/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//input", "xpath:position"]
+      ],
+      "value": "30000"
     }, {
       "id": "6d8efa55-ad05-4a15-b65a-74622feff0af",
       "comment": "",
@@ -1284,9 +1297,9 @@
       "id": "583b61c9-b021-452b-b488-1faf2be311b6",
       "comment": "",
       "command": "mouseOver",
-      "target": "css=.row:nth-child(6) .svg-inline--fa:nth-child(2)",
+      "target": "css=.row:nth-child(9) path:nth-child(1)",
       "targets": [
-        ["css=.row:nth-child(6) .svg-inline--fa:nth-child(2)", "css:finder"]
+        ["css=.row:nth-child(9) path:nth-child(1)", "css:finder"]
       ],
       "value": ""
     }, {

diff --git a/backend/src/integration/resources/SHIBUI-1732-1.side b/backend/src/integration/resources/SHIBUI-1732-1.side
@@ -403,7 +403,7 @@
       "target": "css=.row:nth-child(8) .form-label > span",
       "targets": [
         ["css=.row:nth-child(8) .form-label > span", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[8]/div/div/div/div/label/span", "xpath:idRelative"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[8]/div/div/div/div[8]/div/div/div/div/label/span", "xpath:idRelative"],
         ["xpath=//div[8]/div/div/div/div/label/span", "xpath:position"],
         ["xpath=//span[contains(.,'Custom String Display')]", "xpath:innerText"]
       ],
@@ -417,8 +417,8 @@
         ["id=root_relyingPartyOverrides_CustomString", "id"],
         ["css=#root_relyingPartyOverrides_CustomString", "css:finder"],
         ["xpath=//input[@id='root_relyingPartyOverrides_CustomString']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[7]/div/div/div/div/input", "xpath:idRelative"],
-        ["xpath=//div[7]/div/div/div/div/input", "xpath:position"]
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[8]/div/div/div/div[8]/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[8]/div/div/div/div/input", "xpath:position"]
       ],
       "value": "Custom String Default"
     }, {

diff --git a/backend/src/integration/resources/SHIBUI-1732-2.side b/backend/src/integration/resources/SHIBUI-1732-2.side
@@ -196,6 +196,19 @@
         ["xpath=//div[6]/div/div/input", "xpath:position"]
       ],
       "value": "Custom Boolean Help"
+    }, {
+      "id": "053668db-f394-490f-bc83-cf3333107383",
+      "comment": "",
+      "command": "click",
+      "target": "id=root_defaultValueBoolean-False",
+      "targets": [
+        ["id=root_defaultValueBoolean-False", "id"],
+        ["css=#root_defaultValueBoolean-False", "css:finder"],
+        ["xpath=//input[@id='root_defaultValueBoolean-False']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div/form/div/div/div/div/div[2]/div/div/div/div[2]/input", "xpath:idRelative"],
+        ["xpath=//div[2]/input", "xpath:position"]
+      ],
+      "value": ""
     }, {
       "id": "1c1e0a14-a4be-406d-80c5-809de8704799",
       "comment": "",
@@ -374,11 +387,11 @@
       "id": "fb8782e1-3376-4c59-af8a-5cf383c78239",
       "comment": "",
       "command": "assertText",
-      "target": "css=.row:nth-child(7) .d-flex > span",
+      "target": "css=.row:nth-child(5) .d-flex > span",
       "targets": [
-        ["css=.row:nth-child(7) .d-flex > span", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[7]/div/div/div/div/div/label/span/span", "xpath:idRelative"],
-        ["xpath=//div[7]/div/div/div/div/div/label/span/span", "xpath:position"]
+        ["css=.row:nth-child(5) .d-flex > span", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[8]/div/div/div/div[5]/div/div/div/div/div/label/span/span", "xpath:idRelative"],
+        ["xpath=//div[5]/div/div/div/div/div/label/span/span", "xpath:position"]
       ],
       "value": "Custom Boolean Display"
     }, {
@@ -435,23 +448,23 @@
       "id": "a7db0511-2584-4cb0-bbaa-2341a705ef07",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(8) div:nth-child(7) .d-block:nth-child(1)",
+      "target": "css=.mb-4:nth-child(8) div:nth-child(5) .d-block:nth-child(1)",
       "targets": [
-        ["css=.mb-4:nth-child(8) div:nth-child(7) .d-block:nth-child(1)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[7]/div/span", "xpath:idRelative"],
-        ["xpath=//section[8]/div/div[2]/div[2]/div/div[7]/div/span", "xpath:position"],
+        ["css=.mb-4:nth-child(8) div:nth-child(5) .d-block:nth-child(1)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[5]/div/span", "xpath:idRelative"],
+        ["xpath=//section[8]/div/div[2]/div[2]/div/div[5]/div/span", "xpath:position"],
         ["xpath=//span[contains(.,'Custom Boolean Display')]", "xpath:innerText"]
       ],
       "value": "Custom Boolean Display"
     }, {
       "id": "771a8f70-ed99-486f-90f3-3401215d8743",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(8) div:nth-child(7) .d-block:nth-child(2)",
+      "target": "css=.mb-4:nth-child(8) div:nth-child(5) .d-block:nth-child(2)",
       "targets": [
-        ["css=.mb-4:nth-child(8) div:nth-child(7) .d-block:nth-child(2)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//section[8]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:position"],
+        ["css=.mb-4:nth-child(8) div:nth-child(5) .d-block:nth-child(2)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[5]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//section[8]/div/div[2]/div[2]/div/div[5]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'true')]", "xpath:innerText"]
       ],
       "value": "true"
@@ -493,23 +506,23 @@
       "id": "4dc24329-7c83-43c9-86d6-95f9bf5da92d",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(1)",
+      "target": "css=.mb-4:nth-child(9) div:nth-child(5) .d-block:nth-child(1)",
       "targets": [
-        ["css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(1)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[7]/div/span", "xpath:idRelative"],
-        ["xpath=//section[7]/div/div[2]/div[2]/div/div[7]/div/span", "xpath:position"],
+        ["css=.mb-4:nth-child(9) div:nth-child(5) .d-block:nth-child(1)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[5]/div/span", "xpath:idRelative"],
+        ["xpath=//section[7]/div/div[2]/div[2]/div/div[5]/div/span", "xpath:position"],
         ["xpath=//span[contains(.,'Custom Boolean Display')]", "xpath:innerText"]
       ],
       "value": "Custom Boolean Display"
     }, {
       "id": "32f6aaa6-a256-4c36-932e-7c45b4045cba",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)",
+      "target": "css=.mb-4:nth-child(9) div:nth-child(5) .d-block:nth-child(2)",
       "targets": [
-        ["css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:position"],
+        ["css=.mb-4:nth-child(9) div:nth-child(5) .d-block:nth-child(2)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[5]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//section[7]/div/div[2]/div[2]/div/div[5]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'true')]", "xpath:innerText"]
       ],
       "value": "true"
@@ -840,11 +853,11 @@
       "id": "73e0928e-a395-4cdd-b90c-229a01cbe7c4",
       "comment": "",
       "command": "assertText",
-      "target": "css=.row:nth-child(7) > .col-12 > .mb-3 > div > .checkbox .d-flex > span",
+      "target": "css=.row:nth-child(5) .d-flex > span",
       "targets": [
-        ["css=.row:nth-child(7) > .col-12 > .mb-3 > div > .checkbox .d-flex > span", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div[7]/div/div/div/div/div/label/span/span", "xpath:idRelative"],
-        ["xpath=//div[7]/div/div/div/div/div/label/span/span", "xpath:position"]
+        ["css=.row:nth-child(5) .d-flex > span", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div[5]/div/div/div/div/div/label/span/span", "xpath:idRelative"],
+        ["xpath=//div[5]/div/div/div/div/div/label/span/span", "xpath:position"]
       ],
       "value": "Custom Boolean Display"
     }, {
@@ -897,23 +910,23 @@
       "id": "d445f01f-b936-4ebb-b011-8ce2f056e06c",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(1) > div:nth-child(7) .d-block:nth-child(1)",
+      "target": "css=.mb-4:nth-child(4) div:nth-child(5) .d-block:nth-child(1)",
       "targets": [
-        ["css=div:nth-child(1) > div:nth-child(7) .d-block:nth-child(1)", "css:finder"],
-        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[7]/div/span", "xpath:idRelative"],
-        ["xpath=//div[2]/div[2]/div/div[7]/div/span", "xpath:position"],
+        ["css=.mb-4:nth-child(4) div:nth-child(5) .d-block:nth-child(1)", "css:finder"],
+        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[5]/div/span", "xpath:idRelative"],
+        ["xpath=//section[2]/div/div[2]/div[2]/div/div[5]/div/span", "xpath:position"],
         ["xpath=//span[contains(.,'Custom Boolean Display')]", "xpath:innerText"]
       ],
       "value": "Custom Boolean Display"
     }, {
       "id": "662f922e-4d41-4274-b7a3-aae312fe8c36",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(1) > div:nth-child(7) .text-truncate",
+      "target": "css=.mb-4:nth-child(4) div:nth-child(5) .d-block:nth-child(2)",
       "targets": [
-        ["css=div:nth-child(1) > div:nth-child(7) .text-truncate", "css:finder"],
-        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//div[2]/div[2]/div/div[7]/div/span[2]", "xpath:position"]
+        ["css=.mb-4:nth-child(4) div:nth-child(5) .d-block:nth-child(2)", "css:finder"],
+        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[5]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//section[2]/div/div[2]/div[2]/div/div[5]/div/span[2]", "xpath:position"]
       ],
       "value": "true"
     }, {