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 29d03624b..9d6aecb88 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 @@ -112,11 +112,10 @@ class SeleniumSIDETest extends Specification { '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 File Backed HTTP Metadata Provider Filters' | '/SHIBUI-1335-1.side' 'SHIBUI-1335: Verify Filesystem Metadata Provider Filters' | '/SHIBUI-1335-2.side' // adding filters to this resolver type was removed in the react update 'SHIBUI-1335: Verify Local Dynamic Metadata Provider Filters' | '/SHIBUI-1335-3.side' // adding filters to this resolver type was removed in the react update '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' // Note that this script WILL NOT PASS in the Selenium IDE. There is a bug in the IDE where it thinks there is a missing ')'. 'SHIBUI-1385: Restore a metadata source version' | '/SHIBUI-1385-1.side' 'SHIBUI-1385: Restore a metadata provider version' | '/SHIBUI-1385-2.side' @@ -131,6 +130,7 @@ class SeleniumSIDETest extends Specification { 'SHIBUI-1740: Verify admin-owned resource not visible to nonadmins' | '/SHIBUI-1740-3.side' 'SHIBUI-1740: Verify nonadmin-owned resource visibility' | '/SHIBUI-1740-4.side' 'SHIBUI-1742: Verify enabler role allows enabling' | '/SHIBUI-1742-1.side' - 'SHIBUI-1742: Verify role CRUD operations' | '/SHIBUI-1742-2.side'*/ + 'SHIBUI-1742: Verify role CRUD operations' | '/SHIBUI-1742-2.side' + 'SHIBUI-1392: Verify provider with script filter is persistable' | '/SHIBUI-1392.side' // Something about this test breaks all the other ones after it } } diff --git a/backend/src/integration/resources/SHIBUI-1335-1.side b/backend/src/integration/resources/SHIBUI-1335-1.side index 0a58996dd..276d22328 100644 --- a/backend/src/integration/resources/SHIBUI-1335-1.side +++ b/backend/src/integration/resources/SHIBUI-1335-1.side @@ -74,10 +74,12 @@ "id": "fdea3214-f0e0-4f13-9d5d-e07ef92d71f1", "comment": "", "command": "click", - "target": "xpath=(//button[@id='dropdown-basic'])[2]", + "target": "id=metadata-nav-dropdown-toggle", "targets": [ - ["xpath=(//button[@id='dropdown-basic'])[2]", "xpath:attributes"], - ["xpath=(//div[@id='basic-nav-dropdown']/button)[2]", "xpath:idRelative"], + ["id=metadata-nav-dropdown-toggle", "id"], + ["css=#metadata-nav-dropdown-toggle", "css:finder"], + ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"], + ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"], ["xpath=//div[2]/button", "xpath:position"], ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"] ], @@ -86,12 +88,14 @@ "id": "2c40ac99-5e92-4c1c-923a-5a6100cadf43", "comment": "", "command": "click", - "target": "linkText=Add a new metadata provider", + "target": "id=metadata-nav-dropdown-provider", "targets": [ + ["id=metadata-nav-dropdown-provider", "id"], ["linkText=Add a new metadata provider", "linkText"], - ["css=.text-primary:nth-child(2)", "css:finder"], + ["css=#metadata-nav-dropdown-provider", "css:finder"], ["xpath=//a[contains(text(),'Add a new metadata provider')]", "xpath:link"], - ["xpath=//div[@id='basic-nav-dropdown']/div/a[2]", "xpath:idRelative"], + ["xpath=//a[@id='metadata-nav-dropdown-provider']", "xpath:attributes"], + ["xpath=//div[@id='metadata-nav-dropdown']/div/a[2]", "xpath:idRelative"], ["xpath=//a[contains(@href, '/metadata/provider/new')]", "xpath:href"], ["xpath=//a[2]", "xpath:position"], ["xpath=//a[contains(.,'Add a new metadata provider')]", "xpath:innerText"] @@ -123,6 +127,13 @@ ["xpath=//input", "xpath:position"] ], "value": "File Backed HTTP Metadata Provider" + }, { + "id": "24f3e12d-2fe4-4be9-88d2-34a164d5e832", + "comment": "", + "command": "waitForElementEditable", + "target": "name=type", + "targets": [], + "value": "30000" }, { "id": "ca36b018-a4df-43d1-9fbd-973d6653d3e0", "comment": "", @@ -570,19 +581,6 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" - }, { - "id": "7cd861ea-d86c-4faa-a07b-c1508811b506", - "comment": "", - "command": "click", - "target": "id=root_enabled", - "targets": [ - ["id=root_enabled", "id"], - ["css=#root_enabled", "css:finder"], - ["xpath=//input[@id='root_enabled']", "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/div/input", "xpath:idRelative"], - ["xpath=//input", "xpath:position"] - ], - "value": "" }, { "id": "0c112a41-8feb-42da-a58b-8fc04e9a3bf6", "comment": "", @@ -730,19 +728,6 @@ ["xpath=//div[2]/div/div/input", "xpath:position"] ], "value": "/foo.*/" - }, { - "id": "f4e6e8a5-0040-4aac-a0f9-9b49abbd9568", - "comment": "", - "command": "click", - "target": "id=root_filterEnabled", - "targets": [ - ["id=root_filterEnabled", "id"], - ["css=#root_filterEnabled", "css:finder"], - ["xpath=//input[@id='root_filterEnabled']", "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[5]/div/div/div/div/div/input", "xpath:idRelative"], - ["xpath=//div[5]/div/div/div/div/div/input", "xpath:position"] - ], - "value": "" }, { "id": "86f35854-4979-4f43-97d9-5026d852514c", "comment": "", @@ -1434,19 +1419,6 @@ ["xpath=//button[contains(.,'Add Entity ID  ')]", "xpath:innerText"] ], "value": "" - }, { - "id": "fa75b464-10a7-43da-939e-550e88748eb6", - "comment": "", - "command": "click", - "target": "id=root_filterEnabled", - "targets": [ - ["id=root_filterEnabled", "id"], - ["css=#root_filterEnabled", "css:finder"], - ["xpath=//input[@id='root_filterEnabled']", "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[2]/div/div/div/div/div/input", "xpath:idRelative"], - ["xpath=//div[2]/div/div/div/div/div/input", "xpath:position"] - ], - "value": "" }, { "id": "56f0e9b6-ee8b-46d4-b40d-b1d4e6dab294", "comment": "", diff --git a/backend/src/integration/resources/SHIBUI-1335-2.side b/backend/src/integration/resources/SHIBUI-1335-2.side index d9027d741..cc2f4afc7 100644 --- a/backend/src/integration/resources/SHIBUI-1335-2.side +++ b/backend/src/integration/resources/SHIBUI-1335-2.side @@ -74,10 +74,12 @@ "id": "94e01321-ac2d-427f-89a5-7f816cea0f00", "comment": "", "command": "click", - "target": "xpath=(//button[@id='dropdown-basic'])[2]", + "target": "id=metadata-nav-dropdown-toggle", "targets": [ - ["xpath=(//button[@id='dropdown-basic'])[2]", "xpath:attributes"], - ["xpath=(//div[@id='basic-nav-dropdown']/button)[2]", "xpath:idRelative"], + ["id=metadata-nav-dropdown-toggle", "id"], + ["css=#metadata-nav-dropdown-toggle", "css:finder"], + ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"], + ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"], ["xpath=//div[2]/button", "xpath:position"], ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"] ], @@ -86,12 +88,14 @@ "id": "c65500ae-3b08-4c22-8c88-b4116d6e0c9b", "comment": "", "command": "click", - "target": "linkText=Add a new metadata provider", + "target": "id=metadata-nav-dropdown-provider", "targets": [ + ["id=metadata-nav-dropdown-provider", "id"], ["linkText=Add a new metadata provider", "linkText"], - ["css=.text-primary:nth-child(2)", "css:finder"], + ["css=#metadata-nav-dropdown-provider", "css:finder"], ["xpath=//a[contains(text(),'Add a new metadata provider')]", "xpath:link"], - ["xpath=//div[@id='basic-nav-dropdown']/div/a[2]", "xpath:idRelative"], + ["xpath=//a[@id='metadata-nav-dropdown-provider']", "xpath:attributes"], + ["xpath=//div[@id='metadata-nav-dropdown']/div/a[2]", "xpath:idRelative"], ["xpath=//a[contains(@href, '/metadata/provider/new')]", "xpath:href"], ["xpath=//a[2]", "xpath:position"], ["xpath=//a[contains(.,'Add a new metadata provider')]", "xpath:innerText"] @@ -123,6 +127,13 @@ ["xpath=//input", "xpath:position"] ], "value": "Filesystem Metadata Provider" + }, { + "id": "f1d094a5-3a8b-4336-9d61-2f2d4b852ed4", + "comment": "", + "command": "waitForElementEditable", + "target": "name=type", + "targets": [], + "value": "30000" }, { "id": "aac150b1-6140-476b-8bdb-ebb83a14812d", "comment": "", @@ -328,19 +339,6 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" - }, { - "id": "c5fbaf24-139b-4886-a437-ef41a695bbc9", - "comment": "", - "command": "click", - "target": "id=root_enabled", - "targets": [ - ["id=root_enabled", "id"], - ["css=#root_enabled", "css:finder"], - ["xpath=//input[@id='root_enabled']", "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/div/input", "xpath:idRelative"], - ["xpath=//input", "xpath:position"] - ], - "value": "" }, { "id": "7fcdaee3-5714-4c5a-93a7-b1b15c6b24e1", "comment": "", diff --git a/backend/src/integration/resources/SHIBUI-1335-3.side b/backend/src/integration/resources/SHIBUI-1335-3.side index bdcd4c244..21ab92c02 100644 --- a/backend/src/integration/resources/SHIBUI-1335-3.side +++ b/backend/src/integration/resources/SHIBUI-1335-3.side @@ -74,10 +74,12 @@ "id": "94e01321-ac2d-427f-89a5-7f816cea0f00", "comment": "", "command": "click", - "target": "xpath=(//button[@id='dropdown-basic'])[2]", + "target": "id=metadata-nav-dropdown-toggle", "targets": [ - ["xpath=(//button[@id='dropdown-basic'])[2]", "xpath:attributes"], - ["xpath=(//div[@id='basic-nav-dropdown']/button)[2]", "xpath:idRelative"], + ["id=metadata-nav-dropdown-toggle", "id"], + ["css=#metadata-nav-dropdown-toggle", "css:finder"], + ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"], + ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"], ["xpath=//div[2]/button", "xpath:position"], ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"] ], @@ -86,12 +88,14 @@ "id": "c65500ae-3b08-4c22-8c88-b4116d6e0c9b", "comment": "", "command": "click", - "target": "linkText=Add a new metadata provider", + "target": "id=metadata-nav-dropdown-provider", "targets": [ + ["id=metadata-nav-dropdown-provider", "id"], ["linkText=Add a new metadata provider", "linkText"], - ["css=.text-primary:nth-child(2)", "css:finder"], + ["css=#metadata-nav-dropdown-provider", "css:finder"], ["xpath=//a[contains(text(),'Add a new metadata provider')]", "xpath:link"], - ["xpath=//div[@id='basic-nav-dropdown']/div/a[2]", "xpath:idRelative"], + ["xpath=//a[@id='metadata-nav-dropdown-provider']", "xpath:attributes"], + ["xpath=//div[@id='metadata-nav-dropdown']/div/a[2]", "xpath:idRelative"], ["xpath=//a[contains(@href, '/metadata/provider/new')]", "xpath:href"], ["xpath=//a[2]", "xpath:position"], ["xpath=//a[contains(.,'Add a new metadata provider')]", "xpath:innerText"] @@ -123,6 +127,13 @@ ["xpath=//input", "xpath:position"] ], "value": "Local Dynamic Metadata Provider" + }, { + "id": "d2ea5b2f-a693-49bb-b644-b1fb35ff54c6", + "comment": "", + "command": "waitForElementEditable", + "target": "name=type", + "targets": [], + "value": "30000" }, { "id": "aac150b1-6140-476b-8bdb-ebb83a14812d", "comment": "", @@ -399,19 +410,6 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" - }, { - "id": "d02ae356-8086-4794-97ba-980fc75cca79", - "comment": "", - "command": "click", - "target": "id=root_enabled", - "targets": [ - ["id=root_enabled", "id"], - ["css=#root_enabled", "css:finder"], - ["xpath=//input[@id='root_enabled']", "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/div/input", "xpath:idRelative"], - ["xpath=//input", "xpath:position"] - ], - "value": "" }, { "id": "dc60328b-d6e0-4f62-96c5-012f0fb5edc4", "comment": "", diff --git a/backend/src/integration/resources/SHIBUI-1335-4.side b/backend/src/integration/resources/SHIBUI-1335-4.side index 512c5b5c2..b5b4ff85b 100644 --- a/backend/src/integration/resources/SHIBUI-1335-4.side +++ b/backend/src/integration/resources/SHIBUI-1335-4.side @@ -74,10 +74,12 @@ "id": "94e01321-ac2d-427f-89a5-7f816cea0f00", "comment": "", "command": "click", - "target": "xpath=(//button[@id='dropdown-basic'])[2]", + "target": "id=metadata-nav-dropdown-toggle", "targets": [ - ["xpath=(//button[@id='dropdown-basic'])[2]", "xpath:attributes"], - ["xpath=(//div[@id='basic-nav-dropdown']/button)[2]", "xpath:idRelative"], + ["id=metadata-nav-dropdown-toggle", "id"], + ["css=#metadata-nav-dropdown-toggle", "css:finder"], + ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"], + ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"], ["xpath=//div[2]/button", "xpath:position"], ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"] ], @@ -86,12 +88,14 @@ "id": "c65500ae-3b08-4c22-8c88-b4116d6e0c9b", "comment": "", "command": "click", - "target": "linkText=Add a new metadata provider", + "target": "id=metadata-nav-dropdown-provider", "targets": [ + ["id=metadata-nav-dropdown-provider", "id"], ["linkText=Add a new metadata provider", "linkText"], - ["css=.text-primary:nth-child(2)", "css:finder"], + ["css=#metadata-nav-dropdown-provider", "css:finder"], ["xpath=//a[contains(text(),'Add a new metadata provider')]", "xpath:link"], - ["xpath=//div[@id='basic-nav-dropdown']/div/a[2]", "xpath:idRelative"], + ["xpath=//a[@id='metadata-nav-dropdown-provider']", "xpath:attributes"], + ["xpath=//div[@id='metadata-nav-dropdown']/div/a[2]", "xpath:idRelative"], ["xpath=//a[contains(@href, '/metadata/provider/new')]", "xpath:href"], ["xpath=//a[2]", "xpath:position"], ["xpath=//a[contains(.,'Add a new metadata provider')]", "xpath:innerText"] @@ -123,6 +127,13 @@ ["xpath=//input", "xpath:position"] ], "value": "Dynamic Http Metadata Provider" + }, { + "id": "833f72b8-851b-469c-bd2d-71f1cfbef83e", + "comment": "", + "command": "waitForElementEditable", + "target": "name=type", + "targets": [], + "value": "30000" }, { "id": "aac150b1-6140-476b-8bdb-ebb83a14812d", "comment": "", @@ -648,19 +659,6 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" - }, { - "id": "c4d98111-537a-45a1-9bfd-e8d780a0c0b3", - "comment": "", - "command": "click", - "target": "id=root_enabled", - "targets": [ - ["id=root_enabled", "id"], - ["css=#root_enabled", "css:finder"], - ["xpath=//input[@id='root_enabled']", "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/div/input", "xpath:idRelative"], - ["xpath=//input", "xpath:position"] - ], - "value": "" }, { "id": "a57a12dd-b641-46eb-afce-4c7be5a8f180", "comment": "", @@ -809,19 +807,6 @@ ["xpath=//button[contains(.,'Add Entity ID  ')]", "xpath:innerText"] ], "value": "" - }, { - "id": "dff6b5d5-02ae-41a1-bae4-6ce39aeca199", - "comment": "", - "command": "click", - "target": "id=root_filterEnabled", - "targets": [ - ["id=root_filterEnabled", "id"], - ["css=#root_filterEnabled", "css:finder"], - ["xpath=//input[@id='root_filterEnabled']", "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[5]/div/div/div/div/div/input", "xpath:idRelative"], - ["xpath=//div[5]/div/div/div/div/div/input", "xpath:position"] - ], - "value": "" }, { "id": "f82a986d-d0e8-433d-8b5c-805e84b76d6e", "comment": "", @@ -1168,7 +1153,7 @@ "id": "6b3ec8f1-8b9a-40f5-816f-3a1e415b9d8d", "comment": "", "command": "pause", - "target": "3000", + "target": "5000", "targets": [], "value": "" }, { diff --git a/backend/src/integration/resources/SHIBUI-1361.side b/backend/src/integration/resources/SHIBUI-1361.side index 85a88025a..49252fd76 100644 --- a/backend/src/integration/resources/SHIBUI-1361.side +++ b/backend/src/integration/resources/SHIBUI-1361.side @@ -88,10 +88,12 @@ "id": "e7a98419-36c7-4b0f-a99d-087144f6a417", "comment": "", "command": "click", - "target": "xpath=(//button[@id='dropdown-basic'])[2]", + "target": "id=metadata-nav-dropdown-toggle", "targets": [ - ["xpath=(//button[@id='dropdown-basic'])[2]", "xpath:attributes"], - ["xpath=(//div[@id='basic-nav-dropdown']/button)[2]", "xpath:idRelative"], + ["id=metadata-nav-dropdown-toggle", "id"], + ["css=#metadata-nav-dropdown-toggle", "css:finder"], + ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"], + ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"], ["xpath=//div[2]/button", "xpath:position"], ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"] ], @@ -100,12 +102,14 @@ "id": "74fef022-3979-4bed-9226-b25114514976", "comment": "", "command": "click", - "target": "linkText=Add a new metadata provider", + "target": "id=metadata-nav-dropdown-provider", "targets": [ + ["id=metadata-nav-dropdown-provider", "id"], ["linkText=Add a new metadata provider", "linkText"], - ["css=.text-primary:nth-child(2)", "css:finder"], + ["css=#metadata-nav-dropdown-provider", "css:finder"], ["xpath=//a[contains(text(),'Add a new metadata provider')]", "xpath:link"], - ["xpath=//div[@id='basic-nav-dropdown']/div/a[2]", "xpath:idRelative"], + ["xpath=//a[@id='metadata-nav-dropdown-provider']", "xpath:attributes"], + ["xpath=//div[@id='metadata-nav-dropdown']/div/a[2]", "xpath:idRelative"], ["xpath=//a[contains(@href, '/metadata/provider/new')]", "xpath:href"], ["xpath=//a[2]", "xpath:position"], ["xpath=//a[contains(.,'Add a new metadata provider')]", "xpath:innerText"] @@ -137,6 +141,13 @@ ["xpath=//input", "xpath:position"] ], "value": "Test Metadata Provider" + }, { + "id": "ea6f0896-33a5-4e02-b8a9-9d171b83c716", + "comment": "", + "command": "waitForElementEditable", + "target": "name=type", + "targets": [], + "value": "30000" }, { "id": "add874d5-e3b2-4412-8039-2b9d2619ed19", "comment": "", @@ -593,19 +604,6 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" - }, { - "id": "79b96f40-2677-438a-9564-62df0ea2c116", - "comment": "", - "command": "click", - "target": "id=root_enabled", - "targets": [ - ["id=root_enabled", "id"], - ["css=#root_enabled", "css:finder"], - ["xpath=//input[@id='root_enabled']", "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/div/input", "xpath:idRelative"], - ["xpath=//input", "xpath:position"] - ], - "value": "" }, { "id": "52f5680c-c63d-411e-8332-52901f12ea3b", "comment": "", @@ -888,11 +886,11 @@ "id": "ce328b6a-f6ee-45e9-975c-5a5608f373dc", "comment": "", "command": "waitForElementVisible", - "target": "css=div:nth-child(4) > .bg-diff > .d-block:nth-child(2)", + "target": "css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", "targets": [ - ["css=div:nth-child(4) > .bg-diff > .d-block:nth-child(2)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div/span[2]", "xpath:idRelative"], - ["xpath=//div[4]/div/span[2]", "xpath:position"], + ["css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[2]", "xpath:idRelative"], + ["xpath=//div[3]/div/span[2]", "xpath:position"], ["xpath=//span[contains(.,'123 v2')]", "xpath:innerText"] ], "value": "10000" @@ -900,11 +898,11 @@ "id": "68103f0e-e3f1-419b-903d-5d8c30bc6700", "comment": "", "command": "assertText", - "target": "css=div:nth-child(4) > .bg-diff > .d-block:nth-child(2)", + "target": "css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", "targets": [ - ["css=div:nth-child(4) > .bg-diff > .d-block:nth-child(2)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div/span[2]", "xpath:idRelative"], - ["xpath=//div[4]/div/span[2]", "xpath:position"], + ["css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[2]", "xpath:idRelative"], + ["xpath=//div[3]/div/span[2]", "xpath:position"], ["xpath=//span[contains(.,'123 v2')]", "xpath:innerText"] ], "value": "123 v2" @@ -912,33 +910,34 @@ "id": "a13198b9-7827-47e2-ade3-143b981d34ee", "comment": "", "command": "assertText", - "target": "css=div:nth-child(4) > .bg-diff > .d-block:nth-child(3)", + "target": "css=div:nth-child(3) > .bg-diff > .d-block:nth-child(3)", "targets": [ - ["css=div:nth-child(4) > .bg-diff > .d-block:nth-child(3)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div/span[3]", "xpath:idRelative"], - ["xpath=//div[4]/div/span[3]", "xpath:position"] + ["css=div:nth-child(3) > .bg-diff > .d-block:nth-child(3)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[3]", "xpath:idRelative"], + ["xpath=//div[3]/div/span[3]", "xpath:position"] ], "value": "123" }, { "id": "3d83741c-299e-4fcb-9ce6-4b7291c423a4", "comment": "", "command": "assertText", - "target": "css=div:nth-child(12) > .bg-diff > .d-block:nth-child(2)", + "target": "css=div:nth-child(11) > .bg-diff > .d-block:nth-child(2)", "targets": [ - ["css=div:nth-child(12) > .bg-diff > .d-block:nth-child(2)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[12]/div/span[2]", "xpath:idRelative"], - ["xpath=//div[12]/div/span[2]", "xpath:position"] + ["css=div:nth-child(11) > .bg-diff > .d-block:nth-child(2)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[11]/div/span[2]", "xpath:idRelative"], + ["xpath=//div[11]/div/span[2]", "xpath:position"] ], "value": "false" }, { "id": "190cc157-d427-4046-aff2-180392395ad3", "comment": "", "command": "assertText", - "target": "css=div:nth-child(12) > .bg-diff > .d-block:nth-child(3)", + "target": "css=div:nth-child(11) > .bg-diff > .d-block:nth-child(3)", "targets": [ - ["css=div:nth-child(12) > .bg-diff > .d-block:nth-child(3)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[12]/div/span[3]", "xpath:idRelative"], - ["xpath=//div[12]/div/span[3]", "xpath:position"] + ["css=div:nth-child(11) > .bg-diff > .d-block:nth-child(3)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[11]/div/span[3]", "xpath:idRelative"], + ["xpath=//div[11]/div/span[3]", "xpath:position"], + ["xpath=//span[contains(.,'true')]", "xpath:innerText"] ], "value": "true" }, { @@ -1324,9 +1323,9 @@ "id": "8a2c6435-d77b-4c87-8e0e-e1ae6d4629b9", "comment": "", "command": "assertText", - "target": "css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", + "target": "css=div:nth-child(1) > div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", "targets": [ - ["css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", "css:finder"], + ["css=div:nth-child(1) > div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", "css:finder"], ["xpath=//div[@id='root']/div/main/div/section/div/div/section[4]/div/div[2]/div[2]/div/div[3]/div/span[2]", "xpath:idRelative"], ["xpath=//section[4]/div/div[2]/div[2]/div/div[3]/div/span[2]", "xpath:position"] ], @@ -1335,9 +1334,9 @@ "id": "0687fe3f-c1af-4a5a-9708-09b7b92734bc", "comment": "", "command": "assertText", - "target": "css=div:nth-child(1) > div:nth-child(4) > .d-flex > .d-block:nth-child(2)", + "target": "css=div:nth-child(4) > .bg-diff > .d-block:nth-child(2)", "targets": [ - ["css=div:nth-child(1) > div:nth-child(4) > .d-flex > .d-block:nth-child(2)", "css:finder"], + ["css=div:nth-child(4) > .bg-diff > .d-block:nth-child(2)", "css:finder"], ["xpath=//div[@id='root']/div/main/div/section/div/div/section[4]/div/div[2]/div[2]/div/div[4]/div/span[2]", "xpath:idRelative"], ["xpath=//div[2]/div[2]/div/div[4]/div/span[2]", "xpath:position"], ["xpath=//span[contains(.,'PT1M')]", "xpath:innerText"] diff --git a/backend/src/integration/resources/SHIBUI-1364-1.side b/backend/src/integration/resources/SHIBUI-1364-1.side index 523a6ef53..77da3e3d2 100644 --- a/backend/src/integration/resources/SHIBUI-1364-1.side +++ b/backend/src/integration/resources/SHIBUI-1364-1.side @@ -675,10 +675,10 @@ }, { "id": "f62f8d1d-8c53-4cb5-bc19-84f68fee870d", "comment": "", - "command": "pause", - "target": "5000", + "command": "waitForElementEditable", + "target": "name=type", "targets": [], - "value": "" + "value": "30000" }, { "id": "dc41b26d-b101-4ead-866f-482df0bfee04", "comment": "", diff --git a/backend/src/integration/resources/SHIBUI-1385-1.side b/backend/src/integration/resources/SHIBUI-1385-1.side index 48940bee7..db4a3d78d 100644 --- a/backend/src/integration/resources/SHIBUI-1385-1.side +++ b/backend/src/integration/resources/SHIBUI-1385-1.side @@ -74,10 +74,12 @@ "id": "ad3811ad-f95b-4cca-a5d9-63a10063a652", "comment": "", "command": "click", - "target": "xpath=(//button[@id='dropdown-basic'])[2]", + "target": "id=metadata-nav-dropdown-toggle", "targets": [ - ["xpath=(//button[@id='dropdown-basic'])[2]", "xpath:attributes"], - ["xpath=(//div[@id='basic-nav-dropdown']/button)[2]", "xpath:idRelative"], + ["id=metadata-nav-dropdown-toggle", "id"], + ["css=#metadata-nav-dropdown-toggle", "css:finder"], + ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"], + ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"], ["xpath=//div[2]/button", "xpath:position"], ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"] ], @@ -86,14 +88,16 @@ "id": "1caf8be6-a4d9-4b3b-ace1-0f76d3600d62", "comment": "", "command": "click", - "target": "linkText=Add a new metadata source", + "target": "id=metadata-nav-dropdown-source", "targets": [ + ["id=metadata-nav-dropdown-source", "id"], ["linkText=Add a new metadata source", "linkText"], - ["css=.text-primary:nth-child(1)", "css:finder"], + ["css=#metadata-nav-dropdown-source", "css:finder"], ["xpath=//a[contains(text(),'Add a new metadata source')]", "xpath:link"], - ["xpath=//div[@id='basic-nav-dropdown']/div/a", "xpath:idRelative"], + ["xpath=//a[@id='metadata-nav-dropdown-source']", "xpath:attributes"], + ["xpath=//div[@id='metadata-nav-dropdown']/div/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '/metadata/source/new')]", "xpath:href"], - ["xpath=//div/a", "xpath:position"], + ["xpath=//div[2]/div/a", "xpath:position"], ["xpath=//a[contains(.,'Add a new metadata source')]", "xpath:innerText"] ], "value": "" @@ -1932,19 +1936,6 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" - }, { - "id": "14ca713a-313d-4cda-82ca-a0b814ce81dc", - "comment": "", - "command": "click", - "target": "id=root_serviceEnabled", - "targets": [ - ["id=root_serviceEnabled", "id"], - ["css=#root_serviceEnabled", "css:finder"], - ["xpath=//input[@id='root_serviceEnabled']", "xpath:attributes"], - ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[11]/div/div/div/div/input", "xpath:idRelative"], - ["xpath=//input", "xpath:position"] - ], - "value": "" }, { "id": "3baa7bd3-55c0-4d10-8aa3-c0daa63ec4d4", "comment": "", @@ -2198,10 +2189,10 @@ "id": "3f2c3eab-ecbf-45f3-bcdc-a5cad766b27c", "comment": "", "command": "assertText", - "target": "css=div:nth-child(5) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block", + "target": "css=div:nth-child(2) > div:nth-child(4) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block", "targets": [ - ["css=div:nth-child(5) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[5]/div[2]/div[3]/span", "xpath:idRelative"], + ["css=div:nth-child(2) > div:nth-child(4) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div[2]/div[3]/span", "xpath:idRelative"], ["xpath=//div[3]/span", "xpath:position"], ["xpath=//span[contains(.,'user@test.org')]", "xpath:innerText"] ], diff --git a/backend/src/integration/resources/SHIBUI-1385-2.side b/backend/src/integration/resources/SHIBUI-1385-2.side index 0c09f6ee1..c6ff334eb 100644 --- a/backend/src/integration/resources/SHIBUI-1385-2.side +++ b/backend/src/integration/resources/SHIBUI-1385-2.side @@ -74,10 +74,12 @@ "id": "e7a98419-36c7-4b0f-a99d-087144f6a417", "comment": "", "command": "click", - "target": "xpath=(//button[@id='dropdown-basic'])[2]", + "target": "id=metadata-nav-dropdown-toggle", "targets": [ - ["xpath=(//button[@id='dropdown-basic'])[2]", "xpath:attributes"], - ["xpath=(//div[@id='basic-nav-dropdown']/button)[2]", "xpath:idRelative"], + ["id=metadata-nav-dropdown-toggle", "id"], + ["css=#metadata-nav-dropdown-toggle", "css:finder"], + ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"], + ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"], ["xpath=//div[2]/button", "xpath:position"], ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"] ], @@ -86,29 +88,25 @@ "id": "74fef022-3979-4bed-9226-b25114514976", "comment": "", "command": "click", - "target": "linkText=Add a new metadata provider", + "target": "id=metadata-nav-dropdown-provider", "targets": [ + ["id=metadata-nav-dropdown-provider", "id"], ["linkText=Add a new metadata provider", "linkText"], - ["css=.text-primary:nth-child(2)", "css:finder"], + ["css=#metadata-nav-dropdown-provider", "css:finder"], ["xpath=//a[contains(text(),'Add a new metadata provider')]", "xpath:link"], - ["xpath=//div[@id='basic-nav-dropdown']/div/a[2]", "xpath:idRelative"], + ["xpath=//a[@id='metadata-nav-dropdown-provider']", "xpath:attributes"], + ["xpath=//div[@id='metadata-nav-dropdown']/div/a[2]", "xpath:idRelative"], ["xpath=//a[contains(@href, '/metadata/provider/new')]", "xpath:href"], ["xpath=//a[2]", "xpath:position"], ["xpath=//a[contains(.,'Add a new metadata provider')]", "xpath:innerText"] ], "value": "" }, { - "id": "93dd88c6-a2c1-44c6-a18c-90d2929b7530", + "id": "1857e64e-7acf-43a1-b708-462694baa051", "comment": "", "command": "waitForElementEditable", - "target": "name=type", - "targets": [ - ["name=type", "name"], - ["css=.custom-select", "css:finder"], - ["xpath=//select[@name='type']", "xpath:attributes"], - ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div/div/form/div[2]/select", "xpath:idRelative"], - ["xpath=//select", "xpath:position"] - ], + "target": "name=name", + "targets": [], "value": "30000" }, { "id": "b49d6ed7-75ea-4be8-9a79-c7fd83287aa0", @@ -136,6 +134,19 @@ ["xpath=//input", "xpath:position"] ], "value": "Test Metadata Provider" + }, { + "id": "93dd88c6-a2c1-44c6-a18c-90d2929b7530", + "comment": "", + "command": "waitForElementEditable", + "target": "name=type", + "targets": [ + ["name=type", "name"], + ["css=.custom-select", "css:finder"], + ["xpath=//select[@name='type']", "xpath:attributes"], + ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div/div/form/div[2]/select", "xpath:idRelative"], + ["xpath=//select", "xpath:position"] + ], + "value": "30000" }, { "id": "add874d5-e3b2-4412-8039-2b9d2619ed19", "comment": "", @@ -592,19 +603,6 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" - }, { - "id": "79b96f40-2677-438a-9564-62df0ea2c116", - "comment": "", - "command": "click", - "target": "id=root_enabled", - "targets": [ - ["id=root_enabled", "id"], - ["css=#root_enabled", "css:finder"], - ["xpath=//input[@id='root_enabled']", "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/div/input", "xpath:idRelative"], - ["xpath=//input", "xpath:position"] - ], - "value": "" }, { "id": "52f5680c-c63d-411e-8332-52901f12ea3b", "comment": "", @@ -836,11 +834,11 @@ "id": "ce328b6a-f6ee-45e9-975c-5a5608f373dc", "comment": "", "command": "waitForElementVisible", - "target": "css=div:nth-child(4) > .bg-diff > .d-block:nth-child(2)", + "target": "css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", "targets": [ - ["css=div:nth-child(4) > .bg-diff > .d-block:nth-child(2)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div/span[2]", "xpath:idRelative"], - ["xpath=//div[4]/div/span[2]", "xpath:position"], + ["css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[2]", "xpath:idRelative"], + ["xpath=//div[3]/div/span[2]", "xpath:position"], ["xpath=//span[contains(.,'123 version 2')]", "xpath:innerText"] ], "value": "10000" @@ -848,11 +846,11 @@ "id": "68103f0e-e3f1-419b-903d-5d8c30bc6700", "comment": "", "command": "assertText", - "target": "css=div:nth-child(4) > .bg-diff > .d-block:nth-child(2)", + "target": "css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", "targets": [ - ["css=div:nth-child(4) > .bg-diff > .d-block:nth-child(2)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div/span[2]", "xpath:idRelative"], - ["xpath=//div[4]/div/span[2]", "xpath:position"], + ["css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[2]", "xpath:idRelative"], + ["xpath=//div[3]/div/span[2]", "xpath:position"], ["xpath=//span[contains(.,'123 version 2')]", "xpath:innerText"] ], "value": "123 version 2" @@ -860,44 +858,45 @@ "id": "7c42f2aa-9628-43e0-8eda-92105288270c", "comment": "", "command": "waitForElementVisible", - "target": "css=div:nth-child(4) > .bg-diff > .d-block:nth-child(3)", + "target": "css=div:nth-child(3) > .bg-diff > .d-block:nth-child(3)", "targets": [ - ["css=div:nth-child(4) > .bg-diff > .d-block:nth-child(3)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div/span[3]", "xpath:idRelative"], - ["xpath=//div[4]/div/span[3]", "xpath:position"] + ["css=div:nth-child(3) > .bg-diff > .d-block:nth-child(3)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[3]", "xpath:idRelative"], + ["xpath=//div[3]/div/span[3]", "xpath:position"] ], "value": "30000" }, { "id": "a13198b9-7827-47e2-ade3-143b981d34ee", "comment": "", "command": "assertText", - "target": "css=div:nth-child(4) > .bg-diff > .d-block:nth-child(3)", + "target": "css=div:nth-child(3) > .bg-diff > .d-block:nth-child(3)", "targets": [ - ["css=div:nth-child(4) > .bg-diff > .d-block:nth-child(3)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div/span[3]", "xpath:idRelative"], - ["xpath=//div[4]/div/span[3]", "xpath:position"] + ["css=div:nth-child(3) > .bg-diff > .d-block:nth-child(3)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[3]", "xpath:idRelative"], + ["xpath=//div[3]/div/span[3]", "xpath:position"] ], "value": "123" }, { "id": "3d83741c-299e-4fcb-9ce6-4b7291c423a4", "comment": "", "command": "assertText", - "target": "css=div:nth-child(12) > .bg-diff > .d-block:nth-child(2)", + "target": "css=div:nth-child(11) > .bg-diff > .d-block:nth-child(2)", "targets": [ - ["css=div:nth-child(12) > .bg-diff > .d-block:nth-child(2)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[12]/div/span[2]", "xpath:idRelative"], - ["xpath=//div[12]/div/span[2]", "xpath:position"] + ["css=div:nth-child(11) > .bg-diff > .d-block:nth-child(2)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[11]/div/span[2]", "xpath:idRelative"], + ["xpath=//div[11]/div/span[2]", "xpath:position"] ], "value": "false" }, { "id": "190cc157-d427-4046-aff2-180392395ad3", "comment": "", "command": "assertText", - "target": "css=div:nth-child(12) > .bg-diff > .d-block:nth-child(3)", + "target": "css=div:nth-child(11) > .bg-diff > .d-block:nth-child(3)", "targets": [ - ["css=div:nth-child(12) > .bg-diff > .d-block:nth-child(3)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[12]/div/span[3]", "xpath:idRelative"], - ["xpath=//div[12]/div/span[3]", "xpath:position"] + ["css=div:nth-child(11) > .bg-diff > .d-block:nth-child(3)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[11]/div/span[3]", "xpath:idRelative"], + ["xpath=//div[11]/div/span[3]", "xpath:position"], + ["xpath=//span[contains(.,'true')]", "xpath:innerText"] ], "value": "true" }, { @@ -1345,11 +1344,11 @@ "id": "30aae338-393c-4312-8ccc-f3fd8acb3aad", "comment": "", "command": "assertText", - "target": "css=div:nth-child(2) > div:nth-child(4) .text-truncate", + "target": "css=div:nth-child(2) > div:nth-child(3) .text-truncate", "targets": [ - ["css=div:nth-child(2) > div:nth-child(4) .text-truncate", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div/span[2]", "xpath:idRelative"], - ["xpath=//div[4]/div/span[2]", "xpath:position"], + ["css=div:nth-child(2) > div:nth-child(3) .text-truncate", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[2]", "xpath:idRelative"], + ["xpath=//div[3]/div/span[2]", "xpath:position"], ["xpath=//span[contains(.,'123 version 2')]", "xpath:innerText"] ], "value": "123 version 2" @@ -1410,11 +1409,11 @@ "id": "20bfdc06-e12b-4287-ad14-3ca578d84de1", "comment": "", "command": "waitForElementVisible", - "target": "css=div:nth-child(2) > div:nth-child(4) .d-block:nth-child(2)", + "target": "css=div:nth-child(2) > div:nth-child(3) .d-block:nth-child(2)", "targets": [ - ["css=div:nth-child(2) > div:nth-child(4) .d-block:nth-child(2)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div/span[2]", "xpath:idRelative"], - ["xpath=//div[4]/div/span[2]", "xpath:position"], + ["css=div:nth-child(2) > div:nth-child(3) .d-block:nth-child(2)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[2]", "xpath:idRelative"], + ["xpath=//div[3]/div/span[2]", "xpath:position"], ["xpath=//span[contains(.,'123 version 2')]", "xpath:innerText"] ], "value": "10000" @@ -1422,11 +1421,11 @@ "id": "a6c78ab6-5584-490f-9bfd-b1eda70b864b", "comment": "", "command": "assertText", - "target": "css=div:nth-child(2) > div:nth-child(4) .d-block:nth-child(2)", + "target": "css=div:nth-child(2) > div:nth-child(3) .d-block:nth-child(2)", "targets": [ - ["css=div:nth-child(2) > div:nth-child(4) .d-block:nth-child(2)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div/span[2]", "xpath:idRelative"], - ["xpath=//div[4]/div/span[2]", "xpath:position"], + ["css=div:nth-child(2) > div:nth-child(3) .d-block:nth-child(2)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[2]", "xpath:idRelative"], + ["xpath=//div[3]/div/span[2]", "xpath:position"], ["xpath=//span[contains(.,'123 version 2')]", "xpath:innerText"] ], "value": "123 version 2" @@ -1434,22 +1433,22 @@ "id": "e84a86f4-7ff4-423c-a941-52641274c276", "comment": "", "command": "waitForElementVisible", - "target": "css=div:nth-child(2) > div:nth-child(4) .d-block:nth-child(3)", + "target": "css=div:nth-child(2) > div:nth-child(3) .d-block:nth-child(3)", "targets": [ - ["css=div:nth-child(2) > div:nth-child(4) .d-block:nth-child(3)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div/span[3]", "xpath:idRelative"], - ["xpath=//div[4]/div/span[3]", "xpath:position"] + ["css=div:nth-child(2) > div:nth-child(3) .d-block:nth-child(3)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[3]", "xpath:idRelative"], + ["xpath=//div[3]/div/span[3]", "xpath:position"] ], "value": "30000" }, { "id": "17832263-6fd7-4df8-86ba-f3e2fdc5d8ce", "comment": "", "command": "assertText", - "target": "css=div:nth-child(2) > div:nth-child(4) .d-block:nth-child(3)", + "target": "css=div:nth-child(2) > div:nth-child(3) .d-block:nth-child(3)", "targets": [ - ["css=div:nth-child(2) > div:nth-child(4) .d-block:nth-child(3)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div/span[3]", "xpath:idRelative"], - ["xpath=//div[4]/div/span[3]", "xpath:position"] + ["css=div:nth-child(2) > div:nth-child(3) .d-block:nth-child(3)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[3]", "xpath:idRelative"], + ["xpath=//div[3]/div/span[3]", "xpath:position"] ], "value": "123 version 2" }, { diff --git a/backend/src/integration/resources/SHIBUI-1391.side b/backend/src/integration/resources/SHIBUI-1391.side index fb1fd87d3..8a24dc630 100644 --- a/backend/src/integration/resources/SHIBUI-1391.side +++ b/backend/src/integration/resources/SHIBUI-1391.side @@ -74,10 +74,12 @@ "id": "fdea3214-f0e0-4f13-9d5d-e07ef92d71f1", "comment": "", "command": "click", - "target": "xpath=(//button[@id='dropdown-basic'])[2]", + "target": "id=metadata-nav-dropdown-toggle", "targets": [ - ["xpath=(//button[@id='dropdown-basic'])[2]", "xpath:attributes"], - ["xpath=(//div[@id='basic-nav-dropdown']/button)[2]", "xpath:idRelative"], + ["id=metadata-nav-dropdown-toggle", "id"], + ["css=#metadata-nav-dropdown-toggle", "css:finder"], + ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"], + ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"], ["xpath=//div[2]/button", "xpath:position"], ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"] ], @@ -86,12 +88,14 @@ "id": "2c40ac99-5e92-4c1c-923a-5a6100cadf43", "comment": "", "command": "click", - "target": "linkText=Add a new metadata provider", + "target": "id=metadata-nav-dropdown-provider", "targets": [ + ["id=metadata-nav-dropdown-provider", "id"], ["linkText=Add a new metadata provider", "linkText"], - ["css=.text-primary:nth-child(2)", "css:finder"], + ["css=#metadata-nav-dropdown-provider", "css:finder"], ["xpath=//a[contains(text(),'Add a new metadata provider')]", "xpath:link"], - ["xpath=//div[@id='basic-nav-dropdown']/div/a[2]", "xpath:idRelative"], + ["xpath=//a[@id='metadata-nav-dropdown-provider']", "xpath:attributes"], + ["xpath=//div[@id='metadata-nav-dropdown']/div/a[2]", "xpath:idRelative"], ["xpath=//a[contains(@href, '/metadata/provider/new')]", "xpath:href"], ["xpath=//a[2]", "xpath:position"], ["xpath=//a[contains(.,'Add a new metadata provider')]", "xpath:innerText"] @@ -123,6 +127,13 @@ ["xpath=//input", "xpath:position"] ], "value": "File Backed HTTP Metadata Provider" + }, { + "id": "cf0975b7-09f2-4c28-ae07-db63143e18ea", + "comment": "", + "command": "waitForElementEditable", + "target": "name=type", + "targets": [], + "value": "30000" }, { "id": "ca36b018-a4df-43d1-9fbd-973d6653d3e0", "comment": "", @@ -545,19 +556,6 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" - }, { - "id": "7cd861ea-d86c-4faa-a07b-c1508811b506", - "comment": "", - "command": "click", - "target": "id=root_enabled", - "targets": [ - ["id=root_enabled", "id"], - ["css=#root_enabled", "css:finder"], - ["xpath=//input[@id='root_enabled']", "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/div/input", "xpath:idRelative"], - ["xpath=//input", "xpath:position"] - ], - "value": "" }, { "id": "0c112a41-8feb-42da-a58b-8fc04e9a3bf6", "comment": "", diff --git a/backend/src/integration/resources/SHIBUI-1392.side b/backend/src/integration/resources/SHIBUI-1392.side index bba2d9c63..e5bc32d1f 100644 --- a/backend/src/integration/resources/SHIBUI-1392.side +++ b/backend/src/integration/resources/SHIBUI-1392.side @@ -74,10 +74,12 @@ "id": "db2bbd13-3808-4b40-a236-3fe82c1afece", "comment": "", "command": "click", - "target": "xpath=(//button[@id='dropdown-basic'])[2]", + "target": "id=metadata-nav-dropdown-toggle", "targets": [ - ["xpath=(//button[@id='dropdown-basic'])[2]", "xpath:attributes"], - ["xpath=(//div[@id='basic-nav-dropdown']/button)[2]", "xpath:idRelative"], + ["id=metadata-nav-dropdown-toggle", "id"], + ["css=#metadata-nav-dropdown-toggle", "css:finder"], + ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"], + ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"], ["xpath=//div[2]/button", "xpath:position"], ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"] ], @@ -86,12 +88,14 @@ "id": "32133aaa-76a4-4dd4-8ee6-a9fc5af25ded", "comment": "", "command": "click", - "target": "linkText=Add a new metadata provider", + "target": "id=metadata-nav-dropdown-provider", "targets": [ + ["id=metadata-nav-dropdown-provider", "id"], ["linkText=Add a new metadata provider", "linkText"], - ["css=.text-primary:nth-child(2)", "css:finder"], + ["css=#metadata-nav-dropdown-provider", "css:finder"], ["xpath=//a[contains(text(),'Add a new metadata provider')]", "xpath:link"], - ["xpath=//div[@id='basic-nav-dropdown']/div/a[2]", "xpath:idRelative"], + ["xpath=//a[@id='metadata-nav-dropdown-provider']", "xpath:attributes"], + ["xpath=//div[@id='metadata-nav-dropdown']/div/a[2]", "xpath:idRelative"], ["xpath=//a[contains(@href, '/metadata/provider/new')]", "xpath:href"], ["xpath=//a[2]", "xpath:position"], ["xpath=//a[contains(.,'Add a new metadata provider')]", "xpath:innerText"] @@ -123,6 +127,13 @@ ["xpath=//input", "xpath:position"] ], "value": "Test Provider with Script Filter" + }, { + "id": "fbcb5ac5-c2a3-4db3-bb3a-06db665036ac", + "comment": "", + "command": "waitForElementEditable", + "target": "name=type", + "targets": [], + "value": "30000" }, { "id": "6daa658d-2560-4448-a522-233ed88e1ad0", "comment": "", @@ -267,19 +278,6 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" - }, { - "id": "cce4434c-9723-4ecb-832d-2e200aefe7e1", - "comment": "", - "command": "click", - "target": "id=root_enabled", - "targets": [ - ["id=root_enabled", "id"], - ["css=#root_enabled", "css:finder"], - ["xpath=//input[@id='root_enabled']", "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/div/input", "xpath:idRelative"], - ["xpath=//input", "xpath:position"] - ], - "value": "" }, { "id": "542d9338-36f9-4922-89c2-7109c2d288e0", "comment": "", @@ -431,19 +429,6 @@ "target": "css=.npm__react-simple-code-editor__textarea", "targets": [], "value": "" - }, { - "id": "ed6eb266-04f0-4517-b874-ea1d0ba68441", - "comment": "", - "command": "click", - "target": "id=root_filterEnabled", - "targets": [ - ["id=root_filterEnabled", "id"], - ["css=#root_filterEnabled", "css:finder"], - ["xpath=//input[@id='root_filterEnabled']", "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[2]/div/div/div/div/div/input", "xpath:idRelative"], - ["xpath=//div[2]/div/div/div/div/div/input", "xpath:position"] - ], - "value": "" }, { "id": "07ddc80d-1df7-43d3-adf9-a75a2a1348bc", "comment": "", diff --git a/backend/src/integration/resources/SHIBUI-1407-1.side b/backend/src/integration/resources/SHIBUI-1407-1.side index ef9f2f566..15d2e93d2 100644 --- a/backend/src/integration/resources/SHIBUI-1407-1.side +++ b/backend/src/integration/resources/SHIBUI-1407-1.side @@ -74,10 +74,12 @@ "id": "ad3811ad-f95b-4cca-a5d9-63a10063a652", "comment": "", "command": "click", - "target": "xpath=(//button[@id='dropdown-basic'])[2]", + "target": "id=metadata-nav-dropdown-toggle", "targets": [ - ["xpath=(//button[@id='dropdown-basic'])[2]", "xpath:attributes"], - ["xpath=(//div[@id='basic-nav-dropdown']/button)[2]", "xpath:idRelative"], + ["id=metadata-nav-dropdown-toggle", "id"], + ["css=#metadata-nav-dropdown-toggle", "css:finder"], + ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"], + ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"], ["xpath=//div[2]/button", "xpath:position"], ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"] ], @@ -86,14 +88,16 @@ "id": "1caf8be6-a4d9-4b3b-ace1-0f76d3600d62", "comment": "", "command": "click", - "target": "linkText=Add a new metadata source", + "target": "id=metadata-nav-dropdown-source", "targets": [ + ["id=metadata-nav-dropdown-source", "id"], ["linkText=Add a new metadata source", "linkText"], - ["css=.text-primary:nth-child(1)", "css:finder"], + ["css=#metadata-nav-dropdown-source", "css:finder"], ["xpath=//a[contains(text(),'Add a new metadata source')]", "xpath:link"], - ["xpath=//div[@id='basic-nav-dropdown']/div/a", "xpath:idRelative"], + ["xpath=//a[@id='metadata-nav-dropdown-source']", "xpath:attributes"], + ["xpath=//div[@id='metadata-nav-dropdown']/div/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '/metadata/source/new')]", "xpath:href"], - ["xpath=//div/a", "xpath:position"], + ["xpath=//div[2]/div/a", "xpath:position"], ["xpath=//a[contains(.,'Add a new metadata source')]", "xpath:innerText"] ], "value": "" @@ -1953,19 +1957,6 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" - }, { - "id": "14ca713a-313d-4cda-82ca-a0b814ce81dc", - "comment": "", - "command": "click", - "target": "id=root_serviceEnabled", - "targets": [ - ["id=root_serviceEnabled", "id"], - ["css=#root_serviceEnabled", "css:finder"], - ["xpath=//input[@id='root_serviceEnabled']", "xpath:attributes"], - ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[11]/div/div/div/div/input", "xpath:idRelative"], - ["xpath=//input", "xpath:position"] - ], - "value": "" }, { "id": "3baa7bd3-55c0-4d10-8aa3-c0daa63ec4d4", "comment": "", @@ -2199,10 +2190,10 @@ "id": "3f2c3eab-ecbf-45f3-bcdc-a5cad766b27c", "comment": "", "command": "assertText", - "target": "css=div:nth-child(5) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block", + "target": "css=div:nth-child(2) > div:nth-child(4) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block", "targets": [ - ["css=div:nth-child(5) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[5]/div[2]/div[3]/span", "xpath:idRelative"], + ["css=div:nth-child(2) > div:nth-child(4) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div[2]/div[3]/span", "xpath:idRelative"], ["xpath=//div[3]/span", "xpath:position"], ["xpath=//span[contains(.,'user@test.org')]", "xpath:innerText"] ], @@ -2534,7 +2525,7 @@ "id": "e9c047ad-fd1f-4ee8-bedb-3750f0c553e4", "comment": "", "command": "storeAttribute", - "target": "xpath=//section[1]/div/div[2]/div[2]/div[5]@class", + "target": "xpath=//section[1]/div/div[2]/div[2]/div[4]@class", "targets": [], "value": "classes" }, { diff --git a/backend/src/integration/resources/SHIBUI-1407-2.side b/backend/src/integration/resources/SHIBUI-1407-2.side index f519cd8dc..85421f69b 100644 --- a/backend/src/integration/resources/SHIBUI-1407-2.side +++ b/backend/src/integration/resources/SHIBUI-1407-2.side @@ -74,10 +74,12 @@ "id": "e7a98419-36c7-4b0f-a99d-087144f6a417", "comment": "", "command": "click", - "target": "xpath=(//button[@id='dropdown-basic'])[2]", + "target": "id=metadata-nav-dropdown-toggle", "targets": [ - ["xpath=(//button[@id='dropdown-basic'])[2]", "xpath:attributes"], - ["xpath=(//div[@id='basic-nav-dropdown']/button)[2]", "xpath:idRelative"], + ["id=metadata-nav-dropdown-toggle", "id"], + ["css=#metadata-nav-dropdown-toggle", "css:finder"], + ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"], + ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"], ["xpath=//div[2]/button", "xpath:position"], ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"] ], @@ -86,12 +88,14 @@ "id": "74fef022-3979-4bed-9226-b25114514976", "comment": "", "command": "click", - "target": "linkText=Add a new metadata provider", + "target": "id=metadata-nav-dropdown-provider", "targets": [ + ["id=metadata-nav-dropdown-provider", "id"], ["linkText=Add a new metadata provider", "linkText"], - ["css=.text-primary:nth-child(2)", "css:finder"], + ["css=#metadata-nav-dropdown-provider", "css:finder"], ["xpath=//a[contains(text(),'Add a new metadata provider')]", "xpath:link"], - ["xpath=//div[@id='basic-nav-dropdown']/div/a[2]", "xpath:idRelative"], + ["xpath=//a[@id='metadata-nav-dropdown-provider']", "xpath:attributes"], + ["xpath=//div[@id='metadata-nav-dropdown']/div/a[2]", "xpath:idRelative"], ["xpath=//a[contains(@href, '/metadata/provider/new')]", "xpath:href"], ["xpath=//a[2]", "xpath:position"], ["xpath=//a[contains(.,'Add a new metadata provider')]", "xpath:innerText"] @@ -123,6 +127,13 @@ ["xpath=//input", "xpath:position"] ], "value": "" + }, { + "id": "6856655c-a248-4afe-8892-3c6c5eebb40e", + "comment": "", + "command": "waitForElementEditable", + "target": "name=type", + "targets": [], + "value": "30000" }, { "id": "54dc29f7-bbe0-4c2b-a76e-e67a61f57a96", "comment": "", @@ -599,19 +610,6 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" - }, { - "id": "79b96f40-2677-438a-9564-62df0ea2c116", - "comment": "", - "command": "click", - "target": "id=root_enabled", - "targets": [ - ["id=root_enabled", "id"], - ["css=#root_enabled", "css:finder"], - ["xpath=//input[@id='root_enabled']", "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/div/input", "xpath:idRelative"], - ["xpath=//input", "xpath:position"] - ], - "value": "" }, { "id": "52f5680c-c63d-411e-8332-52901f12ea3b", "comment": "", @@ -843,11 +841,11 @@ "id": "ce328b6a-f6ee-45e9-975c-5a5608f373dc", "comment": "", "command": "waitForElementVisible", - "target": "css=div:nth-child(4) > .bg-diff > .d-block:nth-child(2)", + "target": "css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", "targets": [ - ["css=div:nth-child(4) > .bg-diff > .d-block:nth-child(2)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div/span[2]", "xpath:idRelative"], - ["xpath=//div[4]/div/span[2]", "xpath:position"], + ["css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[2]", "xpath:idRelative"], + ["xpath=//div[3]/div/span[2]", "xpath:position"], ["xpath=//span[contains(.,'123 version 2')]", "xpath:innerText"] ], "value": "10000" @@ -855,11 +853,11 @@ "id": "68103f0e-e3f1-419b-903d-5d8c30bc6700", "comment": "", "command": "assertText", - "target": "css=div:nth-child(4) > .bg-diff > .d-block:nth-child(2)", + "target": "css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", "targets": [ - ["css=div:nth-child(4) > .bg-diff > .d-block:nth-child(2)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div/span[2]", "xpath:idRelative"], - ["xpath=//div[4]/div/span[2]", "xpath:position"], + ["css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[2]", "xpath:idRelative"], + ["xpath=//div[3]/div/span[2]", "xpath:position"], ["xpath=//span[contains(.,'123 version 2')]", "xpath:innerText"] ], "value": "123 version 2" @@ -867,44 +865,44 @@ "id": "135a8cb5-7454-46af-8fb7-5fc72e206237", "comment": "", "command": "waitForElementVisible", - "target": "css=div:nth-child(4) > .bg-diff > .d-block:nth-child(3)", + "target": "css=div:nth-child(3) > .bg-diff > .d-block:nth-child(3)", "targets": [ - ["css=div:nth-child(4) > .bg-diff > .d-block:nth-child(3)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div/span[3]", "xpath:idRelative"], - ["xpath=//div[4]/div/span[3]", "xpath:position"] + ["css=div:nth-child(3) > .bg-diff > .d-block:nth-child(3)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[3]", "xpath:idRelative"], + ["xpath=//div[3]/div/span[3]", "xpath:position"] ], "value": "30000" }, { "id": "a13198b9-7827-47e2-ade3-143b981d34ee", "comment": "", "command": "assertText", - "target": "css=div:nth-child(4) > .bg-diff > .d-block:nth-child(3)", + "target": "css=div:nth-child(3) > .bg-diff > .d-block:nth-child(3)", "targets": [ - ["css=div:nth-child(4) > .bg-diff > .d-block:nth-child(3)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div/span[3]", "xpath:idRelative"], - ["xpath=//div[4]/div/span[3]", "xpath:position"] + ["css=div:nth-child(3) > .bg-diff > .d-block:nth-child(3)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[3]", "xpath:idRelative"], + ["xpath=//div[3]/div/span[3]", "xpath:position"] ], "value": "123" }, { "id": "3d83741c-299e-4fcb-9ce6-4b7291c423a4", "comment": "", "command": "assertText", - "target": "css=div:nth-child(12) > .bg-diff > .d-block:nth-child(2)", + "target": "css=div:nth-child(11) > .bg-diff > .d-block:nth-child(2)", "targets": [ - ["css=div:nth-child(12) > .bg-diff > .d-block:nth-child(2)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[12]/div/span[2]", "xpath:idRelative"], - ["xpath=//div[12]/div/span[2]", "xpath:position"] + ["css=div:nth-child(11) > .bg-diff > .d-block:nth-child(2)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[11]/div/span[2]", "xpath:idRelative"], + ["xpath=//div[11]/div/span[2]", "xpath:position"] ], "value": "false" }, { "id": "190cc157-d427-4046-aff2-180392395ad3", "comment": "", "command": "assertText", - "target": "css=div:nth-child(12) > .bg-diff > .d-block:nth-child(3)", + "target": "css=div:nth-child(11) > .bg-diff > .d-block:nth-child(3)", "targets": [ - ["css=div:nth-child(12) > .bg-diff > .d-block:nth-child(3)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[12]/div/span[3]", "xpath:idRelative"], - ["xpath=//div[12]/div/span[3]", "xpath:position"], + ["css=div:nth-child(11) > .bg-diff > .d-block:nth-child(3)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[11]/div/span[3]", "xpath:idRelative"], + ["xpath=//div[11]/div/span[3]", "xpath:position"], ["xpath=//span[contains(.,'true')]", "xpath:innerText"] ], "value": "true" @@ -912,7 +910,7 @@ "id": "aa3e1818-24e5-420b-838e-0eb7d6b6d4e3", "comment": "", "command": "storeAttribute", - "target": "xpath=//section[1]/div/div[2]/div[2]/div[4]/div@class", + "target": "xpath=//section[1]/div/div[2]/div[2]/div[3]/div@class", "targets": [], "value": "classes" }, { @@ -954,7 +952,7 @@ "id": "d7e53d38-a2c1-4ae7-a481-2726000eb556", "comment": "", "command": "storeAttribute", - "target": "xpath=//section[1]/div/div[2]/div[2]/div[12]/div@class", + "target": "xpath=//section[1]/div/div[2]/div[2]/div[11]/div@class", "targets": [], "value": "classes" }, { diff --git a/backend/src/integration/resources/SHIBUI-1503-3.side b/backend/src/integration/resources/SHIBUI-1503-3.side index f08627a8c..129e1e340 100644 --- a/backend/src/integration/resources/SHIBUI-1503-3.side +++ b/backend/src/integration/resources/SHIBUI-1503-3.side @@ -95,14 +95,14 @@ "id": "659e4909-239b-4895-aa54-8bf3a6bd57cd", "comment": "", "command": "waitForElementVisible", - "target": "xpath=//table/tbody/tr[th[.='none2']]", + "target": "xpath=//table/tbody/tr[td[.='none2']]", "targets": [], "value": "30000" }, { "id": "dc06ff49-c076-4f60-95d1-a42514cc6038", "comment": "", "command": "select", - "target": "//table/tbody/tr[th[.='none2']]/td[3]/select", + "target": "xpath=//table/tbody/tr[td[.='none2']]/td[4]/select", "targets": [], "value": "label=ROLE_USER" }, { @@ -116,14 +116,30 @@ "id": "fb78d880-ffb7-4477-b1af-f9a8593875de", "comment": "", "command": "click", - "target": "linkText=Logout", + "target": "id=user-nav-dropdown-toggle", "targets": [ + ["id=user-nav-dropdown-toggle", "id"], + ["css=#user-nav-dropdown-toggle", "css:finder"], + ["xpath=//button[@id='user-nav-dropdown-toggle']", "xpath:attributes"], + ["xpath=//div[@id='user-nav-dropdown']/button", "xpath:idRelative"], + ["xpath=//div[4]/button", "xpath:position"], + ["xpath=//button[contains(.,'Logged in as admin')]", "xpath:innerText"] + ], + "value": "" + }, { + "id": "c52df093-56f2-467c-ba0b-c9441a56e0c6", + "comment": "", + "command": "click", + "target": "id=user-nav-dropdown-logout", + "targets": [ + ["id=user-nav-dropdown-logout", "id"], ["linkText=Logout", "linkText"], - ["css=.nav-link:nth-child(4)", "css:finder"], + ["css=#user-nav-dropdown-logout", "css:finder"], ["xpath=//a[contains(text(),'Logout')]", "xpath:link"], - ["xpath=//div[@id='basic-navbar-nav']/div/a[2]", "xpath:idRelative"], + ["xpath=//a[@id='user-nav-dropdown-logout']", "xpath:attributes"], + ["xpath=//div[@id='user-nav-dropdown']/div/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '/logout')]", "xpath:href"], - ["xpath=//a[2]", "xpath:position"], + ["xpath=//div[4]/div/a", "xpath:position"], ["xpath=//a[contains(.,'Logout')]", "xpath:innerText"] ], "value": "" diff --git a/backend/src/integration/resources/SHIBUI-1740-1.side b/backend/src/integration/resources/SHIBUI-1740-1.side index 40a5e54df..53ae936e6 100644 --- a/backend/src/integration/resources/SHIBUI-1740-1.side +++ b/backend/src/integration/resources/SHIBUI-1740-1.side @@ -56,12 +56,13 @@ "id": "0bdcd2aa-3e9e-41be-96d2-abf567538990", "comment": "", "command": "click", - "target": "id=dropdown-basic", + "target": "id=advanced-nav-dropdown-toggle", "targets": [ - ["id=dropdown-basic", "id"], - ["xpath=//button[@id='dropdown-basic']", "xpath:attributes"], - ["xpath=//div[@id='basic-nav-dropdown']/button", "xpath:idRelative"], - ["xpath=//div/button", "xpath:position"], + ["id=advanced-nav-dropdown-toggle", "id"], + ["css=#advanced-nav-dropdown-toggle", "css:finder"], + ["xpath=//button[@id='advanced-nav-dropdown-toggle']", "xpath:attributes"], + ["xpath=//div[@id='advanced-nav-dropdown']/button", "xpath:idRelative"], + ["xpath=//div[3]/button", "xpath:position"], ["xpath=//button[contains(.,'Advanced')]", "xpath:innerText"] ], "value": "" @@ -69,12 +70,14 @@ "id": "13b8c74a-6466-4f17-823b-aa9e1e2c8559", "comment": "", "command": "click", - "target": "linkText=Groups", + "target": "id=advanced-nav-dropdown-groups", "targets": [ + ["id=advanced-nav-dropdown-groups", "id"], ["linkText=Groups", "linkText"], - ["css=.text-primary:nth-child(2)", "css:finder"], + ["css=#advanced-nav-dropdown-groups", "css:finder"], ["xpath=//a[contains(text(),'Groups')]", "xpath:link"], - ["xpath=//div[@id='basic-nav-dropdown']/div/a[2]", "xpath:idRelative"], + ["xpath=//a[@id='advanced-nav-dropdown-groups']", "xpath:attributes"], + ["xpath=//div[@id='advanced-nav-dropdown']/div/a[2]", "xpath:idRelative"], ["xpath=//a[contains(@href, '/groups')]", "xpath:href"], ["xpath=//a[2]", "xpath:position"], ["xpath=//a[contains(.,'Groups')]", "xpath:innerText"] diff --git a/backend/src/integration/resources/SHIBUI-1740-2.side b/backend/src/integration/resources/SHIBUI-1740-2.side index abe7b0709..ce06fa931 100644 --- a/backend/src/integration/resources/SHIBUI-1740-2.side +++ b/backend/src/integration/resources/SHIBUI-1740-2.side @@ -56,12 +56,13 @@ "id": "e522436b-e75f-451c-953c-28328dbc3511", "comment": "", "command": "click", - "target": "id=dropdown-basic", + "target": "id=advanced-nav-dropdown-toggle", "targets": [ - ["id=dropdown-basic", "id"], - ["xpath=//button[@id='dropdown-basic']", "xpath:attributes"], - ["xpath=//div[@id='basic-nav-dropdown']/button", "xpath:idRelative"], - ["xpath=//div/button", "xpath:position"], + ["id=advanced-nav-dropdown-toggle", "id"], + ["css=#advanced-nav-dropdown-toggle", "css:finder"], + ["xpath=//button[@id='advanced-nav-dropdown-toggle']", "xpath:attributes"], + ["xpath=//div[@id='advanced-nav-dropdown']/button", "xpath:idRelative"], + ["xpath=//div[3]/button", "xpath:position"], ["xpath=//button[contains(.,'Advanced')]", "xpath:innerText"] ], "value": "" @@ -69,12 +70,14 @@ "id": "a2c27b66-4110-49bd-986c-d21611a39834", "comment": "", "command": "click", - "target": "linkText=Groups", + "target": "id=advanced-nav-dropdown-groups", "targets": [ + ["id=advanced-nav-dropdown-groups", "id"], ["linkText=Groups", "linkText"], - ["css=.text-primary:nth-child(2)", "css:finder"], + ["css=#advanced-nav-dropdown-groups", "css:finder"], ["xpath=//a[contains(text(),'Groups')]", "xpath:link"], - ["xpath=//div[@id='basic-nav-dropdown']/div/a[2]", "xpath:idRelative"], + ["xpath=//a[@id='advanced-nav-dropdown-groups']", "xpath:attributes"], + ["xpath=//div[@id='advanced-nav-dropdown']/div/a[2]", "xpath:idRelative"], ["xpath=//a[contains(@href, '/groups')]", "xpath:href"], ["xpath=//a[2]", "xpath:position"], ["xpath=//a[contains(.,'Groups')]", "xpath:innerText"] diff --git a/backend/src/integration/resources/SHIBUI-1740-3.side b/backend/src/integration/resources/SHIBUI-1740-3.side index 2a026c9b1..5ed3595ee 100644 --- a/backend/src/integration/resources/SHIBUI-1740-3.side +++ b/backend/src/integration/resources/SHIBUI-1740-3.side @@ -77,10 +77,12 @@ "id": "ed48c0d6-990b-45d2-92cb-f286817d673e", "comment": "", "command": "click", - "target": "xpath=(//button[@id='dropdown-basic'])[2]", + "target": "id=metadata-nav-dropdown-toggle", "targets": [ - ["xpath=(//button[@id='dropdown-basic'])[2]", "xpath:attributes"], - ["xpath=(//div[@id='basic-nav-dropdown']/button)[2]", "xpath:idRelative"], + ["id=metadata-nav-dropdown-toggle", "id"], + ["css=#metadata-nav-dropdown-toggle", "css:finder"], + ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"], + ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"], ["xpath=//div[2]/button", "xpath:position"], ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"] ], @@ -89,14 +91,16 @@ "id": "9e312878-820e-4eef-a70d-2225d68f9760", "comment": "", "command": "click", - "target": "linkText=Add a new metadata source", + "target": "id=metadata-nav-dropdown-source", "targets": [ + ["id=metadata-nav-dropdown-source", "id"], ["linkText=Add a new metadata source", "linkText"], - ["css=.text-primary:nth-child(1)", "css:finder"], + ["css=#metadata-nav-dropdown-source", "css:finder"], ["xpath=//a[contains(text(),'Add a new metadata source')]", "xpath:link"], - ["xpath=//div[@id='basic-nav-dropdown']/div/a", "xpath:idRelative"], + ["xpath=//a[@id='metadata-nav-dropdown-source']", "xpath:attributes"], + ["xpath=//div[@id='metadata-nav-dropdown']/div/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '/metadata/source/new')]", "xpath:href"], - ["xpath=//div/a", "xpath:position"], + ["xpath=//div[2]/div/a", "xpath:position"], ["xpath=//a[contains(.,'Add a new metadata source')]", "xpath:innerText"] ], "value": "" @@ -293,14 +297,30 @@ "id": "74b9b96f-d3de-4b1f-b429-5ddc2415b0cf", "comment": "", "command": "click", - "target": "linkText=Logout", + "target": "id=user-nav-dropdown-toggle", "targets": [ + ["id=user-nav-dropdown-toggle", "id"], + ["css=#user-nav-dropdown-toggle", "css:finder"], + ["xpath=//button[@id='user-nav-dropdown-toggle']", "xpath:attributes"], + ["xpath=//div[@id='user-nav-dropdown']/button", "xpath:idRelative"], + ["xpath=//div[4]/button", "xpath:position"], + ["xpath=//button[contains(.,'Logged in as admin')]", "xpath:innerText"] + ], + "value": "" + }, { + "id": "b1cdb40a-e36e-4280-bc02-a0a567dac6c0", + "comment": "", + "command": "click", + "target": "id=user-nav-dropdown-logout", + "targets": [ + ["id=user-nav-dropdown-logout", "id"], ["linkText=Logout", "linkText"], - ["css=.nav-link:nth-child(4)", "css:finder"], + ["css=#user-nav-dropdown-logout", "css:finder"], ["xpath=//a[contains(text(),'Logout')]", "xpath:link"], - ["xpath=//div[@id='basic-navbar-nav']/div/a[2]", "xpath:idRelative"], + ["xpath=//a[@id='user-nav-dropdown-logout']", "xpath:attributes"], + ["xpath=//div[@id='user-nav-dropdown']/div/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '/logout')]", "xpath:href"], - ["xpath=//nav/div/div/a[2]", "xpath:position"], + ["xpath=//div[4]/div/a", "xpath:position"], ["xpath=//a[contains(.,'Logout')]", "xpath:innerText"] ], "value": "" @@ -354,21 +374,6 @@ ["xpath=//div[2]/div/div/div", "xpath:position"] ], "value": "" - }, { - "id": "c1459507-5b54-4119-ac3f-753209282b9e", - "comment": "", - "command": "click", - "target": "linkText=Logout", - "targets": [ - ["linkText=Logout", "linkText"], - ["css=.nav-link:nth-child(3)", "css:finder"], - ["xpath=//a[contains(text(),'Logout')]", "xpath:link"], - ["xpath=//div[@id='basic-navbar-nav']/div/a[2]", "xpath:idRelative"], - ["xpath=//a[contains(@href, '/logout')]", "xpath:href"], - ["xpath=//a[2]", "xpath:position"], - ["xpath=//a[contains(.,'Logout')]", "xpath:innerText"] - ], - "value": "" }] }], "suites": [{ diff --git a/backend/src/integration/resources/SHIBUI-1740-4.side b/backend/src/integration/resources/SHIBUI-1740-4.side index 9c2270371..d6ead6f87 100644 --- a/backend/src/integration/resources/SHIBUI-1740-4.side +++ b/backend/src/integration/resources/SHIBUI-1740-4.side @@ -73,18 +73,34 @@ "target": "/", "targets": [], "value": "" + }, { + "id": "76475106-daf4-413b-9462-c7da0c44b65f", + "comment": "", + "command": "click", + "target": "id=user-nav-dropdown-toggle", + "targets": [ + ["id=user-nav-dropdown-toggle", "id"], + ["css=#user-nav-dropdown-toggle", "css:finder"], + ["xpath=//button[@id='user-nav-dropdown-toggle']", "xpath:attributes"], + ["xpath=//div[@id='user-nav-dropdown']/button", "xpath:idRelative"], + ["xpath=//div[4]/button", "xpath:position"], + ["xpath=//button[contains(.,'Logged in as admin')]", "xpath:innerText"] + ], + "value": "" }, { "id": "15f111a8-69c3-48a1-921e-6f73d2bb5722", "comment": "", "command": "click", - "target": "linkText=Logout", + "target": "id=user-nav-dropdown-logout", "targets": [ + ["id=user-nav-dropdown-logout", "id"], ["linkText=Logout", "linkText"], - ["css=.nav-link:nth-child(3)", "css:finder"], + ["css=#user-nav-dropdown-logout", "css:finder"], ["xpath=//a[contains(text(),'Logout')]", "xpath:link"], - ["xpath=//div[@id='basic-navbar-nav']/div/a[2]", "xpath:idRelative"], + ["xpath=//a[@id='user-nav-dropdown-logout']", "xpath:attributes"], + ["xpath=//div[@id='user-nav-dropdown']/div/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '/logout')]", "xpath:href"], - ["xpath=//a[2]", "xpath:position"], + ["xpath=//div[4]/div/a", "xpath:position"], ["xpath=//a[contains(.,'Logout')]", "xpath:innerText"] ], "value": "" @@ -131,13 +147,13 @@ "id": "6fb9efa3-c73e-4d27-82e6-28b25bf4fb60", "comment": "", "command": "click", - "target": "id=dropdown-basic", + "target": "id=metadata-nav-dropdown-toggle", "targets": [ - ["id=dropdown-basic", "id"], - ["css=#dropdown-basic", "css:finder"], - ["xpath=//button[@id='dropdown-basic']", "xpath:attributes"], - ["xpath=//div[@id='basic-nav-dropdown']/button", "xpath:idRelative"], - ["xpath=//div/button", "xpath:position"], + ["id=metadata-nav-dropdown-toggle", "id"], + ["css=#metadata-nav-dropdown-toggle", "css:finder"], + ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"], + ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"], + ["xpath=//div[2]/button", "xpath:position"], ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"] ], "value": "" @@ -145,14 +161,16 @@ "id": "ee100ee8-d619-4d23-8cbc-ef9fa0e4b974", "comment": "", "command": "click", - "target": "linkText=Add a new metadata source", + "target": "id=metadata-nav-dropdown-source", "targets": [ + ["id=metadata-nav-dropdown-source", "id"], ["linkText=Add a new metadata source", "linkText"], - ["css=.text-primary", "css:finder"], + ["css=#metadata-nav-dropdown-source", "css:finder"], ["xpath=//a[contains(text(),'Add a new metadata source')]", "xpath:link"], - ["xpath=//div[@id='basic-nav-dropdown']/div/a", "xpath:idRelative"], + ["xpath=//a[@id='metadata-nav-dropdown-source']", "xpath:attributes"], + ["xpath=//div[@id='metadata-nav-dropdown']/div/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '/metadata/source/new')]", "xpath:href"], - ["xpath=//div/a", "xpath:position"], + ["xpath=//div[2]/div/a", "xpath:position"], ["xpath=//a[contains(.,'Add a new metadata source')]", "xpath:innerText"] ], "value": "" @@ -330,18 +348,34 @@ ["xpath=//a[contains(.,'Selenium Test')]", "xpath:innerText"] ], "value": "Selenium Test" + }, { + "id": "14005933-29c9-46fd-b874-9a7beabea242", + "comment": "", + "command": "click", + "target": "id=user-nav-dropdown-toggle", + "targets": [ + ["id=user-nav-dropdown-toggle", "id"], + ["css=#user-nav-dropdown-toggle", "css:finder"], + ["xpath=//button[@id='user-nav-dropdown-toggle']", "xpath:attributes"], + ["xpath=//div[@id='user-nav-dropdown']/button", "xpath:idRelative"], + ["xpath=//div[3]/button", "xpath:position"], + ["xpath=//button[contains(.,'Logged in as nonadmin')]", "xpath:innerText"] + ], + "value": "" }, { "id": "3e1f32d0-3d4d-4dac-95fd-765337b75e44", "comment": "", "command": "click", - "target": "linkText=Logout", + "target": "id=user-nav-dropdown-logout", "targets": [ + ["id=user-nav-dropdown-logout", "id"], ["linkText=Logout", "linkText"], - ["css=.nav-link:nth-child(3)", "css:finder"], + ["css=#user-nav-dropdown-logout", "css:finder"], ["xpath=//a[contains(text(),'Logout')]", "xpath:link"], - ["xpath=//div[@id='basic-navbar-nav']/div/a[2]", "xpath:idRelative"], + ["xpath=//a[@id='user-nav-dropdown-logout']", "xpath:attributes"], + ["xpath=//div[@id='user-nav-dropdown']/div/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '/logout')]", "xpath:href"], - ["xpath=//a[2]", "xpath:position"], + ["xpath=//div[3]/div/a", "xpath:position"], ["xpath=//a[contains(.,'Logout')]", "xpath:innerText"] ], "value": "" @@ -477,18 +511,34 @@ "target": "id=group-anonymousUser", "targets": [], "value": "label=A1" + }, { + "id": "021cd81f-f249-4a21-a5f2-6291ef7affac", + "comment": "", + "command": "click", + "target": "id=user-nav-dropdown-toggle", + "targets": [ + ["id=user-nav-dropdown-toggle", "id"], + ["css=#user-nav-dropdown-toggle", "css:finder"], + ["xpath=//button[@id='user-nav-dropdown-toggle']", "xpath:attributes"], + ["xpath=//div[@id='user-nav-dropdown']/button", "xpath:idRelative"], + ["xpath=//div[4]/button", "xpath:position"], + ["xpath=//button[contains(.,'Logged in as admin')]", "xpath:innerText"] + ], + "value": "" }, { "id": "8913d9c6-7cca-42cc-abd5-bd1b014e1853", "comment": "", "command": "click", - "target": "linkText=Logout", + "target": "id=user-nav-dropdown-logout", "targets": [ + ["id=user-nav-dropdown-logout", "id"], ["linkText=Logout", "linkText"], - ["css=.nav-link:nth-child(4)", "css:finder"], + ["css=#user-nav-dropdown-logout", "css:finder"], ["xpath=//a[contains(text(),'Logout')]", "xpath:link"], - ["xpath=//div[@id='basic-navbar-nav']/div/a[2]", "xpath:idRelative"], + ["xpath=//a[@id='user-nav-dropdown-logout']", "xpath:attributes"], + ["xpath=//div[@id='user-nav-dropdown']/div/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '/logout')]", "xpath:href"], - ["xpath=//a[2]", "xpath:position"], + ["xpath=//div[4]/div/a", "xpath:position"], ["xpath=//a[contains(.,'Logout')]", "xpath:innerText"] ], "value": "" @@ -555,21 +605,6 @@ ["xpath=//div[2]/div/div/div", "xpath:position"] ], "value": "" - }, { - "id": "1f4dfb86-8969-4f2a-a8f1-0873a501f670", - "comment": "", - "command": "click", - "target": "linkText=Logout", - "targets": [ - ["linkText=Logout", "linkText"], - ["css=.nav-link:nth-child(3)", "css:finder"], - ["xpath=//a[contains(text(),'Logout')]", "xpath:link"], - ["xpath=//div[@id='basic-navbar-nav']/div/a[2]", "xpath:idRelative"], - ["xpath=//a[contains(@href, '/logout')]", "xpath:href"], - ["xpath=//a[2]", "xpath:position"], - ["xpath=//a[contains(.,'Logout')]", "xpath:innerText"] - ], - "value": "" }] }], "suites": [{ diff --git a/backend/src/integration/resources/SHIBUI-1742-1.side b/backend/src/integration/resources/SHIBUI-1742-1.side index cc8b94078..f3c2bc8e3 100644 --- a/backend/src/integration/resources/SHIBUI-1742-1.side +++ b/backend/src/integration/resources/SHIBUI-1742-1.side @@ -151,18 +151,34 @@ "target": "id=group-nonadmin", "targets": [], "value": "label=A1" + }, { + "id": "07b7cffd-e222-4250-b2b7-a6761ded58ce", + "comment": "", + "command": "click", + "target": "id=user-nav-dropdown-toggle", + "targets": [ + ["id=user-nav-dropdown-toggle", "id"], + ["css=#user-nav-dropdown-toggle", "css:finder"], + ["xpath=//button[@id='user-nav-dropdown-toggle']", "xpath:attributes"], + ["xpath=//div[@id='user-nav-dropdown']/button", "xpath:idRelative"], + ["xpath=//div[4]/button", "xpath:position"], + ["xpath=//button[contains(.,'Logged in as admin')]", "xpath:innerText"] + ], + "value": "" }, { "id": "7109b2ff-b84f-403f-afd0-9e260bc1fc81", "comment": "", "command": "click", - "target": "linkText=Logout", + "target": "id=user-nav-dropdown-logout", "targets": [ + ["id=user-nav-dropdown-logout", "id"], ["linkText=Logout", "linkText"], - ["css=.nav-link:nth-child(4)", "css:finder"], + ["css=#user-nav-dropdown-logout", "css:finder"], ["xpath=//a[contains(text(),'Logout')]", "xpath:link"], - ["xpath=//div[@id='basic-navbar-nav']/div/a[2]", "xpath:idRelative"], + ["xpath=//a[@id='user-nav-dropdown-logout']", "xpath:attributes"], + ["xpath=//div[@id='user-nav-dropdown']/div/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '/logout')]", "xpath:href"], - ["xpath=//a[2]", "xpath:position"], + ["xpath=//div[4]/div/a", "xpath:position"], ["xpath=//a[contains(.,'Logout')]", "xpath:innerText"] ], "value": "" @@ -209,13 +225,13 @@ "id": "bbbdc0b9-5e2d-4283-8cbf-7ccfa089d23d", "comment": "", "command": "click", - "target": "id=dropdown-basic", + "target": "id=metadata-nav-dropdown-toggle", "targets": [ - ["id=dropdown-basic", "id"], - ["css=#dropdown-basic", "css:finder"], - ["xpath=//button[@id='dropdown-basic']", "xpath:attributes"], - ["xpath=//div[@id='basic-nav-dropdown']/button", "xpath:idRelative"], - ["xpath=//div/button", "xpath:position"], + ["id=metadata-nav-dropdown-toggle", "id"], + ["css=#metadata-nav-dropdown-toggle", "css:finder"], + ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"], + ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"], + ["xpath=//div[2]/button", "xpath:position"], ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"] ], "value": "" @@ -223,14 +239,16 @@ "id": "76fc5d62-a49c-4788-91cb-c285cb9456d5", "comment": "", "command": "click", - "target": "linkText=Add a new metadata source", + "target": "id=metadata-nav-dropdown-source", "targets": [ + ["id=metadata-nav-dropdown-source", "id"], ["linkText=Add a new metadata source", "linkText"], - ["css=.text-primary", "css:finder"], + ["css=#metadata-nav-dropdown-source", "css:finder"], ["xpath=//a[contains(text(),'Add a new metadata source')]", "xpath:link"], - ["xpath=//div[@id='basic-nav-dropdown']/div/a", "xpath:idRelative"], + ["xpath=//a[@id='metadata-nav-dropdown-source']", "xpath:attributes"], + ["xpath=//div[@id='metadata-nav-dropdown']/div/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '/metadata/source/new')]", "xpath:href"], - ["xpath=//div/a", "xpath:position"], + ["xpath=//div[2]/div/a", "xpath:position"], ["xpath=//a[contains(.,'Add a new metadata source')]", "xpath:innerText"] ], "value": "" @@ -406,11 +424,25 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" + }, { + "id": "f4ebca18-6f1a-4638-87d8-d9398139ee4d", + "comment": "", + "command": "click", + "target": "id=user-nav-dropdown-toggle", + "targets": [ + ["id=user-nav-dropdown-toggle", "id"], + ["css=#user-nav-dropdown-toggle", "css:finder"], + ["xpath=//button[@id='user-nav-dropdown-toggle']", "xpath:attributes"], + ["xpath=//div[@id='user-nav-dropdown']/button", "xpath:idRelative"], + ["xpath=//div[3]/button", "xpath:position"], + ["xpath=//button[contains(.,'Logged in as nonadmin')]", "xpath:innerText"] + ], + "value": "" }, { "id": "7adae5ea-9424-4709-8472-54514cd189a5", "comment": "", "command": "click", - "target": "linkText=Logout", + "target": "id=user-nav-dropdown-logout", "targets": [ ["linkText=Logout", "linkText"], ["css=.nav-link:nth-child(3)", "css:finder"], @@ -471,18 +503,34 @@ ["xpath=//td[5]/span", "xpath:position"] ], "value": "" + }, { + "id": "d5f2304c-b1f4-470c-812a-42a75b92ad6a", + "comment": "", + "command": "click", + "target": "id=user-nav-dropdown-toggle", + "targets": [ + ["id=user-nav-dropdown-toggle", "id"], + ["css=#user-nav-dropdown-toggle", "css:finder"], + ["xpath=//button[@id='user-nav-dropdown-toggle']", "xpath:attributes"], + ["xpath=//div[@id='user-nav-dropdown']/button", "xpath:idRelative"], + ["xpath=//div[3]/button", "xpath:position"], + ["xpath=//button[contains(.,'Logged in as anonymousUser')]", "xpath:innerText"] + ], + "value": "" }, { "id": "0d322ab9-f8d7-4cc3-8b91-48c684955b1a", "comment": "", "command": "click", - "target": "linkText=Logout", + "target": "id=user-nav-dropdown-logout", "targets": [ + ["id=user-nav-dropdown-logout", "id"], ["linkText=Logout", "linkText"], - ["css=.nav-link:nth-child(3)", "css:finder"], + ["css=#user-nav-dropdown-logout", "css:finder"], ["xpath=//a[contains(text(),'Logout')]", "xpath:link"], - ["xpath=//div[@id='basic-navbar-nav']/div/a[2]", "xpath:idRelative"], + ["xpath=//a[@id='user-nav-dropdown-logout']", "xpath:attributes"], + ["xpath=//div[@id='user-nav-dropdown']/div/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '/logout')]", "xpath:href"], - ["xpath=//a[2]", "xpath:position"], + ["xpath=//div[3]/div/a", "xpath:position"], ["xpath=//a[contains(.,'Logout')]", "xpath:innerText"] ], "value": "" diff --git a/backend/src/integration/resources/SHIBUI-1742-2.side b/backend/src/integration/resources/SHIBUI-1742-2.side index a0684ca69..73a29342f 100644 --- a/backend/src/integration/resources/SHIBUI-1742-2.side +++ b/backend/src/integration/resources/SHIBUI-1742-2.side @@ -179,42 +179,6 @@ "target": "xpath=//div[@role=\"alert\" and contains(., \"Updated role successfully.\")]", "targets": [], "value": "" - }, { - "id": "2317a47a-e308-4c1f-bd08-50360950c082", - "comment": "", - "command": "click", - "target": "xpath=(//button[@id='dropdown-basic'])[2]", - "targets": [ - ["xpath=(//button[@id='dropdown-basic'])[2]", "xpath:attributes"], - ["xpath=(//div[@id='basic-nav-dropdown']/button)[2]", "xpath:idRelative"], - ["xpath=//div[2]/button", "xpath:position"], - ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "cfe9cc6f-d96a-48ad-a273-d03eba7cefce", - "comment": "", - "command": "click", - "target": "id=dropdown-basic", - "targets": [ - ["id=dropdown-basic", "id"], - ["xpath=//button[@id='dropdown-basic']", "xpath:attributes"], - ["xpath=//div[@id='basic-nav-dropdown']/button", "xpath:idRelative"], - ["xpath=//div/button", "xpath:position"], - ["xpath=//button[contains(.,'Advanced')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "231fa40a-bb22-4d83-99e2-9a5a9d3ff823", - "comment": "", - "command": "click", - "target": "css=.p-3 > .d-flex", - "targets": [ - ["css=.p-3 > .d-flex", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div", "xpath:idRelative"], - ["xpath=//section/div/div[2]/div", "xpath:position"] - ], - "value": "" }, { "id": "e20c0727-c04f-465d-a7dc-7c7a9210c47b", "comment": "", @@ -277,12 +241,13 @@ "id": "e8bedd18-aafa-4bff-85a4-ba36d7685225", "comment": "", "command": "click", - "target": "id=dropdown-basic", + "target": "id=advanced-nav-dropdown-toggle", "targets": [ - ["id=dropdown-basic", "id"], - ["xpath=//button[@id='dropdown-basic']", "xpath:attributes"], - ["xpath=//div[@id='basic-nav-dropdown']/button", "xpath:idRelative"], - ["xpath=//div/button", "xpath:position"], + ["id=advanced-nav-dropdown-toggle", "id"], + ["css=#advanced-nav-dropdown-toggle", "css:finder"], + ["xpath=//button[@id='advanced-nav-dropdown-toggle']", "xpath:attributes"], + ["xpath=//div[@id='advanced-nav-dropdown']/button", "xpath:idRelative"], + ["xpath=//div[3]/button", "xpath:position"], ["xpath=//button[contains(.,'Advanced')]", "xpath:innerText"] ], "value": "" @@ -305,7 +270,7 @@ "id": "a378e628-4227-451b-9fb6-ef9edb7fc4fa", "comment": "", "command": "click", - "target": "css=tr:nth-child(5) .text-danger path", + "target": "css=table > tbody > tr:nth-child(5) > td.text-right > button", "targets": [ ["css=tr:nth-child(5) .text-danger path", "css:finder"] ], @@ -328,19 +293,6 @@ "target": "xpath=//div[@role=\"alert\" and contains(., \"remove role from all users first\")]", "targets": [], "value": "" - }, { - "id": "e704f343-5942-4053-aed7-1fa94e13320c", - "comment": "", - "command": "click", - "target": "id=dropdown-basic", - "targets": [ - ["id=dropdown-basic", "id"], - ["xpath=//button[@id='dropdown-basic']", "xpath:attributes"], - ["xpath=//div[@id='basic-nav-dropdown']/button", "xpath:idRelative"], - ["xpath=//div/button", "xpath:position"], - ["xpath=//button[contains(.,'Advanced')]", "xpath:innerText"] - ], - "value": "" }, { "id": "78b2edf1-a85d-4a0e-9880-33a2bdef7b68", "comment": "", @@ -396,12 +348,13 @@ "id": "2f499bda-2230-45d2-85c5-efee606c5121", "comment": "", "command": "click", - "target": "id=dropdown-basic", + "target": "id=advanced-nav-dropdown-toggle", "targets": [ - ["id=dropdown-basic", "id"], - ["xpath=//button[@id='dropdown-basic']", "xpath:attributes"], - ["xpath=//div[@id='basic-nav-dropdown']/button", "xpath:idRelative"], - ["xpath=//div/button", "xpath:position"], + ["id=advanced-nav-dropdown-toggle", "id"], + ["css=#advanced-nav-dropdown-toggle", "css:finder"], + ["xpath=//button[@id='advanced-nav-dropdown-toggle']", "xpath:attributes"], + ["xpath=//div[@id='advanced-nav-dropdown']/button", "xpath:idRelative"], + ["xpath=//div[3]/button", "xpath:position"], ["xpath=//button[contains(.,'Advanced')]", "xpath:innerText"] ], "value": "" @@ -424,9 +377,12 @@ "id": "f4201d01-e582-4071-921b-ede543ce181a", "comment": "", "command": "click", - "target": "css=tr:nth-child(5) .text-danger path", + "target": "css=table > tbody > tr:nth-child(5) > td.text-right > button", "targets": [ - ["css=tr:nth-child(5) .text-danger path", "css:finder"] + ["css=tr:nth-child(5) .text-danger", "css:finder"], + ["xpath=(//button[@type='button'])[9]", "xpath:attributes"], + ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div[2]/table/tbody/tr[5]/td[2]/button", "xpath:idRelative"], + ["xpath=//tr[5]/td[2]/button", "xpath:position"] ], "value": "" }, {