From b7f165e2c670024a25ac33a899db241b5db49d99 Mon Sep 17 00:00:00 2001 From: Bill Smith Date: Wed, 30 Nov 2022 19:38:51 -0700 Subject: [PATCH] SHIBUI-2393 More test fixes. --- .../integration/resources/SHIBUI-1334-1.side | 16 ++--- .../integration/resources/SHIBUI-1392.side | 34 +++++----- .../integration/resources/SHIBUI-1674-1.side | 10 +-- .../integration/resources/SHIBUI-1744-3.side | 44 ++++++++----- .../integration/resources/SHIBUI-2269.side | 65 ++++++++++++++----- .../integration/resources/SHIBUI-2380.side | 4 +- 6 files changed, 109 insertions(+), 64 deletions(-) diff --git a/backend/src/integration/resources/SHIBUI-1334-1.side b/backend/src/integration/resources/SHIBUI-1334-1.side index 9385df45b..381c16c8a 100644 --- a/backend/src/integration/resources/SHIBUI-1334-1.side +++ b/backend/src/integration/resources/SHIBUI-1334-1.side @@ -2053,22 +2053,22 @@ "id": "a1050ebe-55c5-4eac-8d12-615f3ff1cd72", "comment": "", "command": "assertText", - "target": "css=div:nth-child(11) .text-truncate", + "target": "css=div:nth-child(10) .text-truncate", "targets": [ - ["css=div:nth-child(11) .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[11]/div/span[2]", "xpath:idRelative"], - ["xpath=//div[11]/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": "true" }, { "id": "43b130ff-e8a5-493d-a418-f1f8623f1de3", "comment": "", "command": "assertText", - "target": "css=div:nth-child(10) .text-truncate", + "target": "css=div:nth-child(8) .text-truncate", "targets": [ - ["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"] + ["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"] ], "value": "false" }, { diff --git a/backend/src/integration/resources/SHIBUI-1392.side b/backend/src/integration/resources/SHIBUI-1392.side index 1dc727268..94cbd2119 100644 --- a/backend/src/integration/resources/SHIBUI-1392.side +++ b/backend/src/integration/resources/SHIBUI-1392.side @@ -395,11 +395,11 @@ "id": "5699a5a2-d3df-4f99-b95d-f340f9156ffe", "comment": "", "command": "click", - "target": "css=.dropdown-item:nth-child(3)", + "target": "css=.show > .dropdown-item:nth-child(3)", "targets": [ - ["css=.dropdown-item:nth-child(3)", "css:finder"], + ["css=.show > .dropdown-item:nth-child(3)", "css:finder"], ["xpath=(//button[@type='button'])[16]", "xpath:attributes"], - ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[3]/div/div/div/fieldset/div/div/div/div/div/button[3]", "xpath:idRelative"], + ["xpath=//div[@id='root_nameIdFormatFilterTarget-group']/div/fieldset/div/div/div/div/div/button[3]", "xpath:idRelative"], ["xpath=//button[3]", "xpath:position"], ["xpath=//button[contains(.,'Script')]", "xpath:innerText"] ], @@ -508,20 +508,20 @@ ], "value": "eval(true);" }, { - "id": "4ec2c493-85e4-403b-9b09-031c5728f498", - "comment": "", - "command": "open", - "target": "/api/heheheheheheheWipeout", - "targets": [], - "value": "" - }, { - "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4", - "comment": "", - "command": "assertText", - "target": "css=body", - "targets": [], - "value": "yes, you did it" - }] + "id": "4ec2c493-85e4-403b-9b09-031c5728f498", + "comment": "", + "command": "open", + "target": "/api/heheheheheheheWipeout", + "targets": [], + "value": "" + }, { + "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4", + "comment": "", + "command": "assertText", + "target": "css=body", + "targets": [], + "value": "yes, you did it" + }] }], "suites": [{ "id": "4f69a686-bcaa-4963-84af-2e592e8c8842", diff --git a/backend/src/integration/resources/SHIBUI-1674-1.side b/backend/src/integration/resources/SHIBUI-1674-1.side index 98b22bea0..88ca762b4 100644 --- a/backend/src/integration/resources/SHIBUI-1674-1.side +++ b/backend/src/integration/resources/SHIBUI-1674-1.side @@ -493,9 +493,9 @@ "id": "c974e795-454e-4271-86ef-609e3538b28f", "comment": "", "command": "mouseOver", - "target": "css=.row:nth-child(1) > .col-12 .svg-inline--fa", + "target": "css=#root_organization_name-group path", "targets": [ - ["css=.row:nth-child(1) > .col-12 .svg-inline--fa", "css:finder"] + ["css=#root_organization_name-group path", "css:finder"] ], "value": "" }, { @@ -593,8 +593,10 @@ "id": "825b4bb3-e40e-4b02-a053-5f8e15b9b672", "comment": "", "command": "mouseOver", - "target": "css=.row:nth-child(1) > .col-12 .btn > .svg-inline--fa", - "targets": [], + "target": "css=#root_logoutEndpoints_0_url-group .info-icon path", + "targets": [ + ["css=#root_logoutEndpoints_0_url-group .info-icon path", "css:finder"] + ], "value": "" }, { "id": "8b309a28-ff0d-4e6b-8c49-26a9e13822d8", diff --git a/backend/src/integration/resources/SHIBUI-1744-3.side b/backend/src/integration/resources/SHIBUI-1744-3.side index 67e45e747..c66c543ee 100644 --- a/backend/src/integration/resources/SHIBUI-1744-3.side +++ b/backend/src/integration/resources/SHIBUI-1744-3.side @@ -259,6 +259,13 @@ ["xpath=//span[contains(.,'2. Common Attributes')]", "xpath:innerText"] ], "value": "" + }, { + "id": "1a12b13b-c746-4dec-ae20-de15e29de90b", + "comment": "", + "command": "waitForElementEditable", + "target": "id=root_xmlId", + "targets": [], + "value": "30000" }, { "id": "7cfab6d3-3982-423f-a99c-488e1d41e40b", "comment": "", @@ -470,12 +477,15 @@ ], "value": "Bundle - Test Bundle" }, { - "id": "caabc3c1-7ac7-4251-9885-fe2e3b7c4c10", + "id": "f4b2e9ae-cb20-4c41-8ad6-50004e75a865", "comment": "", "command": "click", "target": "css=fieldset > div > button", "targets": [ - ["css=.fa-check:nth-child(2) > path", "css:finder"] + ["css=.badge", "css:finder"], + ["xpath=//div[@id='root_attributeRelease-group']/div/fieldset/div/button/span", "xpath:idRelative"], + ["xpath=//div/button/span", "xpath:position"], + ["xpath=//span[contains(.,'Select Bundle')]", "xpath:innerText"] ], "value": "" }, { @@ -677,21 +687,21 @@ ["xpath=//section[3]/div/div[2]/div[2]/div[5]/div/span", "xpath:position"] ], "value": "true" - },{ - "id": "4ec2c493-85e4-403b-9b09-031c5728f498", - "comment": "", - "command": "open", - "target": "/api/heheheheheheheWipeout", - "targets": [], - "value": "" - }, { - "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4", - "comment": "", - "command": "assertText", - "target": "css=body", - "targets": [], - "value": "yes, you did it" - }] + }, { + "id": "4ec2c493-85e4-403b-9b09-031c5728f498", + "comment": "", + "command": "open", + "target": "/api/heheheheheheheWipeout", + "targets": [], + "value": "" + }, { + "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4", + "comment": "", + "command": "assertText", + "target": "css=body", + "targets": [], + "value": "yes, you did it" + }] }], "suites": [{ "id": "56040c8b-b45c-454e-b2ba-2a06056b397f", diff --git a/backend/src/integration/resources/SHIBUI-2269.side b/backend/src/integration/resources/SHIBUI-2269.side index f2848dddb..e8881bec7 100644 --- a/backend/src/integration/resources/SHIBUI-2269.side +++ b/backend/src/integration/resources/SHIBUI-2269.side @@ -211,6 +211,39 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" + }, { + "id": "033008de-7ccc-49ae-a944-a116364c3992", + "comment": "", + "command": "waitForElementEditable", + "target": "id=enable-switch-0", + "targets": [ + ["id=enable-switch-0", "id"], + ["css=#enable-switch-0", "css:finder"], + ["xpath=//input[@id='enable-switch-0']", "xpath:attributes"], + ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[6]/span/div/input", "xpath:idRelative"], + ["xpath=//span/div/input", "xpath:position"] + ], + "value": "30000" + }, { + "id": "ccbdf33d-b35d-44d3-93c2-1198329df520", + "comment": "", + "command": "click", + "target": "id=enable-switch-0", + "targets": [ + ["id=enable-switch-0", "id"], + ["css=#enable-switch-0", "css:finder"], + ["xpath=//input[@id='enable-switch-0']", "xpath:attributes"], + ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[6]/span/div/input", "xpath:idRelative"], + ["xpath=//span/div/input", "xpath:position"] + ], + "value": "" + }, { + "id": "c7660056-bb11-4d81-bfc1-30f04a4f1efd", + "comment": "", + "command": "waitForElementVisible", + "target": "css=.show", + "targets": [], + "value": "30000" }, { "id": "ab15e915-02b9-4616-9f92-ffcb0386918c", "comment": "", @@ -292,11 +325,11 @@ "id": "d01e44ab-802b-4d85-ac2e-e2e03a00c1c0", "comment": "", "command": "click", - "target": "css=.dropdown-item:nth-child(3)", + "target": "css=.show > .dropdown-item:nth-child(3)", "targets": [ - ["css=.dropdown-item:nth-child(3)", "css:finder"], + ["css=.show > .dropdown-item:nth-child(3)", "css:finder"], ["xpath=(//button[@type='button'])[17]", "xpath:attributes"], - ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[6]/div/div/div/fieldset/div/div/div/div/div/button[3]", "xpath:idRelative"], + ["xpath=//div[@id='root_entityAttributesFilterTarget-group']/div/fieldset/div/div/div/div/div/button[3]", "xpath:idRelative"], ["xpath=//div/button[3]", "xpath:position"], ["xpath=//button[contains(.,'Script')]", "xpath:innerText"] ], @@ -395,11 +428,11 @@ "id": "bce0cd29-246e-4f6e-a860-0eade5c73850", "comment": "", "command": "click", - "target": "css=.dropdown-item:nth-child(3)", + "target": "css=.show > .dropdown-item:nth-child(3)", "targets": [ - ["css=.dropdown-item:nth-child(3)", "css:finder"], + ["css=.show > .dropdown-item:nth-child(3)", "css:finder"], ["xpath=(//button[@type='button'])[16]", "xpath:attributes"], - ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[3]/div/div/div/fieldset/div/div/div/div/div/button[3]", "xpath:idRelative"], + ["xpath=//div[@id='root_nameIdFormatFilterTarget-group']/div/fieldset/div/div/div/div/div/button[3]", "xpath:idRelative"], ["xpath=//button[3]", "xpath:position"], ["xpath=//button[contains(.,'Script')]", "xpath:innerText"] ], @@ -458,25 +491,25 @@ "id": "802be014-0d04-4bda-93d1-ca7a5d7f802d", "comment": "", "command": "waitForElementVisible", - "target": "css=.text:nth-child(2)", + "target": "css=div:nth-child(5) .text-truncate", "targets": [ - ["css=.text:nth-child(2)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div/h2/span[2]", "xpath:idRelative"], - ["xpath=//h2/span[2]", "xpath:position"], - ["xpath=//span[contains(.,'Common Attributes')]", "xpath:innerText"] + ["css=div:nth-child(5) .text-truncate", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[5]/div/span[2]", "xpath:idRelative"], + ["xpath=//div[5]/div/span[2]", "xpath:position"], + ["xpath=//span[contains(.,'External Test')]", "xpath:innerText"] ], "value": "30000" }, { "id": "7e3e7d65-e0ff-4a2d-a0e9-5080bfefd4df", "comment": "", "command": "click", - "target": "css=.btn-outline-secondary", + "target": "css=div:nth-child(1) > .btn:nth-child(2)", "targets": [ - ["css=.btn-outline-secondary", "css:finder"], + ["css=div:nth-child(1) > .btn:nth-child(2)", "css:finder"], ["xpath=(//button[@type='button'])[5]", "xpath:attributes"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/div/div/div/div/button", "xpath:idRelative"], - ["xpath=//div/div/div/div/button", "xpath:position"], - ["xpath=//button[contains(.,'Enable')]", "xpath:innerText"] + ["xpath=//div[@id='navigation']/div/button", "xpath:idRelative"], + ["xpath=//div[2]/div/button", "xpath:position"], + ["xpath=//button[contains(.,' Filters')]", "xpath:innerText"] ], "value": "" }, { diff --git a/backend/src/integration/resources/SHIBUI-2380.side b/backend/src/integration/resources/SHIBUI-2380.side index a81cad5c3..ac159d3a3 100644 --- a/backend/src/integration/resources/SHIBUI-2380.side +++ b/backend/src/integration/resources/SHIBUI-2380.side @@ -1381,14 +1381,14 @@ "id": "eb9c18d9-d0fc-4723-840b-7be59434bebf", "comment": "", "command": "waitForElementVisible", - "target": "css=.alert", + "target": "css=.show", "targets": [], "value": "30000" }, { "id": "f27630e9-561e-49f6-b557-b2c7ff0647fc", "comment": "", "command": "assertText", - "target": "css=.alert", + "target": "css=.show", "targets": [], "value": "Metadata source has been deleted." }, {