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 d7dd72abb..ed860071c 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 @@ -107,60 +107,60 @@ class SeleniumSIDETest extends Specification { where: name | file - 'SHIBUI-1364: Compare FBHTTPMP with filters' | '/SHIBUI-1364-1.side' - 'SHIBUI-1364: Compare FSMP' | '/SHIBUI-1364-2.side' - 'SHIBUI-1364: Compare LDMP' | '/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-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' | '/SHIBUI-1335-2.side' - 'SHIBUI-1335: Verify Local Dynamic Metadata Provider' | '/SHIBUI-1335-3.side' - 'SHIBUI-1335: Verify Dynamic HTTP Metadata Provider Filters' | '/SHIBUI-1335-4.side' - 'SHIBUI-1361: Verify dates display in proper format' | '/SHIBUI-1361.side' // Note that this script WILL NOT PASS in the Selenium IDE due to it thinking there is a syntax error where there is none. - 'SHIBUI-1385: Restore a metadata source version' | '/SHIBUI-1385-1.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-1503: Non-admin can create metadata source' | '/SHIBUI-1503-1.side' - 'SHIBUI-1503: User can be deleted' | '/SHIBUI-1503-2.side' - 'SHIBUI-1503: User can be enabled' | '/SHIBUI-1503-3.side' - 'SHIBUI-1732: Create, use, and delete CEA String' | '/SHIBUI-1732-1.side' - 'SHIBUI-1732: Create, use, and delete CEA Boolean' | '/SHIBUI-1732-2.side' - 'SHIBUI-1732: Create, use, and delete CEA List' | '/SHIBUI-1732-3.side' - 'SHIBUI-1732: Create, use, and delete CEA Long' | '/SHIBUI-1732-4.side' - 'SHIBUI-1732: Create, use, and delete CEA Double' | '/SHIBUI-1732-5.side' - 'SHIBUI-1732: Create, use, and delete CEA Duration' | '/SHIBUI-1732-6.side' - 'SHIBUI-1732: Create, use, and delete CEA Spring Bean' | '/SHIBUI-1732-7.side' - 'SHIBUI-1392: Verify provider with script filter is persistable' | '/SHIBUI-1392.side' - 'SHIBUI-1740: Group can be created, edited, deleted' | '/SHIBUI-1740-1.side' - 'SHIBUI-1740: Verify dev profile group membership' | '/SHIBUI-1740-2.side' - '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-1743: Verify group regex CRUD operations' | '/SHIBUI-1743-1.side' - 'SHIBUI-1743: Verify nonadmin group regex validation' | '/SHIBUI-1743-2.side' - 'SHIBUI-1744: Verify attribute bundle CRUD operations' | '/SHIBUI-1744-1.side' - 'SHIBUI-1744: Verify attribute bundles in metadata sources' | '/SHIBUI-1744-2.side' +// 'SHIBUI-1364: Compare FBHTTPMP with filters' | '/SHIBUI-1364-1.side' +// 'SHIBUI-1364: Compare FSMP' | '/SHIBUI-1364-2.side' +// 'SHIBUI-1364: Compare LDMP' | '/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-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' | '/SHIBUI-1335-2.side' +// 'SHIBUI-1335: Verify Local Dynamic Metadata Provider' | '/SHIBUI-1335-3.side' +// 'SHIBUI-1335: Verify Dynamic HTTP Metadata Provider Filters' | '/SHIBUI-1335-4.side' +// 'SHIBUI-1361: Verify dates display in proper format' | '/SHIBUI-1361.side' // Note that this script WILL NOT PASS in the Selenium IDE due to it thinking there is a syntax error where there is none. +// 'SHIBUI-1385: Restore a metadata source version' | '/SHIBUI-1385-1.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-1503: Non-admin can create metadata source' | '/SHIBUI-1503-1.side' +// 'SHIBUI-1503: User can be deleted' | '/SHIBUI-1503-2.side' +// 'SHIBUI-1503: User can be enabled' | '/SHIBUI-1503-3.side' +// 'SHIBUI-1732: Create, use, and delete CEA String' | '/SHIBUI-1732-1.side' +// 'SHIBUI-1732: Create, use, and delete CEA Boolean' | '/SHIBUI-1732-2.side' +// 'SHIBUI-1732: Create, use, and delete CEA List' | '/SHIBUI-1732-3.side' +// 'SHIBUI-1732: Create, use, and delete CEA Long' | '/SHIBUI-1732-4.side' +// 'SHIBUI-1732: Create, use, and delete CEA Double' | '/SHIBUI-1732-5.side' +// 'SHIBUI-1732: Create, use, and delete CEA Duration' | '/SHIBUI-1732-6.side' +// 'SHIBUI-1732: Create, use, and delete CEA Spring Bean' | '/SHIBUI-1732-7.side' +// 'SHIBUI-1392: Verify provider with script filter is persistable' | '/SHIBUI-1392.side' +// 'SHIBUI-1740: Group can be created, edited, deleted' | '/SHIBUI-1740-1.side' +// 'SHIBUI-1740: Verify dev profile group membership' | '/SHIBUI-1740-2.side' +// '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-1743: Verify group regex CRUD operations' | '/SHIBUI-1743-1.side' +// 'SHIBUI-1743: Verify nonadmin group regex validation' | '/SHIBUI-1743-2.side' +// 'SHIBUI-1744: Verify attribute bundle CRUD operations' | '/SHIBUI-1744-1.side' +// 'SHIBUI-1744: Verify attribute bundles in metadata sources' | '/SHIBUI-1744-2.side' 'SHIBUI-1744: Verify attribute bundles in entity attribute filters' | '/SHIBUI-1744-3.side' - 'SHIBUI-2052: Logged in user & role appear on dashboard' | '/SHIBUI-2052.side' - 'SHIBUI-2116: Verify entity attribute bundle highlights' | '/SHIBUI-2116.side' // Note that this script WILL NOT PASS in the Selenium IDE due to ${driver} not being set (it is provided by this groovy script). - 'SHIBUI-2267: Verify new RPO CRUD' | '/SHIBUI-2267.side' - 'SHIBUI-2380: OIDC metadata source CRUD' | '/SHIBUI-2380.side' - 'SHIBUI-1674: Verify metadata source tooltips' | '/SHIBUI-1674-1.side' - 'SHIBUI-1674: Verify metadata provider tooltips' | '/SHIBUI-1674-2.side' - 'SHIBUI-1674: Verify advanced menu tooltips' | '/SHIBUI-1674-3.side' - 'SHIBUI-2270: Verify property set CRUD' | '/SHIBUI-2270-1.side' - 'SHIBUI-2270: Verify full property set' | '/SHIBUI-2270-2.side' - 'SHIBUI-2268: Verify Algorithm Filter' | '/SHIBUI-2268.side' - 'SHIBUI-2269: Verify XML generation of external filters' | '/SHIBUI-2269.side' +// 'SHIBUI-2052: Logged in user & role appear on dashboard' | '/SHIBUI-2052.side' +// 'SHIBUI-2116: Verify entity attribute bundle highlights' | '/SHIBUI-2116.side' // Note that this script WILL NOT PASS in the Selenium IDE due to ${driver} not being set (it is provided by this groovy script). +// 'SHIBUI-2267: Verify new RPO CRUD' | '/SHIBUI-2267.side' +// 'SHIBUI-2380: OIDC metadata source CRUD' | '/SHIBUI-2380.side' +// 'SHIBUI-1674: Verify metadata source tooltips' | '/SHIBUI-1674-1.side' +// 'SHIBUI-1674: Verify metadata provider tooltips' | '/SHIBUI-1674-2.side' +// 'SHIBUI-1674: Verify advanced menu tooltips' | '/SHIBUI-1674-3.side' +// 'SHIBUI-2270: Verify property set CRUD' | '/SHIBUI-2270-1.side' +// 'SHIBUI-2270: Verify full property set' | '/SHIBUI-2270-2.side' +// 'SHIBUI-2268: Verify Algorithm Filter' | '/SHIBUI-2268.side' +// 'SHIBUI-2269: Verify XML generation of external filters' | '/SHIBUI-2269.side' } } diff --git a/backend/src/integration/resources/SHIBUI-1333.side b/backend/src/integration/resources/SHIBUI-1333.side index 5ea86e004..93dae71f3 100644 --- a/backend/src/integration/resources/SHIBUI-1333.side +++ b/backend/src/integration/resources/SHIBUI-1333.side @@ -1306,6 +1306,19 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" + }, { + "id": "065023a8-0f23-42e0-89fc-29ee1c93b7e5", + "comment": "", + "command": "click", + "target": "id=root_relyingPartyOverrides_forceAuthn", + "targets": [ + ["id=root_relyingPartyOverrides_forceAuthn", "id"], + ["css=#root_relyingPartyOverrides_forceAuthn", "css:finder"], + ["xpath=//input[@id='root_relyingPartyOverrides_forceAuthn']", "xpath:attributes"], + ["xpath=//div[@id='root_relyingPartyOverrides_forceAuthn-group']/div/div/div/input", "xpath:idRelative"], + ["xpath=//div[11]/div/div/div/div/div/input", "xpath:position"] + ], + "value": "" }, { "id": "134bf1f3-1e86-49e7-91de-185e513b02be", "comment": "", @@ -1984,15 +1997,9 @@ }, { "id": "7c85fe59-dc95-4328-a010-33d1a06a5ce5", "comment": "", - "command": "click", + "command": "assertChecked", "target": "id=root_relyingPartyOverrides_forceAuthn", - "targets": [ - ["id=root_relyingPartyOverrides_forceAuthn", "id"], - ["css=#root_relyingPartyOverrides_forceAuthn", "css:finder"], - ["xpath=//input[@id='root_relyingPartyOverrides_forceAuthn']", "xpath:attributes"], - ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[10]/div/div/div/div/div/input", "xpath:idRelative"], - ["xpath=//div[10]/div/div/div/div/div/input", "xpath:position"] - ], + "targets": [], "value": "" }, { "id": "204ea80c-4aac-497f-8956-6370967ba73e", @@ -2381,11 +2388,11 @@ "id": "951a21c9-4cd3-4989-8dc0-77760ca0dc95", "comment": "", "command": "assertText", - "target": "css=div:nth-child(8) .text-truncate", + "target": "css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)", "targets": [ - ["css=div:nth-child(8) .text-truncate", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[8]/div/span[2]", "xpath:idRelative"], - ["xpath=//div[8]/div/span[2]", "xpath:position"], + ["css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:idRelative"], + ["xpath=//section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:position"], ["xpath=//span[contains(.,'responder-id-123')]", "xpath:innerText"] ], "value": "responder-id-123" @@ -2393,11 +2400,11 @@ "id": "e8b794fc-20e2-4317-8bdd-73eee8e94951", "comment": "", "command": "assertText", - "target": "css=.d-flex:nth-child(3) > .py-2 > span", + "target": "css=div:nth-child(10) .text-truncate", "targets": [ - ["css=.d-flex:nth-child(3) > .py-2 > span", "css:finder"], - ["xpath=//metadata-configuration[@id='configuration']/div/section[8]/div/div[2]/object-property/array-property/div/div/div[3]/div/span", "xpath:idRelative"], - ["xpath=//section[8]/div/div[2]/object-property/array-property/div/div/div[3]/div/span", "xpath:position"] + ["css=div:nth-child(10) .text-truncate", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[10]/div/span[2]", "xpath:idRelative"], + ["xpath=//div[10]/div/span[2]", "xpath:position"] ], "value": "true" }, { diff --git a/backend/src/integration/resources/SHIBUI-1334-1.side b/backend/src/integration/resources/SHIBUI-1334-1.side index b62e3a556..381c16c8a 100644 --- a/backend/src/integration/resources/SHIBUI-1334-1.side +++ b/backend/src/integration/resources/SHIBUI-1334-1.side @@ -1312,6 +1312,19 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" + }, { + "id": "7c85fe59-dc95-4328-a010-33d1a06a5ce5", + "comment": "", + "command": "click", + "target": "id=root_relyingPartyOverrides_forceAuthn", + "targets": [ + ["id=root_relyingPartyOverrides_forceAuthn", "id"], + ["css=#root_relyingPartyOverrides_forceAuthn", "css:finder"], + ["xpath=//input[@id='root_relyingPartyOverrides_forceAuthn']", "xpath:attributes"], + ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[10]/div/div/div/div/div/input", "xpath:idRelative"], + ["xpath=//div[10]/div/div/div/div/div/input", "xpath:position"] + ], + "value": "" }, { "id": "134bf1f3-1e86-49e7-91de-185e513b02be", "comment": "", @@ -1958,19 +1971,6 @@ ["xpath=//a[contains(.,'otherThings')]", "xpath:innerText"] ], "value": "" - }, { - "id": "7c85fe59-dc95-4328-a010-33d1a06a5ce5", - "comment": "", - "command": "click", - "target": "id=root_relyingPartyOverrides_forceAuthn", - "targets": [ - ["id=root_relyingPartyOverrides_forceAuthn", "id"], - ["css=#root_relyingPartyOverrides_forceAuthn", "css:finder"], - ["xpath=//input[@id='root_relyingPartyOverrides_forceAuthn']", "xpath:attributes"], - ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[10]/div/div/div/div/div/input", "xpath:idRelative"], - ["xpath=//div[10]/div/div/div/div/div/input", "xpath:position"] - ], - "value": "" }, { "id": "204ea80c-4aac-497f-8956-6370967ba73e", "comment": "", @@ -2042,11 +2042,11 @@ "id": "18636780-2feb-458f-97be-cf4a625b22e1", "comment": "", "command": "assertText", - "target": "css=.d-flex:nth-child(5) > .py-2 > span", + "target": "css=div:nth-child(9) .text-truncate", "targets": [ - ["css=.d-flex:nth-child(5) > .py-2 > span", "css:finder"], - ["xpath=//metadata-configuration[@id='configuration']/div/section[9]/div/div[2]/object-property/array-property/div/div[5]/div/span", "xpath:idRelative"], - ["xpath=//div/div[5]/div/span", "xpath:position"] + ["css=div:nth-child(9) .text-truncate", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[9]/div/span[2]", "xpath:idRelative"], + ["xpath=//div[9]/div/span[2]", "xpath:position"] ], "value": "true" }, { @@ -2064,11 +2064,11 @@ "id": "43b130ff-e8a5-493d-a418-f1f8623f1de3", "comment": "", "command": "assertText", - "target": "css=div:nth-child(9) .text-truncate", + "target": "css=div:nth-child(8) .text-truncate", "targets": [ - ["css=div:nth-child(9) .text-truncate", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[9]/div/span[2]", "xpath:idRelative"], - ["xpath=//div[9]/div/span[2]", "xpath:position"] + ["css=div:nth-child(8) .text-truncate", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[8]/div/span[2]", "xpath:idRelative"], + ["xpath=//div[8]/div/span[2]", "xpath:position"] ], "value": "false" }, { @@ -2354,11 +2354,11 @@ "id": "951a21c9-4cd3-4989-8dc0-77760ca0dc95", "comment": "", "command": "assertText", - "target": "css=div:nth-child(8) .text-truncate", + "target": "css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)", "targets": [ - ["css=div:nth-child(8) .text-truncate", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[8]/div/span[2]", "xpath:idRelative"], - ["xpath=//div[8]/div/span[2]", "xpath:position"], + ["css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:idRelative"], + ["xpath=//section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:position"], ["xpath=//span[contains(.,'responder-id-123')]", "xpath:innerText"] ], "value": "responder-id-123" @@ -2366,11 +2366,11 @@ "id": "e8b794fc-20e2-4317-8bdd-73eee8e94951", "comment": "", "command": "assertText", - "target": "css=div:nth-child(10) .text-truncate", + "target": "css=div:nth-child(9) > .d-flex > .text-truncate", "targets": [ - ["css=div:nth-child(10) .text-truncate", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[10]/div/span[2]", "xpath:idRelative"], - ["xpath=//div[10]/div/span[2]", "xpath:position"] + ["css=div:nth-child(9) > .d-flex > .text-truncate", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[9]/div/span[2]", "xpath:idRelative"], + ["xpath=//div[9]/div/span[2]", "xpath:position"] ], "value": "true" }, { diff --git a/backend/src/integration/resources/SHIBUI-1385-1.side b/backend/src/integration/resources/SHIBUI-1385-1.side index a81d2a2f2..be5b65800 100644 --- a/backend/src/integration/resources/SHIBUI-1385-1.side +++ b/backend/src/integration/resources/SHIBUI-1385-1.side @@ -1334,6 +1334,19 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" + }, { + "id": "7c85fe59-dc95-4328-a010-33d1a06a5ce5", + "comment": "", + "command": "click", + "target": "id=root_relyingPartyOverrides_forceAuthn", + "targets": [ + ["id=root_relyingPartyOverrides_forceAuthn", "id"], + ["css=#root_relyingPartyOverrides_forceAuthn", "css:finder"], + ["xpath=//input[@id='root_relyingPartyOverrides_forceAuthn']", "xpath:attributes"], + ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[10]/div/div/div/div/div/input", "xpath:idRelative"], + ["xpath=//div[10]/div/div/div/div/div/input", "xpath:position"] + ], + "value": "" }, { "id": "134bf1f3-1e86-49e7-91de-185e513b02be", "comment": "", @@ -1742,6 +1755,47 @@ "target": "500", "targets": [], "value": "" + }, { + "id": "94eaa0f0-8bd4-4bf1-b3ad-944279f73ab2", + "comment": "", + "command": "click", + "target": "id=array-field-deletebtn-root_relyingPartyOverrides_authenticationMethods-0", + "targets": [ + ["id=array-field-deletebtn-root_relyingPartyOverrides_authenticationMethods-0", "id"], + ["css=#array-field-deletebtn-root_relyingPartyOverrides_authenticationMethods-0", "css:finder"], + ["xpath=//button[@id='array-field-deletebtn-root_relyingPartyOverrides_authenticationMethods-0']", "xpath:attributes"], + ["xpath=//div[@id='root_relyingPartyOverrides_authenticationMethods-group']/div/div/div/div[2]/div/div/div[2]/div/button", "xpath:idRelative"], + ["xpath=//div[2]/div/button", "xpath:position"], + ["xpath=//button[contains(.,'Delete')]", "xpath:innerText"] + ], + "value": "" + }, { + "id": "ee3e9a44-6002-4540-adb4-ab50eefbd899", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" + }, { + "id": "e3e7f5f1-108b-4392-ace7-305685bec4ab", + "comment": "", + "command": "click", + "target": "id=array-field-addbtn-root_relyingPartyOverrides_authenticationMethods", + "targets": [ + ["id=array-field-addbtn-root_relyingPartyOverrides_authenticationMethods", "id"], + ["css=#array-field-addbtn-root_relyingPartyOverrides_authenticationMethods", "css:finder"], + ["xpath=//button[@id='array-field-addbtn-root_relyingPartyOverrides_authenticationMethods']", "xpath:attributes"], + ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[8]/div/div/div/div[6]/div/div/div/div/div/div/button", "xpath:idRelative"], + ["xpath=//div[6]/div/div/div/div/div/div/button", "xpath:position"] + ], + "value": "" + }, { + "id": "d78f24cf-8517-4a85-acbb-e44add1a7d43", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "cbf15c4c-35d9-4f80-ba3d-bfe960048cd1", "comment": "", @@ -1946,19 +2000,6 @@ ["xpath=//a[contains(.,'otherThings')]", "xpath:innerText"] ], "value": "" - }, { - "id": "7c85fe59-dc95-4328-a010-33d1a06a5ce5", - "comment": "", - "command": "click", - "target": "id=root_relyingPartyOverrides_forceAuthn", - "targets": [ - ["id=root_relyingPartyOverrides_forceAuthn", "id"], - ["css=#root_relyingPartyOverrides_forceAuthn", "css:finder"], - ["xpath=//input[@id='root_relyingPartyOverrides_forceAuthn']", "xpath:attributes"], - ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[10]/div/div/div/div/div/input", "xpath:idRelative"], - ["xpath=//div[10]/div/div/div/div/div/input", "xpath:position"] - ], - "value": "" }, { "id": "204ea80c-4aac-497f-8956-6370967ba73e", "comment": "", @@ -1973,11 +2014,24 @@ "id": "553dd570-b1bb-43bb-a469-63ee08a09794", "comment": "", "command": "click", - "target": "css=.fa-check", + "target": "css=#attributeRelease\\.checkAll", "targets": [ ["css=.fa-check", "css:finder"] ], "value": "" + }, { + "id": "f2e019e5-db1e-493a-90d3-182d2c2f7690", + "comment": "", + "command": "assertChecked", + "target": "id=root_attributeRelease_0", + "targets": [ + ["id=root_attributeRelease_0", "id"], + ["css=#root_attributeRelease_0", "css:finder"], + ["xpath=//input[@id='root_attributeRelease_0']", "xpath:attributes"], + ["xpath=//div[@id='root_attributeRelease-group']/div/fieldset/table/tbody/tr/td[2]/fieldset/div/div/input", "xpath:idRelative"], + ["xpath=//input", "xpath:position"] + ], + "value": "" }, { "id": "4adb7283-b1ad-4553-a934-afc54fa8b04f", "comment": "", diff --git a/backend/src/integration/resources/SHIBUI-1392.side b/backend/src/integration/resources/SHIBUI-1392.side index 1dc727268..94cbd2119 100644 --- a/backend/src/integration/resources/SHIBUI-1392.side +++ b/backend/src/integration/resources/SHIBUI-1392.side @@ -395,11 +395,11 @@ "id": "5699a5a2-d3df-4f99-b95d-f340f9156ffe", "comment": "", "command": "click", - "target": "css=.dropdown-item:nth-child(3)", + "target": "css=.show > .dropdown-item:nth-child(3)", "targets": [ - ["css=.dropdown-item:nth-child(3)", "css:finder"], + ["css=.show > .dropdown-item:nth-child(3)", "css:finder"], ["xpath=(//button[@type='button'])[16]", "xpath:attributes"], - ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[3]/div/div/div/fieldset/div/div/div/div/div/button[3]", "xpath:idRelative"], + ["xpath=//div[@id='root_nameIdFormatFilterTarget-group']/div/fieldset/div/div/div/div/div/button[3]", "xpath:idRelative"], ["xpath=//button[3]", "xpath:position"], ["xpath=//button[contains(.,'Script')]", "xpath:innerText"] ], @@ -508,20 +508,20 @@ ], "value": "eval(true);" }, { - "id": "4ec2c493-85e4-403b-9b09-031c5728f498", - "comment": "", - "command": "open", - "target": "/api/heheheheheheheWipeout", - "targets": [], - "value": "" - }, { - "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4", - "comment": "", - "command": "assertText", - "target": "css=body", - "targets": [], - "value": "yes, you did it" - }] + "id": "4ec2c493-85e4-403b-9b09-031c5728f498", + "comment": "", + "command": "open", + "target": "/api/heheheheheheheWipeout", + "targets": [], + "value": "" + }, { + "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4", + "comment": "", + "command": "assertText", + "target": "css=body", + "targets": [], + "value": "yes, you did it" + }] }], "suites": [{ "id": "4f69a686-bcaa-4963-84af-2e592e8c8842", diff --git a/backend/src/integration/resources/SHIBUI-1407-1.side b/backend/src/integration/resources/SHIBUI-1407-1.side index b0b65dbb5..7af4de5ef 100644 --- a/backend/src/integration/resources/SHIBUI-1407-1.side +++ b/backend/src/integration/resources/SHIBUI-1407-1.side @@ -1327,6 +1327,19 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" + }, { + "id": "7c85fe59-dc95-4328-a010-33d1a06a5ce5", + "comment": "", + "command": "click", + "target": "id=root_relyingPartyOverrides_forceAuthn", + "targets": [ + ["id=root_relyingPartyOverrides_forceAuthn", "id"], + ["css=#root_relyingPartyOverrides_forceAuthn", "css:finder"], + ["xpath=//input[@id='root_relyingPartyOverrides_forceAuthn']", "xpath:attributes"], + ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[10]/div/div/div/div/div/input", "xpath:idRelative"], + ["xpath=//div[10]/div/div/div/div/div/input", "xpath:position"] + ], + "value": "" }, { "id": "134bf1f3-1e86-49e7-91de-185e513b02be", "comment": "", @@ -1742,6 +1755,47 @@ "target": "500", "targets": [], "value": "" + }, { + "id": "47ce7b12-97c8-4393-9f28-2fbc0537627f", + "comment": "", + "command": "click", + "target": "id=array-field-deletebtn-root_relyingPartyOverrides_authenticationMethods-0", + "targets": [ + ["id=array-field-deletebtn-root_relyingPartyOverrides_authenticationMethods-0", "id"], + ["css=#array-field-deletebtn-root_relyingPartyOverrides_authenticationMethods-0", "css:finder"], + ["xpath=//button[@id='array-field-deletebtn-root_relyingPartyOverrides_authenticationMethods-0']", "xpath:attributes"], + ["xpath=//div[@id='root_relyingPartyOverrides_authenticationMethods-group']/div/div/div/div[2]/div/div/div[2]/div/button", "xpath:idRelative"], + ["xpath=//div[2]/div/button", "xpath:position"], + ["xpath=//button[contains(.,'Delete')]", "xpath:innerText"] + ], + "value": "" + }, { + "id": "3c94a090-d35c-4412-80cb-bbe7bf6ea6d9", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" + }, { + "id": "3d6a17e4-d895-45aa-9dd5-22cc130ebbfe", + "comment": "", + "command": "click", + "target": "id=array-field-addbtn-root_relyingPartyOverrides_authenticationMethods", + "targets": [ + ["id=array-field-addbtn-root_relyingPartyOverrides_authenticationMethods", "id"], + ["css=#array-field-addbtn-root_relyingPartyOverrides_authenticationMethods", "css:finder"], + ["xpath=//button[@id='array-field-addbtn-root_relyingPartyOverrides_authenticationMethods']", "xpath:attributes"], + ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[8]/div/div/div/div[6]/div/div/div/div/div/div/button", "xpath:idRelative"], + ["xpath=//div[6]/div/div/div/div/div/div/button", "xpath:position"] + ], + "value": "" + }, { + "id": "cb08a311-29b6-41a6-bfd1-38c12e9aca93", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "cbf15c4c-35d9-4f80-ba3d-bfe960048cd1", "comment": "", @@ -1945,19 +1999,6 @@ ["xpath=//a[contains(.,'otherThings')]", "xpath:innerText"] ], "value": "" - }, { - "id": "7c85fe59-dc95-4328-a010-33d1a06a5ce5", - "comment": "", - "command": "click", - "target": "id=root_relyingPartyOverrides_forceAuthn", - "targets": [ - ["id=root_relyingPartyOverrides_forceAuthn", "id"], - ["css=#root_relyingPartyOverrides_forceAuthn", "css:finder"], - ["xpath=//input[@id='root_relyingPartyOverrides_forceAuthn']", "xpath:attributes"], - ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[10]/div/div/div/div/div/input", "xpath:idRelative"], - ["xpath=//div[10]/div/div/div/div/div/input", "xpath:position"] - ], - "value": "" }, { "id": "204ea80c-4aac-497f-8956-6370967ba73e", "comment": "", @@ -2325,11 +2366,11 @@ "id": "e8b794fc-20e2-4317-8bdd-73eee8e94951", "comment": "", "command": "assertText", - "target": "css=div:nth-child(9) .text-truncate", + "target": "css=div:nth-child(10) .text-truncate", "targets": [ - ["css=div:nth-child(9) .text-truncate", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[9]/div/span[2]", "xpath:idRelative"], - ["xpath=//div[9]/div/span[2]", "xpath:position"] + ["css=div:nth-child(10) .text-truncate", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[10]/div/span[2]", "xpath:idRelative"], + ["xpath=//div[10]/div/span[2]", "xpath:position"] ], "value": "true" }, { diff --git a/backend/src/integration/resources/SHIBUI-1674-1.side b/backend/src/integration/resources/SHIBUI-1674-1.side index 98b22bea0..88ca762b4 100644 --- a/backend/src/integration/resources/SHIBUI-1674-1.side +++ b/backend/src/integration/resources/SHIBUI-1674-1.side @@ -493,9 +493,9 @@ "id": "c974e795-454e-4271-86ef-609e3538b28f", "comment": "", "command": "mouseOver", - "target": "css=.row:nth-child(1) > .col-12 .svg-inline--fa", + "target": "css=#root_organization_name-group path", "targets": [ - ["css=.row:nth-child(1) > .col-12 .svg-inline--fa", "css:finder"] + ["css=#root_organization_name-group path", "css:finder"] ], "value": "" }, { @@ -593,8 +593,10 @@ "id": "825b4bb3-e40e-4b02-a053-5f8e15b9b672", "comment": "", "command": "mouseOver", - "target": "css=.row:nth-child(1) > .col-12 .btn > .svg-inline--fa", - "targets": [], + "target": "css=#root_logoutEndpoints_0_url-group .info-icon path", + "targets": [ + ["css=#root_logoutEndpoints_0_url-group .info-icon path", "css:finder"] + ], "value": "" }, { "id": "8b309a28-ff0d-4e6b-8c49-26a9e13822d8", diff --git a/backend/src/integration/resources/SHIBUI-1732-3.side b/backend/src/integration/resources/SHIBUI-1732-3.side index ad3bec798..79e2f313a 100644 --- a/backend/src/integration/resources/SHIBUI-1732-3.side +++ b/backend/src/integration/resources/SHIBUI-1732-3.side @@ -461,15 +461,10 @@ }, { "id": "95c2701d-82d8-4d2d-b83e-82bb4bd2cf8c", "comment": "", - "command": "assertText", - "target": "css=.row:nth-child(5) .control-label", - "targets": [ - ["css=.row:nth-child(5) .control-label", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[8]/div/div/div/div[5]/div/div/div/div/div/div/span", "xpath:idRelative"], - ["xpath=//div[5]/div/div/div/div/div/div/span", "xpath:position"], - ["xpath=//span[contains(.,'Custom List Display')]", "xpath:innerText"] - ], - "value": "Custom List Display" + "command": "assertElementPresent", + "target": "//*[text()[contains(.,'Custom List Display')]]", + "targets": [], + "value": "" }, { "id": "d6d968f3-a549-4e0b-8fe0-0ad37d80fea7", "comment": "", @@ -636,11 +631,11 @@ "id": "63e0b87d-4da3-4fb8-aa9f-6412e0562709", "comment": "", "command": "waitForElementVisible", - "target": "css=.align-items-start:nth-child(7) > .p-2", + "target": "css=.align-items-start:nth-child(5) > .p-2", "targets": [ - ["css=.align-items-start:nth-child(7) > .p-2", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[7]/span", "xpath:idRelative"], - ["xpath=//div[7]/span", "xpath:position"], + ["css=.align-items-start:nth-child(5) > .p-2", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[5]/span", "xpath:idRelative"], + ["xpath=//div[5]/span", "xpath:position"], ["xpath=//span[contains(.,'Custom List Display')]", "xpath:innerText"] ], "value": "30000" @@ -1220,7 +1215,8 @@ "targets": [ ["css=.d-flex:nth-child(5) .d-block", "css:finder"], ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[5]/ul/li/span", "xpath:idRelative"], - ["xpath=//div[5]/ul/li/span", "xpath:position"] + ["xpath=//div[5]/ul/li/span", "xpath:position"], + ["xpath=//span[contains(.,'bar')]", "xpath:innerText"] ], "value": "bar" }, { @@ -1300,11 +1296,12 @@ "id": "83aa335b-5efb-4ca2-9e41-f06213cc68e2", "comment": "", "command": "assertText", - "target": "css=.d-flex:nth-child(5) .d-block", + "target": "css=.d-flex:nth-child(5) .d-flex:nth-child(1) > .d-block", "targets": [ - ["css=.d-flex:nth-child(5) .d-block", "css:finder"], + ["css=.d-flex:nth-child(5) .d-flex:nth-child(1) > .d-block", "css:finder"], ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[5]/ul/li/span", "xpath:idRelative"], - ["xpath=//div[5]/ul/li/span", "xpath:position"] + ["xpath=//div[5]/ul/li/span", "xpath:position"], + ["xpath=//span[contains(.,'bar')]", "xpath:innerText"] ], "value": "bar" }, { @@ -1314,8 +1311,8 @@ "target": "css=.d-flex:nth-child(2) > .d-block", "targets": [ ["css=.d-flex:nth-child(2) > .d-block", "css:finder"], - ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[7]/ul/li[2]/span", "xpath:idRelative"], - ["xpath=//ul/li[2]/span", "xpath:position"] + ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[5]/ul/li[2]/span", "xpath:idRelative"], + ["xpath=//li[2]/span", "xpath:position"] ], "value": "foo" }, { diff --git a/backend/src/integration/resources/SHIBUI-1744-3.side b/backend/src/integration/resources/SHIBUI-1744-3.side index 67e45e747..3771854ff 100644 --- a/backend/src/integration/resources/SHIBUI-1744-3.side +++ b/backend/src/integration/resources/SHIBUI-1744-3.side @@ -259,6 +259,13 @@ ["xpath=//span[contains(.,'2. Common Attributes')]", "xpath:innerText"] ], "value": "" + }, { + "id": "1a12b13b-c746-4dec-ae20-de15e29de90b", + "comment": "", + "command": "waitForElementEditable", + "target": "id=root_xmlId", + "targets": [], + "value": "30000" }, { "id": "7cfab6d3-3982-423f-a99c-488e1d41e40b", "comment": "", @@ -454,30 +461,47 @@ "id": "e8a2f501-0efa-43a3-bbf2-b86e5ec8f6d1", "comment": "", "command": "waitForElementVisible", - "target": "css=fieldset > div > button > strong", - "targets": [], + "target": "id=user-attr-bundle-btn-0", + "targets": [ + ["id=user-attr-bundle-btn-0", "id"], + ["css=#user-attr-bundle-btn-0", "css:finder"], + ["xpath=//button[@id='user-attr-bundle-btn-0']", "xpath:attributes"], + ["xpath=//div[@id='root_attributeRelease-group']/div/fieldset/div/button", "xpath:idRelative"], + ["xpath=//fieldset/div/button", "xpath:position"] + ], "value": "30000" }, { "id": "cc36c580-3d53-483a-a813-2a6c8fb95792", "comment": "", "command": "assertText", - "target": "css=fieldset > div > button > strong", + "target": "css=strong", "targets": [ ["css=strong", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[8]/div/div/div/fieldset/ul/li/strong", "xpath:idRelative"], + ["xpath=//button[@id='user-attr-bundle-btn-0']/strong", "xpath:idRelative"], ["xpath=//strong", "xpath:position"], ["xpath=//strong[contains(.,'Bundle - Test Bundle')]", "xpath:innerText"] ], "value": "Bundle - Test Bundle" }, { - "id": "caabc3c1-7ac7-4251-9885-fe2e3b7c4c10", + "id": "f4b2e9ae-cb20-4c41-8ad6-50004e75a865", "comment": "", "command": "click", - "target": "css=fieldset > div > button", + "target": "id=user-attr-bundle-btn-0", "targets": [ - ["css=.fa-check:nth-child(2) > path", "css:finder"] + ["id=user-attr-bundle-btn-0", "id"], + ["css=#user-attr-bundle-btn-0", "css:finder"], + ["xpath=//button[@id='user-attr-bundle-btn-0']", "xpath:attributes"], + ["xpath=//div[@id='root_attributeRelease-group']/div/fieldset/div/button", "xpath:idRelative"], + ["xpath=//fieldset/div/button", "xpath:position"] ], "value": "" + }, { + "id": "33dc6ff7-9b71-4fe4-b74d-29d8b663d8f8", + "comment": "", + "command": "pause", + "target": "300000", + "targets": [], + "value": "" }, { "id": "5cd2df54-e975-4657-9d4b-390c87901f88", "comment": "", @@ -677,21 +701,21 @@ ["xpath=//section[3]/div/div[2]/div[2]/div[5]/div/span", "xpath:position"] ], "value": "true" - },{ - "id": "4ec2c493-85e4-403b-9b09-031c5728f498", - "comment": "", - "command": "open", - "target": "/api/heheheheheheheWipeout", - "targets": [], - "value": "" - }, { - "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4", - "comment": "", - "command": "assertText", - "target": "css=body", - "targets": [], - "value": "yes, you did it" - }] + }, { + "id": "4ec2c493-85e4-403b-9b09-031c5728f498", + "comment": "", + "command": "open", + "target": "/api/heheheheheheheWipeout", + "targets": [], + "value": "" + }, { + "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4", + "comment": "", + "command": "assertText", + "target": "css=body", + "targets": [], + "value": "yes, you did it" + }] }], "suites": [{ "id": "56040c8b-b45c-454e-b2ba-2a06056b397f", diff --git a/backend/src/integration/resources/SHIBUI-2269.side b/backend/src/integration/resources/SHIBUI-2269.side index f2848dddb..e8881bec7 100644 --- a/backend/src/integration/resources/SHIBUI-2269.side +++ b/backend/src/integration/resources/SHIBUI-2269.side @@ -211,6 +211,39 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" + }, { + "id": "033008de-7ccc-49ae-a944-a116364c3992", + "comment": "", + "command": "waitForElementEditable", + "target": "id=enable-switch-0", + "targets": [ + ["id=enable-switch-0", "id"], + ["css=#enable-switch-0", "css:finder"], + ["xpath=//input[@id='enable-switch-0']", "xpath:attributes"], + ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[6]/span/div/input", "xpath:idRelative"], + ["xpath=//span/div/input", "xpath:position"] + ], + "value": "30000" + }, { + "id": "ccbdf33d-b35d-44d3-93c2-1198329df520", + "comment": "", + "command": "click", + "target": "id=enable-switch-0", + "targets": [ + ["id=enable-switch-0", "id"], + ["css=#enable-switch-0", "css:finder"], + ["xpath=//input[@id='enable-switch-0']", "xpath:attributes"], + ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[6]/span/div/input", "xpath:idRelative"], + ["xpath=//span/div/input", "xpath:position"] + ], + "value": "" + }, { + "id": "c7660056-bb11-4d81-bfc1-30f04a4f1efd", + "comment": "", + "command": "waitForElementVisible", + "target": "css=.show", + "targets": [], + "value": "30000" }, { "id": "ab15e915-02b9-4616-9f92-ffcb0386918c", "comment": "", @@ -292,11 +325,11 @@ "id": "d01e44ab-802b-4d85-ac2e-e2e03a00c1c0", "comment": "", "command": "click", - "target": "css=.dropdown-item:nth-child(3)", + "target": "css=.show > .dropdown-item:nth-child(3)", "targets": [ - ["css=.dropdown-item:nth-child(3)", "css:finder"], + ["css=.show > .dropdown-item:nth-child(3)", "css:finder"], ["xpath=(//button[@type='button'])[17]", "xpath:attributes"], - ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[6]/div/div/div/fieldset/div/div/div/div/div/button[3]", "xpath:idRelative"], + ["xpath=//div[@id='root_entityAttributesFilterTarget-group']/div/fieldset/div/div/div/div/div/button[3]", "xpath:idRelative"], ["xpath=//div/button[3]", "xpath:position"], ["xpath=//button[contains(.,'Script')]", "xpath:innerText"] ], @@ -395,11 +428,11 @@ "id": "bce0cd29-246e-4f6e-a860-0eade5c73850", "comment": "", "command": "click", - "target": "css=.dropdown-item:nth-child(3)", + "target": "css=.show > .dropdown-item:nth-child(3)", "targets": [ - ["css=.dropdown-item:nth-child(3)", "css:finder"], + ["css=.show > .dropdown-item:nth-child(3)", "css:finder"], ["xpath=(//button[@type='button'])[16]", "xpath:attributes"], - ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[3]/div/div/div/fieldset/div/div/div/div/div/button[3]", "xpath:idRelative"], + ["xpath=//div[@id='root_nameIdFormatFilterTarget-group']/div/fieldset/div/div/div/div/div/button[3]", "xpath:idRelative"], ["xpath=//button[3]", "xpath:position"], ["xpath=//button[contains(.,'Script')]", "xpath:innerText"] ], @@ -458,25 +491,25 @@ "id": "802be014-0d04-4bda-93d1-ca7a5d7f802d", "comment": "", "command": "waitForElementVisible", - "target": "css=.text:nth-child(2)", + "target": "css=div:nth-child(5) .text-truncate", "targets": [ - ["css=.text:nth-child(2)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div/h2/span[2]", "xpath:idRelative"], - ["xpath=//h2/span[2]", "xpath:position"], - ["xpath=//span[contains(.,'Common Attributes')]", "xpath:innerText"] + ["css=div:nth-child(5) .text-truncate", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[5]/div/span[2]", "xpath:idRelative"], + ["xpath=//div[5]/div/span[2]", "xpath:position"], + ["xpath=//span[contains(.,'External Test')]", "xpath:innerText"] ], "value": "30000" }, { "id": "7e3e7d65-e0ff-4a2d-a0e9-5080bfefd4df", "comment": "", "command": "click", - "target": "css=.btn-outline-secondary", + "target": "css=div:nth-child(1) > .btn:nth-child(2)", "targets": [ - ["css=.btn-outline-secondary", "css:finder"], + ["css=div:nth-child(1) > .btn:nth-child(2)", "css:finder"], ["xpath=(//button[@type='button'])[5]", "xpath:attributes"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/div/div/div/div/button", "xpath:idRelative"], - ["xpath=//div/div/div/div/button", "xpath:position"], - ["xpath=//button[contains(.,'Enable')]", "xpath:innerText"] + ["xpath=//div[@id='navigation']/div/button", "xpath:idRelative"], + ["xpath=//div[2]/div/button", "xpath:position"], + ["xpath=//button[contains(.,' Filters')]", "xpath:innerText"] ], "value": "" }, { diff --git a/backend/src/integration/resources/SHIBUI-2380.side b/backend/src/integration/resources/SHIBUI-2380.side index a81cad5c3..ac159d3a3 100644 --- a/backend/src/integration/resources/SHIBUI-2380.side +++ b/backend/src/integration/resources/SHIBUI-2380.side @@ -1381,14 +1381,14 @@ "id": "eb9c18d9-d0fc-4723-840b-7be59434bebf", "comment": "", "command": "waitForElementVisible", - "target": "css=.alert", + "target": "css=.show", "targets": [], "value": "30000" }, { "id": "f27630e9-561e-49f6-b557-b2c7ff0647fc", "comment": "", "command": "assertText", - "target": "css=.alert", + "target": "css=.show", "targets": [], "value": "Metadata source has been deleted." }, { diff --git a/ui/src/app/form/component/widgets/AttributeReleaseWidget.js b/ui/src/app/form/component/widgets/AttributeReleaseWidget.js index 2ed6dd9bc..2dd7cc269 100644 --- a/ui/src/app/form/component/widgets/AttributeReleaseWidget.js +++ b/ui/src/app/form/component/widgets/AttributeReleaseWidget.js @@ -109,6 +109,7 @@ const AttributeReleaseWidget = ({ {(bundlelist).map((option, i) => ( option.selected ? onUncheckBundle(option) : onCheckBundle(option) } onMouseOver={() => onMouseOver(option.value)} @@ -118,7 +119,7 @@ const AttributeReleaseWidget = ({ >

Bundled attributes: {option.value.join(', ')}

- + Select Bundle diff --git a/ui/src/app/notifications/component/NotificationItem.js b/ui/src/app/notifications/component/NotificationItem.js index 73b0d2043..47f53685c 100644 --- a/ui/src/app/notifications/component/NotificationItem.js +++ b/ui/src/app/notifications/component/NotificationItem.js @@ -12,7 +12,7 @@ export function NotificationItem ({ type, body, timeout, id, onRemove }) { }, [timeout, id, onRemove]); return ( - onRemove(id)}> + onRemove(id)} className="notification-item"> {body} ) diff --git a/ui/src/app/store/notifications/NotificationSlice.js b/ui/src/app/store/notifications/NotificationSlice.js index 382639d0a..949cc4a4e 100644 --- a/ui/src/app/store/notifications/NotificationSlice.js +++ b/ui/src/app/store/notifications/NotificationSlice.js @@ -1,7 +1,7 @@ import { createAction, createSelector, createSlice } from '@reduxjs/toolkit' import { reverse } from 'lodash'; import { useSelector } from 'react-redux'; -import { uuid } from '../../core/utility/uuid'; +import uniqueId from 'lodash/uniqueId'; const initialState = { notifications: [] @@ -19,7 +19,7 @@ export const createNotificationAction = createAction('notifications/create', fun return { payload: { body, - id: uuid(), + id: uniqueId('notification_'), createdAt: new Date().toISOString(), type, timeout