diff --git a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy index 88532ed60..a2e0c708c 100644 --- a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy +++ b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy @@ -88,29 +88,29 @@ class SeleniumSIDETest extends Specification { // TODO: Uncomment the below commented tests once they've been updated to use the new configuration screen where: name | file -// 'SHIBUI-1364: Compare FBHTTPMP with filters' | '/SHIBUI-1364-1.side' -// 'SHIBUI-1364: Compare FSMP with filters' | '/SHIBUI-1364-2.side' -// 'SHIBUI-1364: Compare LDMP with filters' | '/SHIBUI-1364-3.side' -// 'SHIBUI-1364: Compare DHTTPMP with filters' | '/SHIBUI-1364-4.side' + 'SHIBUI-1364: Compare FBHTTPMP with filters' | '/SHIBUI-1364-1.side' + 'SHIBUI-1364: Compare FSMP with filters' | '/SHIBUI-1364-2.side' + 'SHIBUI-1364: Compare LDMP with filters' | '/SHIBUI-1364-3.side' + 'SHIBUI-1364: Compare DHTTPMP with filters' | '/SHIBUI-1364-4.side' 'SHIBUI-1281: Metadata Source Dashboard' | '/SHIBUI-1281.side' 'SHIBUI-1311: Metadata Provider Dashboard' | '/SHIBUI-1311.side' 'SHIBUI-950: Metadata Source from XML w/ digest' | '/SHIBUI-950.side' -// 'SHIBUI-1352: Create LocalDynamic provider' | '/SHIBUI-1352-1.side' -// 'SHIBUI-1352: Create FileSystem provider' | '/SHIBUI-1352-2.side' + 'SHIBUI-1352: Create LocalDynamic provider' | '/SHIBUI-1352-1.side' + 'SHIBUI-1352: Create FileSystem provider' | '/SHIBUI-1352-2.side' 'SHIBUI-1333: Verify metadata source configuration' | '/SHIBUI-1333.side' 'SHIBUI-1334: Verify metadata source versioning' | '/SHIBUI-1334-1.side' -// 'SHIBUI-1334: Verify metadata provider versioning' | '/SHIBUI-1334-2.side' -// 'SHIBUI-1335: Verify File Backed HTTP Metadata Provider Filters' | '/SHIBUI-1335-1.side' -// 'SHIBUI-1335: Verify Filesystem Metadata Provider Filters' | '/SHIBUI-1335-2.side' -// 'SHIBUI-1335: Verify Local Dynamic Metadata Provider Filters' | '/SHIBUI-1335-3.side' -// 'SHIBUI-1335: Verify Dynamic HTTP Metadata Provider Filters' | '/SHIBUI-1335-4.side' -// 'SHIBUI-1392: Verify provider with script filter is persistable' | '/SHIBUI-1392.side' -// 'SHIBUI-1361: Verify dates display in proper format' | '/SHIBUI-1361.side' + 'SHIBUI-1334: Verify metadata provider versioning' | '/SHIBUI-1334-2.side' + 'SHIBUI-1335: Verify File Backed HTTP Metadata Provider Filters' | '/SHIBUI-1335-1.side' + 'SHIBUI-1335: Verify Filesystem Metadata Provider Filters' | '/SHIBUI-1335-2.side' + 'SHIBUI-1335: Verify Local Dynamic Metadata Provider Filters' | '/SHIBUI-1335-3.side' + 'SHIBUI-1335: Verify Dynamic HTTP Metadata Provider Filters' | '/SHIBUI-1335-4.side' + 'SHIBUI-1392: Verify provider with script filter is persistable' | '/SHIBUI-1392.side' + 'SHIBUI-1361: Verify dates display in proper format' | '/SHIBUI-1361.side' 'SHIBUI-1385: Restore a metadata source version' | '/SHIBUI-1385-1.side' -// 'SHIBUI-1385: Restore a metadata provider version' | '/SHIBUI-1385-2.side' + 'SHIBUI-1385: Restore a metadata provider version' | '/SHIBUI-1385-2.side' 'SHIBUI-1391: Regex Validation' | '/SHIBUI-1391.side' 'SHIBUI-1407: Metadata source comparison highlights' | '/SHIBUI-1407-1.side' -// 'SHIBUI-1407: Metadata provider comparison highlights' | '/SHIBUI-1407-2.side' + 'SHIBUI-1407: Metadata provider comparison highlights' | '/SHIBUI-1407-2.side' } } diff --git a/backend/src/integration/resources/SHIBUI-1335-1.side b/backend/src/integration/resources/SHIBUI-1335-1.side index 3310e52e9..db15623ec 100644 --- a/backend/src/integration/resources/SHIBUI-1335-1.side +++ b/backend/src/integration/resources/SHIBUI-1335-1.side @@ -571,20 +571,6 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" - }, { - "id": "12673aa7-fc4e-4877-9842-a9d88dbc2d97", - "comment": "", - "command": "click", - "target": "linkText=File Backed HTTP Metadata Provider", - "targets": [ - ["linkText=File Backed HTTP Metadata Provider", "linkText"], - ["css=td > a", "css:finder"], - ["xpath=//a[contains(text(),'File Backed HTTP Metadata Provider')]", "xpath:link"], - ["xpath=//a[contains(@href, '/metadata/provider/da22a0b7-40d7-418c-bbe9-7ba4c37d3905/configuration/options')]", "xpath:href"], - ["xpath=//td[2]/a", "xpath:position"], - ["xpath=//a[contains(.,'File Backed HTTP Metadata Provider')]", "xpath:innerText"] - ], - "value": "" }, { "id": "daa2d46a-d238-4a48-aca7-0f34c9b93d5f", "comment": "", @@ -1630,21 +1616,23 @@ "id": "100902ee-6d6e-4148-a69b-b37746a4ad6e", "comment": "", "command": "assertText", - "target": "css=tr:nth-child(1) > .td-lg:nth-child(3)", + "target": "css=.list-group-item:nth-child(1) > filter-configuration-list-item > .d-flex > .btn", "targets": [ - ["css=tr:nth-child(1) > .td-lg:nth-child(3)", "css:finder"], - ["xpath=//td[3]", "xpath:position"], - ["xpath=//td[contains(.,'Entity Attributes Filter')]", "xpath:innerText"] + ["css=.list-group-item:nth-child(1) > filter-configuration-list-item > .d-flex > .btn", "css:finder"], + ["xpath=//div[@id='filters']/filter-configuration-list/ul/li/filter-configuration-list-item/div/button", "xpath:idRelative"], + ["xpath=//filter-configuration-list-item/div/button", "xpath:position"], + ["xpath=//button[contains(.,'Entity Attributes Filter')]", "xpath:innerText"] ], "value": "Entity Attributes Filter" }, { "id": "9cc5dbab-bb39-455d-9338-6bdd054841e0", "comment": "", "command": "click", - "target": "css=tr:nth-child(1) .fa-arrow-circle-down", + "target": "css=.list-group-item:nth-child(1) .btn:nth-child(2)", "targets": [ - ["css=tr:nth-child(1) .fa-arrow-circle-down", "css:finder"], - ["xpath=//button[2]/i", "xpath:position"] + ["css=.list-group-item:nth-child(1) .btn:nth-child(2)", "css:finder"], + ["xpath=//div[@id='filters']/filter-configuration-list/ul/li/filter-configuration-list-item/div/div/button[2]", "xpath:idRelative"], + ["xpath=//button[2]", "xpath:position"] ], "value": "" }, { @@ -1658,7 +1646,7 @@ "id": "c9d498da-9f59-40ae-b5d4-cae397a13766", "comment": "", "command": "assertText", - "target": "css=tr:nth-child(1) > .td-lg:nth-child(3)", + "target": "css=.list-group-item:nth-child(1) > filter-configuration-list-item > .d-flex > .btn", "targets": [ ["css=tr:nth-child(1) > .td-lg:nth-child(3)", "css:finder"], ["xpath=//td[3]", "xpath:position"], @@ -1669,7 +1657,7 @@ "id": "1b05bac6-3412-4f4d-b168-0f7fb124e5d0", "comment": "", "command": "click", - "target": "css=tr:nth-child(1) .fa-arrow-circle-down", + "target": "css=.list-group-item:nth-child(1) .btn:nth-child(2)", "targets": [ ["css=tr:nth-child(1) .fa-arrow-circle-down", "css:finder"], ["xpath=//button[2]/i", "xpath:position"] @@ -1686,7 +1674,7 @@ "id": "441608df-24a3-4a60-bfce-50a90ff0ee16", "comment": "", "command": "assertText", - "target": "css=tr:nth-child(1) > .td-lg:nth-child(3)", + "target": "css=.list-group-item:nth-child(1) > filter-configuration-list-item > .d-flex > .btn", "targets": [ ["css=tr:nth-child(1) > .td-lg:nth-child(3)", "css:finder"], ["xpath=//td[3]", "xpath:position"], diff --git a/backend/src/integration/resources/SHIBUI-1335-2.side b/backend/src/integration/resources/SHIBUI-1335-2.side index 623d68b8d..f74c372a9 100644 --- a/backend/src/integration/resources/SHIBUI-1335-2.side +++ b/backend/src/integration/resources/SHIBUI-1335-2.side @@ -302,34 +302,21 @@ "id": "27c0717e-f477-448b-8091-3bb2f3e6080f", "comment": "", "command": "waitForElementVisible", - "target": "css=td:nth-child(3)", + "target": "css=.d-block > primitive-property:nth-child(2) .text-truncate", "targets": [], "value": "10000" }, { "id": "20f7b832-ec52-450a-8224-399f0d4de0a0", "comment": "", "command": "assertText", - "target": "css=td:nth-child(3)", + "target": "css=.d-block > primitive-property:nth-child(2) .text-truncate", "targets": [ - ["css=td:nth-child(3)", "css:finder"], - ["xpath=//td[3]", "xpath:position"], - ["xpath=//td[contains(.,'FilesystemMetadataResolver')]", "xpath:innerText"] + ["css=.d-block > primitive-property:nth-child(2) .text-truncate", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section/div/div[2]/object-property/primitive-property[2]/div/div/span[2]", "xpath:idRelative"], + ["xpath=//primitive-property[2]/div/div/span[2]", "xpath:position"], + ["xpath=//span[contains(.,'FilesystemMetadataResolver')]", "xpath:innerText"] ], "value": "FilesystemMetadataResolver" - }, { - "id": "7548f260-d328-4b47-97ed-cf6df394b6bc", - "comment": "", - "command": "click", - "target": "linkText=Filesystem Metadata Provider", - "targets": [ - ["linkText=Filesystem Metadata Provider", "linkText"], - ["css=td > a", "css:finder"], - ["xpath=//a[contains(text(),'Filesystem Metadata Provider')]", "xpath:link"], - ["xpath=//a[contains(@href, '/metadata/provider/5ddf2624-1a30-4709-8873-35bbba4a372f/configuration/options')]", "xpath:href"], - ["xpath=//td[2]/a", "xpath:position"], - ["xpath=//a[contains(.,'Filesystem Metadata Provider')]", "xpath:innerText"] - ], - "value": "" }, { "id": "11d71ffb-3372-41cb-9832-72755ef298b5", "comment": "", @@ -755,21 +742,23 @@ "id": "d722902b-5c10-45dc-99df-d96f46e78313", "comment": "", "command": "assertText", - "target": "css=tr:nth-child(1) > .td-lg:nth-child(4)", + "target": "css=.list-group-item:nth-child(1) span:nth-child(4)", "targets": [ - ["css=tr:nth-child(1) > .td-lg:nth-child(4)", "css:finder"], - ["xpath=//td[4]", "xpath:position"], - ["xpath=//td[contains(.,'EntityAttributes')]", "xpath:innerText"] + ["css=.list-group-item:nth-child(1) span:nth-child(4)", "css:finder"], + ["xpath=//div[@id='filters']/filter-configuration-list/ul/li/filter-configuration-list-item/div/span[2]", "xpath:idRelative"], + ["xpath=//filter-configuration-list-item/div/span[2]", "xpath:position"], + ["xpath=//span[contains(.,'EntityAttributes')]", "xpath:innerText"] ], "value": "EntityAttributes" }, { "id": "c8d9bc5a-4b7e-4178-8aba-8b8280506c20", "comment": "", "command": "click", - "target": "css=tr:nth-child(1) .fa-arrow-circle-down", + "target": "css=.list-group-item:nth-child(1) .btn:nth-child(2)", "targets": [ - ["css=tr:nth-child(1) .fa-arrow-circle-down", "css:finder"], - ["xpath=//button[2]/i", "xpath:position"] + ["css=.list-group-item:nth-child(1) .btn:nth-child(2)", "css:finder"], + ["xpath=//div[@id='filters']/filter-configuration-list/ul/li/filter-configuration-list-item/div/div/button[2]", "xpath:idRelative"], + ["xpath=//button[2]", "xpath:position"] ], "value": "" }, { @@ -783,7 +772,7 @@ "id": "d7909094-96ce-4532-98b4-446cc013c9c8", "comment": "", "command": "assertText", - "target": "css=tr:nth-child(1) > .td-lg:nth-child(4)", + "target": "css=.list-group-item:nth-child(1) span:nth-child(4)", "targets": [ ["css=tr:nth-child(1) > .td-lg:nth-child(4)", "css:finder"], ["xpath=//td[4]", "xpath:position"], diff --git a/backend/src/integration/resources/SHIBUI-1335-3.side b/backend/src/integration/resources/SHIBUI-1335-3.side index a656ec10a..90ac4f016 100644 --- a/backend/src/integration/resources/SHIBUI-1335-3.side +++ b/backend/src/integration/resources/SHIBUI-1335-3.side @@ -379,34 +379,21 @@ "id": "02e53e75-003b-42ce-8522-817d52ad16a3", "comment": "", "command": "waitForElementVisible", - "target": "css=td:nth-child(3)", + "target": "css=.d-block > primitive-property:nth-child(2) .text-truncate", "targets": [], "value": "10000" }, { "id": "7d059a57-60f7-4729-95af-b36619b98694", "comment": "", "command": "assertText", - "target": "css=td:nth-child(3)", + "target": "css=.d-block > primitive-property:nth-child(2) .text-truncate", "targets": [ - ["css=td:nth-child(3)", "css:finder"], - ["xpath=//td[3]", "xpath:position"], - ["xpath=//td[contains(.,'LocalDynamicMetadataResolver')]", "xpath:innerText"] + ["css=.d-block > primitive-property:nth-child(2) .text-truncate", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section/div/div[2]/object-property/primitive-property[2]/div/div/span[2]", "xpath:idRelative"], + ["xpath=//primitive-property[2]/div/div/span[2]", "xpath:position"], + ["xpath=//span[contains(.,'LocalDynamicMetadataResolver')]", "xpath:innerText"] ], "value": "LocalDynamicMetadataResolver" - }, { - "id": "15912a4b-c036-4886-9577-312bf6816943", - "comment": "", - "command": "click", - "target": "linkText=Local Dynamic Metadata Provider", - "targets": [ - ["linkText=Local Dynamic Metadata Provider", "linkText"], - ["css=td > a", "css:finder"], - ["xpath=//a[contains(text(),'Local Dynamic Metadata Provider')]", "xpath:link"], - ["xpath=//a[contains(@href, '/metadata/provider/dff5232d-66fb-4623-b25e-85c24df5ede4/configuration/options')]", "xpath:href"], - ["xpath=//td[2]/a", "xpath:position"], - ["xpath=//a[contains(.,'Local Dynamic Metadata Provider')]", "xpath:innerText"] - ], - "value": "" }, { "id": "feb08e76-e553-4505-bffe-07f3e77206d0", "comment": "", @@ -652,18 +639,19 @@ "id": "af17a3a7-f292-4c22-8f2f-3d3bf1938fc1", "comment": "", "command": "waitForElementVisible", - "target": "css=.td-lg:nth-child(4)", + "target": "css=span:nth-child(4)", "targets": [], "value": "10000" }, { "id": "2b9c0a43-fd7a-4ffa-bfef-a7fc41746e16", "comment": "", "command": "assertText", - "target": "css=.td-lg:nth-child(4)", + "target": "css=span:nth-child(4)", "targets": [ - ["css=.td-lg:nth-child(4)", "css:finder"], - ["xpath=//td[4]", "xpath:position"], - ["xpath=//td[contains(.,'EntityAttributes')]", "xpath:innerText"] + ["css=span:nth-child(4)", "css:finder"], + ["xpath=//div[@id='filters']/filter-configuration-list/ul/li/filter-configuration-list-item/div/span[2]", "xpath:idRelative"], + ["xpath=//filter-configuration-list-item/div/span[2]", "xpath:position"], + ["xpath=//span[contains(.,'EntityAttributes')]", "xpath:innerText"] ], "value": "EntityAttributes" }, { @@ -884,10 +872,11 @@ "id": "9f7e95cf-4dd5-415f-8577-a6f1bc54a85d", "comment": "", "command": "click", - "target": "css=tr:nth-child(1) .fa-arrow-circle-down", + "target": "css=.list-group-item:nth-child(1) .btn:nth-child(2)", "targets": [ - ["css=tr:nth-child(1) .fa-arrow-circle-down", "css:finder"], - ["xpath=//button[2]/i", "xpath:position"] + ["css=.list-group-item:nth-child(1) .btn:nth-child(2)", "css:finder"], + ["xpath=//div[@id='filters']/filter-configuration-list/ul/li/filter-configuration-list-item/div/div/button[2]", "xpath:idRelative"], + ["xpath=//button[2]", "xpath:position"] ], "value": "" }, { @@ -901,18 +890,19 @@ "id": "4a73b268-7d33-4e8c-8fa4-cb059be9768f", "comment": "", "command": "assertText", - "target": "css=tr:nth-child(1) > .td-lg:nth-child(4)", + "target": "css=.list-group-item:nth-child(1) span:nth-child(4)", "targets": [ - ["css=tr:nth-child(1) > .td-lg:nth-child(4)", "css:finder"], - ["xpath=//td[4]", "xpath:position"], - ["xpath=//td[contains(.,'NameIDFormat')]", "xpath:innerText"] + ["css=.list-group-item:nth-child(1) span:nth-child(4)", "css:finder"], + ["xpath=//div[@id='filters']/filter-configuration-list/ul/li/filter-configuration-list-item/div/span[2]", "xpath:idRelative"], + ["xpath=//filter-configuration-list-item/div/span[2]", "xpath:position"], + ["xpath=//span[contains(.,'EntityAttributes')]", "xpath:innerText"] ], "value": "NameIDFormat" }, { "id": "63ac7307-0538-4c0d-8e98-2f05c767baaf", "comment": "", "command": "click", - "target": "css=tr:nth-child(1) .fa-arrow-circle-down", + "target": "css=.list-group-item:nth-child(1) .btn:nth-child(2)", "targets": [ ["css=tr:nth-child(1) .fa-arrow-circle-down", "css:finder"], ["xpath=//button[2]/i", "xpath:position"] @@ -929,7 +919,7 @@ "id": "ed8e07ff-0dce-47d6-8310-f1920bfe1367", "comment": "", "command": "assertText", - "target": "css=tr:nth-child(1) > .td-lg:nth-child(4)", + "target": "css=.list-group-item:nth-child(1) span:nth-child(4)", "targets": [ ["css=tr:nth-child(1) > .td-lg:nth-child(4)", "css:finder"], ["xpath=//td[4]", "xpath:position"], diff --git a/backend/src/integration/resources/SHIBUI-1335-4.side b/backend/src/integration/resources/SHIBUI-1335-4.side index 69a78cf98..263dec4a3 100644 --- a/backend/src/integration/resources/SHIBUI-1335-4.side +++ b/backend/src/integration/resources/SHIBUI-1335-4.side @@ -607,34 +607,21 @@ "id": "ae27b108-a2f4-4d4b-b375-b582ccc0ef56", "comment": "", "command": "waitForElementVisible", - "target": "css=td:nth-child(3)", + "target": "css=.d-block > primitive-property:nth-child(2) .text-truncate", "targets": [], "value": "10000" }, { "id": "8c52471a-70f5-43aa-b670-6f8d22e18668", "comment": "", "command": "assertText", - "target": "css=td:nth-child(3)", + "target": "css=.d-block > primitive-property:nth-child(2) .text-truncate", "targets": [ - ["css=td:nth-child(3)", "css:finder"], - ["xpath=//td[3]", "xpath:position"], - ["xpath=//td[contains(.,'DynamicHttpMetadataResolver')]", "xpath:innerText"] + ["css=.d-block > primitive-property:nth-child(2) .text-truncate", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section/div/div[2]/object-property/primitive-property[2]/div/div/span[2]", "xpath:idRelative"], + ["xpath=//primitive-property[2]/div/div/span[2]", "xpath:position"], + ["xpath=//span[contains(.,'DynamicHttpMetadataResolver')]", "xpath:innerText"] ], "value": "DynamicHttpMetadataResolver" - }, { - "id": "76629f3d-b0a3-40ac-b848-da22b0933c31", - "comment": "", - "command": "click", - "target": "linkText=Dynamic Http Metadata Provider", - "targets": [ - ["linkText=Dynamic Http Metadata Provider", "linkText"], - ["css=td > a", "css:finder"], - ["xpath=//a[contains(text(),'Dynamic Http Metadata Provider')]", "xpath:link"], - ["xpath=//a[contains(@href, '/metadata/provider/f5bb61ac-54fe-427e-8b6b-2fcdd66ba175/configuration/options')]", "xpath:href"], - ["xpath=//td[2]/a", "xpath:position"], - ["xpath=//a[contains(.,'Dynamic Http Metadata Provider')]", "xpath:innerText"] - ], - "value": "" }, { "id": "31a8587f-8ac0-4512-98ec-6cd230dfb0b6", "comment": "", @@ -884,29 +871,33 @@ "id": "772bafa8-7089-4895-a66b-0d3c333c7245", "comment": "", "command": "waitForElementVisible", - "target": "css=.td-lg:nth-child(4)", + "target": "css=span:nth-child(4)", "targets": [], "value": "10000" }, { "id": "e9f4ddf4-db8a-4bda-88cc-66173717986c", "comment": "", "command": "assertText", - "target": "css=.td-lg:nth-child(4)", + "target": "css=span:nth-child(4)", "targets": [ - ["css=.td-lg:nth-child(4)", "css:finder"], - ["xpath=//td[4]", "xpath:position"], - ["xpath=//td[contains(.,'EntityAttributes')]", "xpath:innerText"] + ["css=span:nth-child(4)", "css:finder"], + ["xpath=//div[@id='filters']/filter-configuration-list/ul/li/filter-configuration-list-item/div/span[2]", "xpath:idRelative"], + ["xpath=//filter-configuration-list-item/div/span[2]", "xpath:position"], + ["xpath=//span[contains(.,'EntityAttributes')]", "xpath:innerText"] ], "value": "EntityAttributes" }, { "id": "9a99cc7c-55e1-4f62-bf18-e5936e8a98a7", "comment": "", "command": "click", - "target": "css=.btn-success", + "target": "linkText=Add Filter", "targets": [ - ["css=.btn-success > translate-i18n", "css:finder"], - ["xpath=//div[2]/a/translate-i18n", "xpath:position"], - ["xpath=//translate-i18n[contains(.,'Add Filter')]", "xpath:innerText"] + ["linkText=Add Filter", "linkText"], + ["css=#filters > .numbered-header .btn", "css:finder"], + ["xpath=//div[@id='filters']/div/div/a", "xpath:idRelative"], + ["xpath=//a[contains(@href, '/metadata/provider/e8eb0242-5291-4a51-86d6-43a1ef018981/filter/new')]", "xpath:href"], + ["xpath=//div[2]/div/div/a", "xpath:position"], + ["xpath=//a[contains(.,'  Add Filter')]", "xpath:innerText"] ], "value": "" }, { @@ -1030,10 +1021,11 @@ "id": "a8ed628c-53f7-4551-9ce8-fef976cc96ce", "comment": "", "command": "click", - "target": "css=tr:nth-child(1) .fa-arrow-circle-down", + "target": "css=.list-group-item:nth-child(1) .btn:nth-child(2)", "targets": [ - ["css=tr:nth-child(1) .fa-arrow-circle-down", "css:finder"], - ["xpath=//button[2]/i", "xpath:position"] + ["css=.list-group-item:nth-child(1) .btn:nth-child(2)", "css:finder"], + ["xpath=//div[@id='filters']/filter-configuration-list/ul/li/filter-configuration-list-item/div/div/button[2]", "xpath:idRelative"], + ["xpath=//button[2]", "xpath:position"] ], "value": "" }, { @@ -1047,18 +1039,19 @@ "id": "be805934-2692-4a1c-a28f-afb3cc4eb5f4", "comment": "", "command": "assertText", - "target": "css=tr:nth-child(1) > .td-lg:nth-child(4)", + "target": "css=.list-group-item:nth-child(1) span:nth-child(4)", "targets": [ - ["css=tr:nth-child(1) > .td-lg:nth-child(4)", "css:finder"], - ["xpath=//td[4]", "xpath:position"], - ["xpath=//td[contains(.,'NameIDFormat')]", "xpath:innerText"] + ["css=.list-group-item:nth-child(1) span:nth-child(4)", "css:finder"], + ["xpath=//div[@id='filters']/filter-configuration-list/ul/li/filter-configuration-list-item/div/span[2]", "xpath:idRelative"], + ["xpath=//filter-configuration-list-item/div/span[2]", "xpath:position"], + ["xpath=//span[contains(.,'EntityAttributes')]", "xpath:innerText"] ], "value": "NameIDFormat" }, { "id": "039aff93-c0de-40fb-a1c9-e22ffbf7e1da", "comment": "", "command": "click", - "target": "css=tr:nth-child(1) .fa-arrow-circle-down", + "target": "css=.list-group-item:nth-child(1) .btn:nth-child(2)", "targets": [ ["css=tr:nth-child(1) .fa-arrow-circle-down", "css:finder"], ["xpath=//button[2]/i", "xpath:position"] @@ -1075,7 +1068,7 @@ "id": "8f2da627-e8ad-473a-a71a-bec5dd1f0999", "comment": "", "command": "assertText", - "target": "css=tr:nth-child(1) > .td-lg:nth-child(4)", + "target": "css=.list-group-item:nth-child(1) span:nth-child(4)", "targets": [ ["css=tr:nth-child(1) > .td-lg:nth-child(4)", "css:finder"], ["xpath=//td[4]", "xpath:position"], diff --git a/backend/src/integration/resources/SHIBUI-1352-1.side b/backend/src/integration/resources/SHIBUI-1352-1.side index 694cbdcce..f59c15872 100644 --- a/backend/src/integration/resources/SHIBUI-1352-1.side +++ b/backend/src/integration/resources/SHIBUI-1352-1.side @@ -413,39 +413,33 @@ ], "value": "" }, { - "id": "4bd514f1-9dbf-431f-b797-c8666c7c0889", + "id": "6a002ac9-ba5c-4d57-bb87-05c3a5812469", "comment": "", "command": "waitForElementVisible", - "target": "css=tr > .text-right", - "targets": [ - ["css=tr > .text-right", "css:finder"], - ["xpath=//td[6]", "xpath:position"], - ["xpath=//td[contains(.,'Enabled')]", "xpath:innerText"] - ], - "value": "10000" + "target": "css=.d-block > primitive-property:nth-child(1) .text-truncate", + "targets": [], + "value": "30000" }, { "id": "f0232386-eb88-4f6c-98fa-b9065ed422b7", "comment": "", "command": "assertText", - "target": "linkText=Test Local Dynamic Provider", + "target": "css=.d-block > primitive-property:nth-child(1) .text-truncate", "targets": [ - ["linkText=Test Local Dynamic Provider", "linkText"], - ["css=td > a", "css:finder"], - ["xpath=//a[contains(text(),'Test Local Dynamic Provider')]", "xpath:link"], - ["xpath=(//a[contains(@href, '')])[10]", "xpath:href"], - ["xpath=//td[2]/a", "xpath:position"], - ["xpath=//a[contains(.,'Test Local Dynamic Provider')]", "xpath:innerText"] + ["css=.d-block > primitive-property:nth-child(1) .text-truncate", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section/div/div[2]/object-property/primitive-property/div/div/span[2]", "xpath:idRelative"], + ["xpath=//div/span[2]", "xpath:position"] ], "value": "Test Local Dynamic Provider" }, { "id": "5e8993ae-47ee-4e65-b667-b291d7c934ec", "comment": "", "command": "assertText", - "target": "css=td:nth-child(3)", + "target": "css=.d-block > primitive-property:nth-child(2) .text-truncate", "targets": [ - ["css=td:nth-child(3)", "css:finder"], - ["xpath=//td[3]", "xpath:position"], - ["xpath=//td[contains(.,'LocalDynamicMetadataResolver')]", "xpath:innerText"] + ["css=.d-block > primitive-property:nth-child(2) .text-truncate", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section/div/div[2]/object-property/primitive-property[2]/div/div/span[2]", "xpath:idRelative"], + ["xpath=//primitive-property[2]/div/div/span[2]", "xpath:position"], + ["xpath=//span[contains(.,'LocalDynamicMetadataResolver')]", "xpath:innerText"] ], "value": "LocalDynamicMetadataResolver" }, { diff --git a/backend/src/integration/resources/SHIBUI-1352-2.side b/backend/src/integration/resources/SHIBUI-1352-2.side index 97907af50..a6b4b2593 100644 --- a/backend/src/integration/resources/SHIBUI-1352-2.side +++ b/backend/src/integration/resources/SHIBUI-1352-2.side @@ -338,36 +338,34 @@ "id": "3718c9f8-edb3-412a-9819-f3adc27f1226", "comment": "", "command": "waitForElementVisible", - "target": "css=tr > .text-right", + "target": "css=.d-block > primitive-property:nth-child(1) .text-truncate", "targets": [ - ["css=tr > .text-right", "css:finder"], - ["xpath=//td[6]", "xpath:position"], - ["xpath=//td[contains(.,'Enabled')]", "xpath:innerText"] + ["css=.d-block > primitive-property:nth-child(1) .text-truncate", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section/div/div[2]/object-property/primitive-property/div/div/span[2]", "xpath:idRelative"], + ["xpath=//div/span[2]", "xpath:position"] ], "value": "10000" }, { "id": "44749988-e30f-4328-9f78-dc9eaafa891a", "comment": "", "command": "assertText", - "target": "linkText=Test File System Provider", + "target": "css=.d-block > primitive-property:nth-child(1) .text-truncate", "targets": [ - ["linkText=Test File System Provider", "linkText"], - ["css=td > a", "css:finder"], - ["xpath=//a[contains(text(),'Test File System Provider')]", "xpath:link"], - ["xpath=(//a[contains(@href, '')])[10]", "xpath:href"], - ["xpath=//td[2]/a", "xpath:position"], - ["xpath=//a[contains(.,'Test File System Provider')]", "xpath:innerText"] + ["css=.d-block > primitive-property:nth-child(1) .text-truncate", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section/div/div[2]/object-property/primitive-property/div/div/span[2]", "xpath:idRelative"], + ["xpath=//div/span[2]", "xpath:position"] ], "value": "Test File System Provider" }, { "id": "6ddcb09b-9d3b-4a13-bb95-1b79028ba2af", "comment": "", "command": "assertText", - "target": "css=td:nth-child(3)", + "target": "css=.d-block > primitive-property:nth-child(2) .text-truncate", "targets": [ - ["css=td:nth-child(3)", "css:finder"], - ["xpath=//td[3]", "xpath:position"], - ["xpath=//td[contains(.,'FilesystemMetadataResolver')]", "xpath:innerText"] + ["css=.d-block > primitive-property:nth-child(2) .text-truncate", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section/div/div[2]/object-property/primitive-property[2]/div/div/span[2]", "xpath:idRelative"], + ["xpath=//primitive-property[2]/div/div/span[2]", "xpath:position"], + ["xpath=//span[contains(.,'FilesystemMetadataResolver')]", "xpath:innerText"] ], "value": "FilesystemMetadataResolver" }, { diff --git a/backend/src/integration/resources/SHIBUI-1361.side b/backend/src/integration/resources/SHIBUI-1361.side index b858d5c7d..957d2a76d 100644 --- a/backend/src/integration/resources/SHIBUI-1361.side +++ b/backend/src/integration/resources/SHIBUI-1361.side @@ -579,7 +579,7 @@ "id": "1067b0b4-8aff-4972-b6f5-e4479eca9150", "comment": "", "command": "waitForElementPresent", - "target": "css=.badge-success", + "target": "css=.d-block > primitive-property:nth-child(1) .text-truncate", "targets": [ ["css=.badge > span", "css:finder"], ["xpath=//span/span", "xpath:position"] @@ -589,44 +589,37 @@ "id": "f48dd1b5-607a-485b-b1d5-03301f99b9ce", "comment": "", "command": "assertText", - "target": "linkText=Test Metadata Provider", - "targets": [], + "target": "css=.d-block > primitive-property:nth-child(1) .text-truncate", + "targets": [ + ["css=.d-block > primitive-property:nth-child(1) .text-truncate", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section/div/div[2]/object-property/primitive-property/div/div/span[2]", "xpath:idRelative"], + ["xpath=//div/span[2]", "xpath:position"] + ], "value": "Test Metadata Provider" }, { "id": "5eccd4e9-a451-4ec8-a9e1-1e1f8e771677", "comment": "", "command": "assertText", - "target": "css=td:nth-child(3)", - "targets": [], + "target": "css=.d-block > primitive-property:nth-child(2) .text-truncate", + "targets": [ + ["css=.d-block > primitive-property:nth-child(2) .text-truncate", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section/div/div[2]/object-property/primitive-property[2]/div/div/span[2]", "xpath:idRelative"], + ["xpath=//primitive-property[2]/div/div/span[2]", "xpath:position"], + ["xpath=//span[contains(.,'FileBackedHttpMetadataResolver')]", "xpath:innerText"] + ], "value": "FileBackedHttpMetadataResolver" }, { "id": "c768c2c1-09d4-46fe-8007-42fb4b3f4aaa", "comment": "", "command": "assertText", - "target": "css=td:nth-child(4)", - "targets": [], - "value": "admin" - }, { - "id": "8283ffc5-d46c-4a07-b95e-1534dfd34c02", - "comment": "", - "command": "click", - "target": "linkText=Test Metadata Provider", + "target": "css=.author", "targets": [ - ["linkText=Test Metadata Provider", "linkText"], - ["css=td > a", "css:finder"], - ["xpath=//a[contains(text(),'Test Metadata Provider')]", "xpath:link"], - ["xpath=//a[contains(@href, '/metadata/provider/ae086029-5871-4951-bcf0-8903d7a1a1f7/configuration/options')]", "xpath:href"], - ["xpath=//td[2]/a", "xpath:position"], - ["xpath=//a[contains(.,'Test Metadata Provider')]", "xpath:innerText"] + ["css=.author", "css:finder"], + ["xpath=//div[@id='header']/metadata-header/div/div/h5/span[2]", "xpath:idRelative"], + ["xpath=//span[2]", "xpath:position"], + ["xpath=//span[contains(.,'admin')]", "xpath:innerText"] ], - "value": "" - }, { - "id": "7a479ab7-f57d-426d-88ce-f11654733f45", - "comment": "", - "command": "waitForElementVisible", - "target": "css=.save-date", - "targets": [], - "value": "10000" + "value": "admin" }, { "id": "fe1e9381-048e-4948-8a9a-f58d8afba258", "comment": "", @@ -731,27 +724,6 @@ "target": "2000", "targets": [], "value": "" - }, { - "id": "cf005a45-74ae-4f7a-a53c-ed59d63f7114", - "comment": "", - "command": "click", - "target": "linkText=Test Metadata Provider", - "targets": [ - ["linkText=Test Metadata Provider", "linkText"], - ["css=td > a", "css:finder"], - ["xpath=//a[contains(text(),'Test Metadata Provider')]", "xpath:link"], - ["xpath=//a[contains(@href, '/metadata/provider/ae086029-5871-4951-bcf0-8903d7a1a1f7/configuration/options')]", "xpath:href"], - ["xpath=//td[2]/a", "xpath:position"], - ["xpath=//a[contains(.,'Test Metadata Provider')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "8e00ca0d-61e3-413d-8422-a09232049bab", - "comment": "", - "command": "pause", - "target": "2000", - "targets": [], - "value": "" }, { "id": "ea880e6a-498a-427a-bc08-8058137d62e0", "comment": "", @@ -1052,14 +1024,18 @@ "id": "4e2831c6-d1ba-409d-a0cc-7a25dad75421", "comment": "", "command": "waitForElementVisible", - "target": "linkText=Test Metadata Provider", - "targets": [], + "target": "css=.d-block > primitive-property:nth-child(1) .text-truncate", + "targets": [ + ["css=.d-block > primitive-property:nth-child(1) .text-truncate", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section/div/div[2]/object-property/primitive-property/div/div/span[2]", "xpath:idRelative"], + ["xpath=//div/span[2]", "xpath:position"] + ], "value": "10000" }, { "id": "8868c054-2e6a-403e-ba2b-499a56730d71", "comment": "", "command": "click", - "target": "linkText=Test Metadata Provider", + "target": "css=.d-block > primitive-property:nth-child(1) .text-truncate", "targets": [ ["linkText=Test Metadata Provider", "linkText"], ["css=td > a", "css:finder"], diff --git a/backend/src/integration/resources/SHIBUI-1364-1.side b/backend/src/integration/resources/SHIBUI-1364-1.side index 4fe142717..04508d504 100644 --- a/backend/src/integration/resources/SHIBUI-1364-1.side +++ b/backend/src/integration/resources/SHIBUI-1364-1.side @@ -571,20 +571,6 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" - }, { - "id": "12673aa7-fc4e-4877-9842-a9d88dbc2d97", - "comment": "", - "command": "click", - "target": "linkText=File Backed HTTP Metadata Provider", - "targets": [ - ["linkText=File Backed HTTP Metadata Provider", "linkText"], - ["css=td > a", "css:finder"], - ["xpath=//a[contains(text(),'File Backed HTTP Metadata Provider')]", "xpath:link"], - ["xpath=//a[contains(@href, '/metadata/provider/da22a0b7-40d7-418c-bbe9-7ba4c37d3905/configuration/options')]", "xpath:href"], - ["xpath=//td[2]/a", "xpath:position"], - ["xpath=//a[contains(.,'File Backed HTTP Metadata Provider')]", "xpath:innerText"] - ], - "value": "" }, { "id": "daa2d46a-d238-4a48-aca7-0f34c9b93d5f", "comment": "", @@ -1630,21 +1616,23 @@ "id": "100902ee-6d6e-4148-a69b-b37746a4ad6e", "comment": "", "command": "assertText", - "target": "css=tr:nth-child(1) > .td-lg:nth-child(3)", + "target": "css=.list-group-item:nth-child(1) > filter-configuration-list-item > .d-flex > .btn", "targets": [ - ["css=tr:nth-child(1) > .td-lg:nth-child(3)", "css:finder"], - ["xpath=//td[3]", "xpath:position"], - ["xpath=//td[contains(.,'Entity Attributes Filter')]", "xpath:innerText"] + ["css=.list-group-item:nth-child(1) > filter-configuration-list-item > .d-flex > .btn", "css:finder"], + ["xpath=//div[@id='filters']/filter-configuration-list/ul/li/filter-configuration-list-item/div/button", "xpath:idRelative"], + ["xpath=//filter-configuration-list-item/div/button", "xpath:position"], + ["xpath=//button[contains(.,'Entity Attributes Filter')]", "xpath:innerText"] ], "value": "Entity Attributes Filter" }, { "id": "9cc5dbab-bb39-455d-9338-6bdd054841e0", "comment": "", "command": "click", - "target": "css=tr:nth-child(1) .fa-arrow-circle-down", + "target": "css=.list-group-item:nth-child(1) .btn:nth-child(2)", "targets": [ - ["css=tr:nth-child(1) .fa-arrow-circle-down", "css:finder"], - ["xpath=//button[2]/i", "xpath:position"] + ["css=.list-group-item:nth-child(1) .btn:nth-child(2)", "css:finder"], + ["xpath=//div[@id='filters']/filter-configuration-list/ul/li/filter-configuration-list-item/div/div/button[2]", "xpath:idRelative"], + ["xpath=//button[2]", "xpath:position"] ], "value": "" }, { @@ -1658,7 +1646,7 @@ "id": "c9d498da-9f59-40ae-b5d4-cae397a13766", "comment": "", "command": "assertText", - "target": "css=tr:nth-child(1) > .td-lg:nth-child(3)", + "target": "css=.list-group-item:nth-child(1) > filter-configuration-list-item > .d-flex > .btn", "targets": [ ["css=tr:nth-child(1) > .td-lg:nth-child(3)", "css:finder"], ["xpath=//td[3]", "xpath:position"], @@ -1669,7 +1657,7 @@ "id": "1b05bac6-3412-4f4d-b168-0f7fb124e5d0", "comment": "", "command": "click", - "target": "css=tr:nth-child(1) .fa-arrow-circle-down", + "target": "css=.list-group-item:nth-child(1) .btn:nth-child(2)", "targets": [ ["css=tr:nth-child(1) .fa-arrow-circle-down", "css:finder"], ["xpath=//button[2]/i", "xpath:position"] @@ -1686,7 +1674,7 @@ "id": "441608df-24a3-4a60-bfce-50a90ff0ee16", "comment": "", "command": "assertText", - "target": "css=tr:nth-child(1) > .td-lg:nth-child(3)", + "target": "css=.list-group-item:nth-child(1) > filter-configuration-list-item > .d-flex > .btn", "targets": [ ["css=tr:nth-child(1) > .td-lg:nth-child(3)", "css:finder"], ["xpath=//td[3]", "xpath:position"], @@ -1859,20 +1847,6 @@ "target": "3000", "targets": [], "value": "" - }, { - "id": "e5478587-138e-4e8d-94dd-073af6559f07", - "comment": "", - "command": "click", - "target": "css=td > a", - "targets": [ - ["linkText=File Backed HTTP Metadata Provider Version 2", "linkText"], - ["css=td > a", "css:finder"], - ["xpath=//a[contains(text(),'File Backed HTTP Metadata Provider Version 2')]", "xpath:link"], - ["xpath=//a[contains(@href, '/metadata/provider/9325baaf-0eac-49d6-9df4-c379703aae7e/configuration/options')]", "xpath:href"], - ["xpath=//td[2]/a", "xpath:position"], - ["xpath=//a[contains(.,'File Backed HTTP Metadata Provider Version 2')]", "xpath:innerText"] - ], - "value": "" }, { "id": "8c0f82f1-d6b4-4e62-bdb0-087dd31471cf", "comment": "", @@ -2257,4 +2231,4 @@ }], "urls": ["http://localhost:10101/"], "plugins": [] -} +} \ No newline at end of file diff --git a/backend/src/integration/resources/SHIBUI-1364-2.side b/backend/src/integration/resources/SHIBUI-1364-2.side index 56a2515eb..fa45e3121 100644 --- a/backend/src/integration/resources/SHIBUI-1364-2.side +++ b/backend/src/integration/resources/SHIBUI-1364-2.side @@ -298,38 +298,6 @@ ["xpath=//span[2]/i", "xpath:position"] ], "value": "" - }, { - "id": "27c0717e-f477-448b-8091-3bb2f3e6080f", - "comment": "", - "command": "waitForElementVisible", - "target": "css=td:nth-child(3)", - "targets": [], - "value": "10000" - }, { - "id": "20f7b832-ec52-450a-8224-399f0d4de0a0", - "comment": "", - "command": "assertText", - "target": "css=td:nth-child(3)", - "targets": [ - ["css=td:nth-child(3)", "css:finder"], - ["xpath=//td[3]", "xpath:position"], - ["xpath=//td[contains(.,'FilesystemMetadataResolver')]", "xpath:innerText"] - ], - "value": "FilesystemMetadataResolver" - }, { - "id": "7548f260-d328-4b47-97ed-cf6df394b6bc", - "comment": "", - "command": "click", - "target": "linkText=Filesystem Metadata Provider", - "targets": [ - ["linkText=Filesystem Metadata Provider", "linkText"], - ["css=td > a", "css:finder"], - ["xpath=//a[contains(text(),'Filesystem Metadata Provider')]", "xpath:link"], - ["xpath=//a[contains(@href, '/metadata/provider/5ddf2624-1a30-4709-8873-35bbba4a372f/configuration/options')]", "xpath:href"], - ["xpath=//td[2]/a", "xpath:position"], - ["xpath=//a[contains(.,'Filesystem Metadata Provider')]", "xpath:innerText"] - ], - "value": "" }, { "id": "11d71ffb-3372-41cb-9832-72755ef298b5", "comment": "", @@ -755,21 +723,23 @@ "id": "d722902b-5c10-45dc-99df-d96f46e78313", "comment": "", "command": "assertText", - "target": "css=tr:nth-child(1) > .td-lg:nth-child(4)", + "target": "css=.list-group-item:nth-child(1) span:nth-child(4)", "targets": [ - ["css=tr:nth-child(1) > .td-lg:nth-child(4)", "css:finder"], - ["xpath=//td[4]", "xpath:position"], - ["xpath=//td[contains(.,'EntityAttributes')]", "xpath:innerText"] + ["css=.list-group-item:nth-child(1) span:nth-child(4)", "css:finder"], + ["xpath=//div[@id='filters']/filter-configuration-list/ul/li/filter-configuration-list-item/div/span[2]", "xpath:idRelative"], + ["xpath=//filter-configuration-list-item/div/span[2]", "xpath:position"], + ["xpath=//span[contains(.,'EntityAttributes')]", "xpath:innerText"] ], "value": "EntityAttributes" }, { "id": "c8d9bc5a-4b7e-4178-8aba-8b8280506c20", "comment": "", "command": "click", - "target": "css=tr:nth-child(1) .fa-arrow-circle-down", + "target": "css=.list-group-item:nth-child(1) .btn:nth-child(2)", "targets": [ - ["css=tr:nth-child(1) .fa-arrow-circle-down", "css:finder"], - ["xpath=//button[2]/i", "xpath:position"] + ["css=.list-group-item:nth-child(1) .btn:nth-child(2)", "css:finder"], + ["xpath=//div[@id='filters']/filter-configuration-list/ul/li/filter-configuration-list-item/div/div/button[2]", "xpath:idRelative"], + ["xpath=//button[2]", "xpath:position"] ], "value": "" }, { @@ -783,7 +753,7 @@ "id": "d7909094-96ce-4532-98b4-446cc013c9c8", "comment": "", "command": "assertText", - "target": "css=tr:nth-child(1) > .td-lg:nth-child(4)", + "target": "css=.list-group-item:nth-child(1) span:nth-child(4)", "targets": [ ["css=tr:nth-child(1) > .td-lg:nth-child(4)", "css:finder"], ["xpath=//td[4]", "xpath:position"], @@ -946,27 +916,6 @@ "target": "2000", "targets": [], "value": "" - }, { - "id": "bc0e9370-b6f7-40b0-93b2-1051954e4298", - "comment": "", - "command": "click", - "target": "linkText=Filesystem Metadata Provider V2", - "targets": [ - ["linkText=Filesystem Metadata Provider V2", "linkText"], - ["css=td > a", "css:finder"], - ["xpath=//a[contains(text(),'Filesystem Metadata Provider V2')]", "xpath:link"], - ["xpath=//a[contains(@href, '/metadata/provider/c90805c1-6468-4164-b9f1-fad547d31232/configuration/options')]", "xpath:href"], - ["xpath=//td[2]/a", "xpath:position"], - ["xpath=//a[contains(.,'Filesystem Metadata Provider V2')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "038f43a0-5870-4103-bb2e-97928dcc1afb", - "comment": "", - "command": "pause", - "target": "2000", - "targets": [], - "value": "" }, { "id": "a5885119-3102-4d0a-a0ea-d5517a94c6d8", "comment": "", diff --git a/backend/src/integration/resources/SHIBUI-1364-3.side b/backend/src/integration/resources/SHIBUI-1364-3.side index 9f00ce132..81490d195 100644 --- a/backend/src/integration/resources/SHIBUI-1364-3.side +++ b/backend/src/integration/resources/SHIBUI-1364-3.side @@ -375,38 +375,6 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" - }, { - "id": "02e53e75-003b-42ce-8522-817d52ad16a3", - "comment": "", - "command": "waitForElementVisible", - "target": "css=td:nth-child(3)", - "targets": [], - "value": "10000" - }, { - "id": "7d059a57-60f7-4729-95af-b36619b98694", - "comment": "", - "command": "assertText", - "target": "css=td:nth-child(3)", - "targets": [ - ["css=td:nth-child(3)", "css:finder"], - ["xpath=//td[3]", "xpath:position"], - ["xpath=//td[contains(.,'LocalDynamicMetadataResolver')]", "xpath:innerText"] - ], - "value": "LocalDynamicMetadataResolver" - }, { - "id": "15912a4b-c036-4886-9577-312bf6816943", - "comment": "", - "command": "click", - "target": "linkText=Local Dynamic Metadata Provider", - "targets": [ - ["linkText=Local Dynamic Metadata Provider", "linkText"], - ["css=td > a", "css:finder"], - ["xpath=//a[contains(text(),'Local Dynamic Metadata Provider')]", "xpath:link"], - ["xpath=//a[contains(@href, '/metadata/provider/dff5232d-66fb-4623-b25e-85c24df5ede4/configuration/options')]", "xpath:href"], - ["xpath=//td[2]/a", "xpath:position"], - ["xpath=//a[contains(.,'Local Dynamic Metadata Provider')]", "xpath:innerText"] - ], - "value": "" }, { "id": "feb08e76-e553-4505-bffe-07f3e77206d0", "comment": "", @@ -652,18 +620,19 @@ "id": "af17a3a7-f292-4c22-8f2f-3d3bf1938fc1", "comment": "", "command": "waitForElementVisible", - "target": "css=.td-lg:nth-child(4)", + "target": "css=span:nth-child(4)", "targets": [], "value": "10000" }, { "id": "2b9c0a43-fd7a-4ffa-bfef-a7fc41746e16", "comment": "", "command": "assertText", - "target": "css=.td-lg:nth-child(4)", + "target": "css=span:nth-child(4)", "targets": [ - ["css=.td-lg:nth-child(4)", "css:finder"], - ["xpath=//td[4]", "xpath:position"], - ["xpath=//td[contains(.,'EntityAttributes')]", "xpath:innerText"] + ["css=span:nth-child(4)", "css:finder"], + ["xpath=//div[@id='filters']/filter-configuration-list/ul/li/filter-configuration-list-item/div/span[2]", "xpath:idRelative"], + ["xpath=//filter-configuration-list-item/div/span[2]", "xpath:position"], + ["xpath=//span[contains(.,'EntityAttributes')]", "xpath:innerText"] ], "value": "EntityAttributes" }, { @@ -884,10 +853,11 @@ "id": "9f7e95cf-4dd5-415f-8577-a6f1bc54a85d", "comment": "", "command": "click", - "target": "css=tr:nth-child(1) .fa-arrow-circle-down", + "target": "css=.list-group-item:nth-child(1) .btn:nth-child(2)", "targets": [ - ["css=tr:nth-child(1) .fa-arrow-circle-down", "css:finder"], - ["xpath=//button[2]/i", "xpath:position"] + ["css=.list-group-item:nth-child(1) .btn:nth-child(2)", "css:finder"], + ["xpath=//div[@id='filters']/filter-configuration-list/ul/li/filter-configuration-list-item/div/div/button[2]", "xpath:idRelative"], + ["xpath=//button[2]", "xpath:position"] ], "value": "" }, { @@ -901,18 +871,19 @@ "id": "4a73b268-7d33-4e8c-8fa4-cb059be9768f", "comment": "", "command": "assertText", - "target": "css=tr:nth-child(1) > .td-lg:nth-child(4)", + "target": "css=.list-group-item:nth-child(1) span:nth-child(4)", "targets": [ - ["css=tr:nth-child(1) > .td-lg:nth-child(4)", "css:finder"], - ["xpath=//td[4]", "xpath:position"], - ["xpath=//td[contains(.,'NameIDFormat')]", "xpath:innerText"] + ["css=.list-group-item:nth-child(1) span:nth-child(4)", "css:finder"], + ["xpath=//div[@id='filters']/filter-configuration-list/ul/li/filter-configuration-list-item/div/span[2]", "xpath:idRelative"], + ["xpath=//filter-configuration-list-item/div/span[2]", "xpath:position"], + ["xpath=//span[contains(.,'EntityAttributes')]", "xpath:innerText"] ], "value": "NameIDFormat" }, { "id": "63ac7307-0538-4c0d-8e98-2f05c767baaf", "comment": "", "command": "click", - "target": "css=tr:nth-child(1) .fa-arrow-circle-down", + "target": "css=.list-group-item:nth-child(1) .btn:nth-child(2)", "targets": [ ["css=tr:nth-child(1) .fa-arrow-circle-down", "css:finder"], ["xpath=//button[2]/i", "xpath:position"] @@ -929,7 +900,7 @@ "id": "ed8e07ff-0dce-47d6-8310-f1920bfe1367", "comment": "", "command": "assertText", - "target": "css=tr:nth-child(1) > .td-lg:nth-child(4)", + "target": "css=.list-group-item:nth-child(1) span:nth-child(4)", "targets": [ ["css=tr:nth-child(1) > .td-lg:nth-child(4)", "css:finder"], ["xpath=//td[4]", "xpath:position"], @@ -1053,27 +1024,6 @@ "target": "2000", "targets": [], "value": "" - }, { - "id": "e900a26f-c75c-4cfc-a3dd-7f846bf74caf", - "comment": "", - "command": "click", - "target": "linkText=Local Dynamic Metadata Provider V2", - "targets": [ - ["linkText=Local Dynamic Metadata Provider V2", "linkText"], - ["css=td > a", "css:finder"], - ["xpath=//a[contains(text(),'Local Dynamic Metadata Provider V2')]", "xpath:link"], - ["xpath=//a[contains(@href, '/metadata/provider/b76c6aaf-4b5b-464b-8aa6-98d1125989b8/configuration/options')]", "xpath:href"], - ["xpath=//td[2]/a", "xpath:position"], - ["xpath=//a[contains(.,'Local Dynamic Metadata Provider V2')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "f002c981-815d-472a-81fc-3c1ae3fb9222", - "comment": "", - "command": "pause", - "target": "2000", - "targets": [], - "value": "" }, { "id": "add10378-ed96-4fc2-bd50-5ace327bb698", "comment": "", diff --git a/backend/src/integration/resources/SHIBUI-1364-4.side b/backend/src/integration/resources/SHIBUI-1364-4.side index 2337548e7..c088ae27d 100644 --- a/backend/src/integration/resources/SHIBUI-1364-4.side +++ b/backend/src/integration/resources/SHIBUI-1364-4.side @@ -607,34 +607,25 @@ "id": "ae27b108-a2f4-4d4b-b375-b582ccc0ef56", "comment": "", "command": "waitForElementVisible", - "target": "css=td:nth-child(3)", - "targets": [], + "target": "css=.d-block > primitive-property:nth-child(2) .text-truncate", + "targets": [ + ["css=.d-block > primitive-property:nth-child(2) .text-truncate", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section/div/div[2]/object-property/primitive-property[2]/div/div/span[2]", "xpath:idRelative"], + ["xpath=//primitive-property[2]/div/div/span[2]", "xpath:position"], + ["xpath=//span[contains(.,'DynamicHttpMetadataResolver')]", "xpath:innerText"] + ], "value": "10000" }, { "id": "8c52471a-70f5-43aa-b670-6f8d22e18668", "comment": "", "command": "assertText", - "target": "css=td:nth-child(3)", + "target": "css=.d-block > primitive-property:nth-child(2) .text-truncate", "targets": [ ["css=td:nth-child(3)", "css:finder"], ["xpath=//td[3]", "xpath:position"], ["xpath=//td[contains(.,'DynamicHttpMetadataResolver')]", "xpath:innerText"] ], "value": "DynamicHttpMetadataResolver" - }, { - "id": "76629f3d-b0a3-40ac-b848-da22b0933c31", - "comment": "", - "command": "click", - "target": "linkText=Dynamic Http Metadata Provider", - "targets": [ - ["linkText=Dynamic Http Metadata Provider", "linkText"], - ["css=td > a", "css:finder"], - ["xpath=//a[contains(text(),'Dynamic Http Metadata Provider')]", "xpath:link"], - ["xpath=//a[contains(@href, '/metadata/provider/f5bb61ac-54fe-427e-8b6b-2fcdd66ba175/configuration/options')]", "xpath:href"], - ["xpath=//td[2]/a", "xpath:position"], - ["xpath=//a[contains(.,'Dynamic Http Metadata Provider')]", "xpath:innerText"] - ], - "value": "" }, { "id": "31a8587f-8ac0-4512-98ec-6cd230dfb0b6", "comment": "", @@ -884,29 +875,33 @@ "id": "772bafa8-7089-4895-a66b-0d3c333c7245", "comment": "", "command": "waitForElementVisible", - "target": "css=.td-lg:nth-child(4)", + "target": "css=span:nth-child(4)", "targets": [], "value": "10000" }, { "id": "e9f4ddf4-db8a-4bda-88cc-66173717986c", "comment": "", "command": "assertText", - "target": "css=.td-lg:nth-child(4)", + "target": "css=span:nth-child(4)", "targets": [ - ["css=.td-lg:nth-child(4)", "css:finder"], - ["xpath=//td[4]", "xpath:position"], - ["xpath=//td[contains(.,'EntityAttributes')]", "xpath:innerText"] + ["css=span:nth-child(4)", "css:finder"], + ["xpath=//div[@id='filters']/filter-configuration-list/ul/li/filter-configuration-list-item/div/span[2]", "xpath:idRelative"], + ["xpath=//filter-configuration-list-item/div/span[2]", "xpath:position"], + ["xpath=//span[contains(.,'EntityAttributes')]", "xpath:innerText"] ], "value": "EntityAttributes" }, { "id": "9a99cc7c-55e1-4f62-bf18-e5936e8a98a7", "comment": "", "command": "click", - "target": "css=.btn-success", + "target": "linkText=Add Filter", "targets": [ - ["css=.btn-success > translate-i18n", "css:finder"], - ["xpath=//div[2]/a/translate-i18n", "xpath:position"], - ["xpath=//translate-i18n[contains(.,'Add Filter')]", "xpath:innerText"] + ["linkText=Add Filter", "linkText"], + ["css=#filters > .numbered-header .btn", "css:finder"], + ["xpath=//div[@id='filters']/div/div/a", "xpath:idRelative"], + ["xpath=//a[contains(@href, '/metadata/provider/87ec177a-ad7c-4189-a154-2fe73caaf2e8/filter/new')]", "xpath:href"], + ["xpath=//div[2]/div/div/a", "xpath:position"], + ["xpath=//a[contains(.,'  Add Filter')]", "xpath:innerText"] ], "value": "" }, { @@ -1019,60 +1014,6 @@ ["xpath=//translate-i18n[contains(.,'Save')]", "xpath:innerText"] ], "value": "" - }, { - "id": "f967bc76-becf-4cf1-a2a1-11a9d7c9be49", - "comment": "", - "command": "waitForElementVisible", - "target": "css=tr:nth-child(1) > .td-lg:nth-child(4)", - "targets": [], - "value": "30000" - }, { - "id": "56e4a69d-0fcd-4d50-82c6-6716af892e39", - "comment": "", - "command": "click", - "target": "css=.nav-item translate-i18n", - "targets": [ - ["css=.nav-item translate-i18n", "css:finder"], - ["xpath=//div[@id='navbar']/ul/li[2]/a/translate-i18n", "xpath:idRelative"], - ["xpath=//a/translate-i18n", "xpath:position"], - ["xpath=//translate-i18n[contains(.,'Dashboard')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "b913ed4f-3802-4fb6-8a5b-0d5a9afb76d5", - "comment": "", - "command": "click", - "target": "linkText=Metadata Providers", - "targets": [ - ["linkText=Metadata Providers", "linkText"], - ["css=.nav > .nav-item:nth-child(2) > .nav-link", "css:finder"], - ["xpath=//a[contains(text(),'Metadata Providers')]", "xpath:link"], - ["xpath=//a[contains(@href, '/dashboard/metadata/manager/providers')]", "xpath:href"], - ["xpath=//dashboard-page/div/ul/li[2]/a", "xpath:position"], - ["xpath=//a[contains(.,'Metadata Providers')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "4025491d-ad25-4b49-879a-af34ebd9ca7a", - "comment": "", - "command": "waitForElementVisible", - "target": "css=td > a", - "targets": [], - "value": "30000" - }, { - "id": "e28ed34b-a0bd-4339-844c-454835619d65", - "comment": "", - "command": "click", - "target": "css=td > a", - "targets": [ - ["linkText=Dynamic Http Metadata Provider", "linkText"], - ["css=td > a", "css:finder"], - ["xpath=//a[contains(text(),'Dynamic Http Metadata Provider')]", "xpath:link"], - ["xpath=//a[contains(@href, '/metadata/provider/e9de09a6-6d16-4e94-bba4-13fa38c312ff/configuration/options')]", "xpath:href"], - ["xpath=//td[2]/a", "xpath:position"], - ["xpath=//a[contains(.,'Dynamic Http Metadata Provider')]", "xpath:innerText"] - ], - "value": "" }, { "id": "3535cbe5-1ade-4d00-ab7f-2a8d1a5a5f6c", "comment": "", @@ -1162,20 +1103,6 @@ "target": "2000", "targets": [], "value": "" - }, { - "id": "1e0118a5-e853-4d3b-a017-225f41020fe8", - "comment": "", - "command": "click", - "target": "linkText=Dynamic Http Metadata Provider V2", - "targets": [ - ["linkText=Dynamic Http Metadata Provider V2", "linkText"], - ["css=td > a", "css:finder"], - ["xpath=//a[contains(text(),'Dynamic Http Metadata Provider V2')]", "xpath:link"], - ["xpath=//a[contains(@href, '/metadata/provider/e9de09a6-6d16-4e94-bba4-13fa38c312ff/configuration/options')]", "xpath:href"], - ["xpath=//td[2]/a", "xpath:position"], - ["xpath=//a[contains(.,'Dynamic Http Metadata Provider V2')]", "xpath:innerText"] - ], - "value": "" }, { "id": "9a6b3095-e834-4f31-9d54-0561f556052f", "comment": "", diff --git a/backend/src/integration/resources/SHIBUI-1385-2.side b/backend/src/integration/resources/SHIBUI-1385-2.side index 923bb61c8..7110dc607 100644 --- a/backend/src/integration/resources/SHIBUI-1385-2.side +++ b/backend/src/integration/resources/SHIBUI-1385-2.side @@ -538,10 +538,11 @@ "id": "52f5680c-c63d-411e-8332-52901f12ea3b", "comment": "", "command": "assertText", - "target": "css=.px-3:nth-child(1) > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", + "target": "css=.mb-4:nth-child(1) primitive-property:nth-child(1) .d-block:nth-child(2)", "targets": [ - ["css=.px-3:nth-child(1) > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", "css:finder"], - ["xpath=//summary-property/div/span", "xpath:position"], + ["css=.mb-4:nth-child(1) primitive-property:nth-child(1) .d-block:nth-child(2)", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section/div/div[2]/object-property/primitive-property/div/div/span[2]", "xpath:idRelative"], + ["xpath=//div/span[2]", "xpath:position"], ["xpath=//span[contains(.,'Test Metadata Provider')]", "xpath:innerText"] ], "value": "Test Metadata Provider" @@ -549,10 +550,11 @@ "id": "67ff44aa-1efd-4b13-a0e9-3648a09911dd", "comment": "", "command": "assertText", - "target": "css=.px-3:nth-child(2) > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", + "target": "css=.mb-4:nth-child(2) primitive-property:nth-child(1) .d-block:nth-child(2)", "targets": [ - ["css=.px-3:nth-child(2) > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", "css:finder"], - ["xpath=//section[2]/summary-property/div/span", "xpath:position"], + ["css=.mb-4:nth-child(2) primitive-property:nth-child(1) .d-block:nth-child(2)", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section[2]/div/div[2]/object-property/primitive-property/div/div/span[2]", "xpath:idRelative"], + ["xpath=//section[2]/div/div[2]/object-property/primitive-property/div/div/span[2]", "xpath:position"], ["xpath=//span[contains(.,'123')]", "xpath:innerText"] ], "value": "123" @@ -570,17 +572,18 @@ "id": "1067b0b4-8aff-4972-b6f5-e4479eca9150", "comment": "", "command": "waitForElementPresent", - "target": "css=.badge-success", + "target": "css=.d-block > primitive-property:nth-child(1) .text-truncate", "targets": [ - ["css=.badge > span", "css:finder"], - ["xpath=//span/span", "xpath:position"] + ["css=.d-block > primitive-property:nth-child(1) .text-truncate", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section/div/div[2]/object-property/primitive-property/div/div/span[2]", "xpath:idRelative"], + ["xpath=//div/span[2]", "xpath:position"] ], "value": "10000" }, { "id": "f48dd1b5-607a-485b-b1d5-03301f99b9ce", "comment": "", "command": "assertText", - "target": "linkText=Test Metadata Provider", + "target": "css=.d-block > primitive-property:nth-child(1) .text-truncate", "targets": [ ["linkText=Test Metadata Provider", "linkText"], ["css=td > a", "css:finder"], @@ -594,38 +597,26 @@ "id": "5eccd4e9-a451-4ec8-a9e1-1e1f8e771677", "comment": "", "command": "assertText", - "target": "css=td:nth-child(3)", + "target": "css=.d-block > primitive-property:nth-child(2) .text-truncate", "targets": [ - ["css=td:nth-child(3)", "css:finder"], - ["xpath=//td[3]", "xpath:position"], - ["xpath=//td[contains(.,'FileBackedHttpMetadataResolver')]", "xpath:innerText"] + ["css=.d-block > primitive-property:nth-child(2) .text-truncate", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section/div/div[2]/object-property/primitive-property[2]/div/div/span[2]", "xpath:idRelative"], + ["xpath=//primitive-property[2]/div/div/span[2]", "xpath:position"], + ["xpath=//span[contains(.,'FileBackedHttpMetadataResolver')]", "xpath:innerText"] ], "value": "FileBackedHttpMetadataResolver" }, { "id": "c768c2c1-09d4-46fe-8007-42fb4b3f4aaa", "comment": "", "command": "assertText", - "target": "css=td:nth-child(4)", + "target": "css=.author", "targets": [ - ["css=td:nth-child(4)", "css:finder"], - ["xpath=//td[4]", "xpath:position"], - ["xpath=//td[contains(.,'admin')]", "xpath:innerText"] + ["css=.author", "css:finder"], + ["xpath=//div[@id='header']/metadata-header/div/div/h5/span[2]", "xpath:idRelative"], + ["xpath=//span[2]", "xpath:position"], + ["xpath=//span[contains(.,'admin')]", "xpath:innerText"] ], "value": "admin" - }, { - "id": "8283ffc5-d46c-4a07-b95e-1534dfd34c02", - "comment": "", - "command": "click", - "target": "linkText=Test Metadata Provider", - "targets": [ - ["linkText=Test Metadata Provider", "linkText"], - ["css=td > a", "css:finder"], - ["xpath=//a[contains(text(),'Test Metadata Provider')]", "xpath:link"], - ["xpath=//a[contains(@href, '/metadata/provider/ae086029-5871-4951-bcf0-8903d7a1a1f7/configuration/options')]", "xpath:href"], - ["xpath=//td[2]/a", "xpath:position"], - ["xpath=//a[contains(.,'Test Metadata Provider')]", "xpath:innerText"] - ], - "value": "" }, { "id": "67578648-0800-4716-8c0c-27741770249a", "comment": "", @@ -695,20 +686,6 @@ "target": "2000", "targets": [], "value": "" - }, { - "id": "cf005a45-74ae-4f7a-a53c-ed59d63f7114", - "comment": "", - "command": "click", - "target": "linkText=Test Metadata Provider", - "targets": [ - ["linkText=Test Metadata Provider", "linkText"], - ["css=td > a", "css:finder"], - ["xpath=//a[contains(text(),'Test Metadata Provider')]", "xpath:link"], - ["xpath=//a[contains(@href, '/metadata/provider/ae086029-5871-4951-bcf0-8903d7a1a1f7/configuration/options')]", "xpath:href"], - ["xpath=//td[2]/a", "xpath:position"], - ["xpath=//a[contains(.,'Test Metadata Provider')]", "xpath:innerText"] - ], - "value": "" }, { "id": "ea880e6a-498a-427a-bc08-8058137d62e0", "comment": "", @@ -1004,14 +981,18 @@ "id": "c3ad6c24-736a-492a-8952-b368e123d8e1", "comment": "", "command": "waitForElementVisible", - "target": "linkText=Test Metadata Provider", - "targets": [], + "target": "css=.d-block > primitive-property:nth-child(1) .text-truncate", + "targets": [ + ["css=.d-block > primitive-property:nth-child(1) .text-truncate", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section/div/div[2]/object-property/primitive-property/div/div/span[2]", "xpath:idRelative"], + ["xpath=//div/span[2]", "xpath:position"] + ], "value": "10000" }, { "id": "8868c054-2e6a-403e-ba2b-499a56730d71", "comment": "", "command": "click", - "target": "linkText=Test Metadata Provider", + "target": "css=.d-block > primitive-property:nth-child(1) .text-truncate", "targets": [ ["linkText=Test Metadata Provider", "linkText"], ["css=td > a", "css:finder"], diff --git a/backend/src/integration/resources/SHIBUI-1392.side b/backend/src/integration/resources/SHIBUI-1392.side index e47d8541f..0056a4dd6 100644 --- a/backend/src/integration/resources/SHIBUI-1392.side +++ b/backend/src/integration/resources/SHIBUI-1392.side @@ -263,20 +263,6 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" - }, { - "id": "1566f2a0-790c-4594-806c-7dd6c9c47143", - "comment": "", - "command": "click", - "target": "linkText=Test Provider with Script Filter", - "targets": [ - ["linkText=Test Provider with Script Filter", "linkText"], - ["css=td > a", "css:finder"], - ["xpath=//a[contains(text(),'Test Provider with Script Filter')]", "xpath:link"], - ["xpath=//a[contains(@href, '/metadata/provider/194c05bb-df26-4fd3-b970-ca30f8855e0b/configuration/options')]", "xpath:href"], - ["xpath=//td[2]/a", "xpath:position"], - ["xpath=//a[contains(.,'Test Provider with Script Filter')]", "xpath:innerText"] - ], - "value": "" }, { "id": "3b38c153-5b8d-4a3c-a8c2-f089d86e2ae3", "comment": "", @@ -434,14 +420,19 @@ "id": "c51608a2-5e1a-4f70-8856-cbef5eb588ed", "comment": "", "command": "waitForElementVisible", - "target": "css=.td-lg:nth-child(4)", - "targets": [], + "target": "css=span:nth-child(4)", + "targets": [ + ["css=span:nth-child(4)", "css:finder"], + ["xpath=//div[@id='filters']/filter-configuration-list/ul/li/filter-configuration-list-item/div/span[2]", "xpath:idRelative"], + ["xpath=//filter-configuration-list-item/div/span[2]", "xpath:position"], + ["xpath=//span[contains(.,'NameIDFormat')]", "xpath:innerText"] + ], "value": "10000" }, { "id": "83f6f403-40b0-4f12-82e2-a14e301dd7ff", "comment": "", "command": "assertText", - "target": "css=.td-lg:nth-child(4)", + "target": "css=span:nth-child(4)", "targets": [ ["css=.td-lg:nth-child(4)", "css:finder"], ["xpath=//td[4]", "xpath:position"], @@ -452,24 +443,30 @@ "id": "1b449f50-1c54-41a0-a50b-65364340b7d2", "comment": "", "command": "click", - "target": "css=.fa-edit", + "target": "css=.mx-4", "targets": [ - ["css=.fa-edit", "css:finder"], - ["xpath=//td[6]/a/i", "xpath:position"] + ["css=.mx-4", "css:finder"], + ["xpath=//div[@id='filters']/filter-configuration-list/ul/li/filter-configuration-list-item/div/button", "xpath:idRelative"], + ["xpath=//filter-configuration-list-item/div/button", "xpath:position"], + ["xpath=//button[contains(.,'Filter with Script')]", "xpath:innerText"] ], "value": "" }, { "id": "ad613704-0718-4b83-97f1-b49897f510eb", "comment": "", "command": "waitForElementVisible", - "target": "id=/nameIdFormatFilterTarget.target", - "targets": [], + "target": "css=.list-unstyled:nth-child(2)", + "targets": [ + ["css=.list-unstyled:nth-child(2)", "css:finder"], + ["xpath=//div[@id='filters']/filter-configuration-list/ul/li/filter-configuration-list-item/div[2]/metadata-configuration/div/section/div/div[2]/object-property/filter-target-property/array-property/div/div/ul", "xpath:idRelative"], + ["xpath=//div/div/ul", "xpath:position"] + ], "value": "10000" }, { "id": "6762fdb2-6744-4238-a2df-d529ab3b6102", "comment": "", "command": "assertText", - "target": "id=/nameIdFormatFilterTarget.target", + "target": "css=.list-unstyled:nth-child(2)", "targets": [ ["id=/nameIdFormatFilterTarget.target", "id"], ["css=#\\/nameIdFormatFilterTarget\\.target", "css:finder"], diff --git a/backend/src/integration/resources/SHIBUI-1407-2.side b/backend/src/integration/resources/SHIBUI-1407-2.side index 55879b8e0..2beed178b 100644 --- a/backend/src/integration/resources/SHIBUI-1407-2.side +++ b/backend/src/integration/resources/SHIBUI-1407-2.side @@ -572,17 +572,18 @@ "id": "1067b0b4-8aff-4972-b6f5-e4479eca9150", "comment": "", "command": "waitForElementPresent", - "target": "css=.badge-success", + "target": "css=.d-block > primitive-property:nth-child(1) .text-truncate", "targets": [ - ["css=.badge > span", "css:finder"], - ["xpath=//span/span", "xpath:position"] + ["css=.d-block > primitive-property:nth-child(1) .text-truncate", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section/div/div[2]/object-property/primitive-property/div/div/span[2]", "xpath:idRelative"], + ["xpath=//div/span[2]", "xpath:position"] ], "value": "10000" }, { "id": "f48dd1b5-607a-485b-b1d5-03301f99b9ce", "comment": "", "command": "assertText", - "target": "linkText=Test Metadata Provider", + "target": "css=.d-block > primitive-property:nth-child(1) .text-truncate", "targets": [ ["linkText=Test Metadata Provider", "linkText"], ["css=td > a", "css:finder"], @@ -596,38 +597,26 @@ "id": "5eccd4e9-a451-4ec8-a9e1-1e1f8e771677", "comment": "", "command": "assertText", - "target": "css=td:nth-child(3)", + "target": "css=.d-block > primitive-property:nth-child(2) .text-truncate", "targets": [ - ["css=td:nth-child(3)", "css:finder"], - ["xpath=//td[3]", "xpath:position"], - ["xpath=//td[contains(.,'FileBackedHttpMetadataResolver')]", "xpath:innerText"] + ["css=.d-block > primitive-property:nth-child(2) .text-truncate", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section/div/div[2]/object-property/primitive-property[2]/div/div/span[2]", "xpath:idRelative"], + ["xpath=//primitive-property[2]/div/div/span[2]", "xpath:position"], + ["xpath=//span[contains(.,'FileBackedHttpMetadataResolver')]", "xpath:innerText"] ], "value": "FileBackedHttpMetadataResolver" }, { "id": "c768c2c1-09d4-46fe-8007-42fb4b3f4aaa", "comment": "", "command": "assertText", - "target": "css=td:nth-child(4)", + "target": "css=.author", "targets": [ - ["css=td:nth-child(4)", "css:finder"], - ["xpath=//td[4]", "xpath:position"], - ["xpath=//td[contains(.,'admin')]", "xpath:innerText"] + ["css=.author", "css:finder"], + ["xpath=//div[@id='header']/metadata-header/div/div/h5/span[2]", "xpath:idRelative"], + ["xpath=//span[2]", "xpath:position"], + ["xpath=//span[contains(.,'admin')]", "xpath:innerText"] ], "value": "admin" - }, { - "id": "8283ffc5-d46c-4a07-b95e-1534dfd34c02", - "comment": "", - "command": "click", - "target": "linkText=Test Metadata Provider", - "targets": [ - ["linkText=Test Metadata Provider", "linkText"], - ["css=td > a", "css:finder"], - ["xpath=//a[contains(text(),'Test Metadata Provider')]", "xpath:link"], - ["xpath=//a[contains(@href, '/metadata/provider/ae086029-5871-4951-bcf0-8903d7a1a1f7/configuration/options')]", "xpath:href"], - ["xpath=//td[2]/a", "xpath:position"], - ["xpath=//a[contains(.,'Test Metadata Provider')]", "xpath:innerText"] - ], - "value": "" }, { "id": "67578648-0800-4716-8c0c-27741770249a", "comment": "", @@ -697,20 +686,6 @@ "target": "2000", "targets": [], "value": "" - }, { - "id": "cf005a45-74ae-4f7a-a53c-ed59d63f7114", - "comment": "", - "command": "click", - "target": "linkText=Test Metadata Provider", - "targets": [ - ["linkText=Test Metadata Provider", "linkText"], - ["css=td > a", "css:finder"], - ["xpath=//a[contains(text(),'Test Metadata Provider')]", "xpath:link"], - ["xpath=//a[contains(@href, '/metadata/provider/ae086029-5871-4951-bcf0-8903d7a1a1f7/configuration/options')]", "xpath:href"], - ["xpath=//td[2]/a", "xpath:position"], - ["xpath=//a[contains(.,'Test Metadata Provider')]", "xpath:innerText"] - ], - "value": "" }, { "id": "ea880e6a-498a-427a-bc08-8058137d62e0", "comment": "",