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 c49ad5e9f..a2a156bfd 100644 --- a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy +++ b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy @@ -88,13 +88,17 @@ class SeleniumSIDETest extends Specification { // TODO: Uncomment the below commented tests once they've been updated to use the new configuration screen where: name | file -// 'SHIBUI-1281: Metadata Source Dashboard' | '/SHIBUI-1281.side' +// 'SHIBUI-1364: Compare FBHTTPMP with filters' | '/SHIBUI-1364-1.side' +// 'SHIBUI-1364: Compare FSMP with filters' | '/SHIBUI-1364-2.side' +// 'SHIBUI-1364: Compare LDMP with filters' | '/SHIBUI-1364-3.side' +// 'SHIBUI-1364: Compare DHTTPMP with filters' | '/SHIBUI-1364-4.side' + 'SHIBUI-1281: Metadata Source Dashboard' | '/SHIBUI-1281.side' // 'SHIBUI-1311: Metadata Provider Dashboard' | '/SHIBUI-1311.side' 'SHIBUI-950: Metadata Source from XML w/ digest' | '/SHIBUI-950.side' // 'SHIBUI-1352: Create LocalDynamic provider' | '/SHIBUI-1352-1.side' // 'SHIBUI-1352: Create FileSystem provider' | '/SHIBUI-1352-2.side' -// 'SHIBUI-1333: Verify metadata source configuration' | '/SHIBUI-1333.side' -// 'SHIBUI-1334: Verify metadata source versioning' | '/SHIBUI-1334-1.side' + 'SHIBUI-1333: Verify metadata source configuration' | '/SHIBUI-1333.side' + 'SHIBUI-1334: Verify metadata source versioning' | '/SHIBUI-1334-1.side' // 'SHIBUI-1334: Verify metadata provider versioning' | '/SHIBUI-1334-2.side' // 'SHIBUI-1335: Verify File Backed HTTP Metadata Provider Filters' | '/SHIBUI-1335-1.side' // 'SHIBUI-1335: Verify Filesystem Metadata Provider Filters' | '/SHIBUI-1335-2.side' @@ -102,16 +106,11 @@ class SeleniumSIDETest extends Specification { // 'SHIBUI-1335: Verify Dynamic HTTP Metadata Provider Filters' | '/SHIBUI-1335-4.side' // 'SHIBUI-1392: Verify provider with script filter is persistable' | '/SHIBUI-1392.side' // 'SHIBUI-1361: Verify dates display in proper format' | '/SHIBUI-1361.side' -// 'SHIBUI-1385: Restore a metadata source version' | '/SHIBUI-1385-1.side' + 'SHIBUI-1385: Restore a metadata 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-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-1364: Compare FBHTTPMP with filters' | '/SHIBUI-1364-1.side' -// 'SHIBUI-1364: Compare FSMP with filters' | '/SHIBUI-1364-2.side' -// 'SHIBUI-1364: Compare LDMP with filters' | '/SHIBUI-1364-3.side' -// 'SHIBUI-1364: Compare DHTTPMP with filters' | '/SHIBUI-1364-4.side' - 'SHIBUI-1521: Metadata source Entity ID validation test' | '/SHIBUI-1521.side' } } diff --git a/backend/src/integration/resources/SHIBUI-1281.side b/backend/src/integration/resources/SHIBUI-1281.side index 00502648f..7b66e3fd1 100644 --- a/backend/src/integration/resources/SHIBUI-1281.side +++ b/backend/src/integration/resources/SHIBUI-1281.side @@ -1768,10 +1768,11 @@ "id": "3baa7bd3-55c0-4d10-8aa3-c0daa63ec4d4", "comment": "", "command": "assertText", - "target": "css=.px-3 > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", + "target": "css=.d-block > primitive-property:nth-child(1) .text-truncate", "targets": [ - ["css=.px-3 > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", "css:finder"], - ["xpath=//summary-property/div/span", "xpath:position"], + ["css=.d-block > primitive-property:nth-child(1) .text-truncate", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section/div/div[2]/object-property/primitive-property/div/div/span[2]", "xpath:idRelative"], + ["xpath=//div/span[2]", "xpath:position"], ["xpath=//span[contains(.,'test-1234')]", "xpath:innerText"] ], "value": "test-1234" @@ -1779,34 +1780,35 @@ "id": "0d355ff0-0449-49a7-ae75-14d7c405b97c", "comment": "", "command": "assertText", - "target": "css=.px-3:nth-child(2) > summary-property:nth-child(2) tr:nth-child(2) > td:nth-child(1)", + "target": "css=.mb-4:nth-child(7) .py-2:nth-child(3) > .d-flex:nth-child(1) > .text-truncate", "targets": [ - ["css=.px-3:nth-child(2) > summary-property:nth-child(2) tr:nth-child(2) > td:nth-child(1)", "css:finder"], - ["xpath=//div[2]/section[2]/summary-property/div/table/tbody/tr[2]/td", "xpath:position"], - ["xpath=//td[contains(.,'http://test.org/assert2')]", "xpath:innerText"] + ["css=.mb-4:nth-child(7) .py-2:nth-child(3) > .d-flex:nth-child(1) > .text-truncate", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section[7]/div/div[2]/object-property/array-property/div/div[3]/div/div[2]", "xpath:idRelative"], + ["xpath=//section[7]/div/div[2]/object-property/array-property/div/div[3]/div/div[2]", "xpath:position"] ], "value": "http://test.org/assert2" }, { "id": "e53030b6-f344-4361-981d-b8303a721c5d", "comment": "", "command": "assertText", - "target": "css=summary-property:nth-child(2) > .mb-3 > .list-unstyled > li:nth-child(5)", + "target": "css=array-property:nth-child(8) .border-0", "targets": [ - ["css=summary-property:nth-child(2) > .mb-3 > .list-unstyled > li:nth-child(5)", "css:finder"], - ["xpath=//li[5]", "xpath:position"], - ["xpath=//li[contains(.,'somethingElse')]", "xpath:innerText"] + ["css=array-property:nth-child(8) .border-0", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section[8]/div/div[2]/object-property/object-property/array-property/div/ul/li[5]", "xpath:idRelative"], + ["xpath=//section[8]/div/div[2]/object-property/object-property/array-property/div/ul/li[5]", "xpath:position"] ], "value": "somethingElse" }, { "id": "18636780-2feb-458f-97be-cf4a625b22e1", "comment": "", "command": "assertText", - "target": "css=summary-property:nth-child(10) .d-block:nth-child(2)", + "target": "css=.d-flex:nth-child(5) > .py-2 > span", "targets": [ - ["css=summary-property:nth-child(10) .d-block:nth-child(2)", "css:finder"], - ["xpath=//summary-property[10]/div/span", "xpath:position"] + ["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"] ], - "value": "true" + "value": "True" }, { "id": "1406d7e4-907d-4359-8de8-a40206f0993e", "comment": "", @@ -1942,6 +1944,13 @@ "target": "css=td:nth-child(2)", "targets": [], "value": "" + }, { + "id": "3e7de570-9ff8-4dfe-9eaa-3417f3172d49", + "comment": "", + "command": "close", + "target": "", + "targets": [], + "value": "" }] }], "suites": [{ diff --git a/backend/src/integration/resources/SHIBUI-1311.side b/backend/src/integration/resources/SHIBUI-1311.side index fac8ba2d2..d5eb6216b 100644 --- a/backend/src/integration/resources/SHIBUI-1311.side +++ b/backend/src/integration/resources/SHIBUI-1311.side @@ -991,6 +991,13 @@ ["xpath=//tr[2]/td[6]/span/span", "xpath:position"] ], "value": "Disabled" + }, { + "id": "57d0e204-6c28-4be5-9888-28f8d7738508", + "comment": "", + "command": "close", + "target": "", + "targets": [], + "value": "" }] }], "suites": [{ diff --git a/backend/src/integration/resources/SHIBUI-1333.side b/backend/src/integration/resources/SHIBUI-1333.side index 78143b150..2b2cde739 100644 --- a/backend/src/integration/resources/SHIBUI-1333.side +++ b/backend/src/integration/resources/SHIBUI-1333.side @@ -1768,10 +1768,11 @@ "id": "3baa7bd3-55c0-4d10-8aa3-c0daa63ec4d4", "comment": "", "command": "assertText", - "target": "css=.px-3 > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", + "target": "css=.d-block > primitive-property:nth-child(1) .text-truncate", "targets": [ - ["css=.px-3 > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", "css:finder"], - ["xpath=//summary-property/div/span", "xpath:position"], + ["css=.d-block > primitive-property:nth-child(1) .text-truncate", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section/div/div[2]/object-property/primitive-property/div/div/span[2]", "xpath:idRelative"], + ["xpath=//div/span[2]", "xpath:position"], ["xpath=//span[contains(.,'test-1234')]", "xpath:innerText"] ], "value": "test-1234" @@ -1779,34 +1780,35 @@ "id": "0d355ff0-0449-49a7-ae75-14d7c405b97c", "comment": "", "command": "assertText", - "target": "css=.px-3:nth-child(2) > summary-property:nth-child(2) tr:nth-child(2) > td:nth-child(1)", + "target": "css=.mb-4:nth-child(7) .py-2:nth-child(3) > .d-flex:nth-child(1) > .text-truncate", "targets": [ - ["css=.px-3:nth-child(2) > summary-property:nth-child(2) tr:nth-child(2) > td:nth-child(1)", "css:finder"], - ["xpath=//div[2]/section[2]/summary-property/div/table/tbody/tr[2]/td", "xpath:position"], - ["xpath=//td[contains(.,'http://test.org/assert2')]", "xpath:innerText"] + ["css=.mb-4:nth-child(7) .py-2:nth-child(3) > .d-flex:nth-child(1) > .text-truncate", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section[7]/div/div[2]/object-property/array-property/div/div[3]/div/div[2]", "xpath:idRelative"], + ["xpath=//section[7]/div/div[2]/object-property/array-property/div/div[3]/div/div[2]", "xpath:position"] ], "value": "http://test.org/assert2" }, { "id": "e53030b6-f344-4361-981d-b8303a721c5d", "comment": "", "command": "assertText", - "target": "css=summary-property:nth-child(2) > .mb-3 > .list-unstyled > li:nth-child(5)", + "target": "css=array-property:nth-child(8) .border-0", "targets": [ - ["css=summary-property:nth-child(2) > .mb-3 > .list-unstyled > li:nth-child(5)", "css:finder"], - ["xpath=//li[5]", "xpath:position"], - ["xpath=//li[contains(.,'somethingElse')]", "xpath:innerText"] + ["css=array-property:nth-child(8) .border-0", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section[8]/div/div[2]/object-property/object-property/array-property/div/ul/li[5]", "xpath:idRelative"], + ["xpath=//section[8]/div/div[2]/object-property/object-property/array-property/div/ul/li[5]", "xpath:position"] ], "value": "somethingElse" }, { "id": "18636780-2feb-458f-97be-cf4a625b22e1", "comment": "", "command": "assertText", - "target": "css=summary-property:nth-child(10) .d-block:nth-child(2)", + "target": "css=.d-flex:nth-child(5) > .py-2 > span", "targets": [ - ["css=summary-property:nth-child(10) .d-block:nth-child(2)", "css:finder"], - ["xpath=//summary-property[10]/div/span", "xpath:position"] + ["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"] ], - "value": "true" + "value": "True" }, { "id": "1406d7e4-907d-4359-8de8-a40206f0993e", "comment": "", @@ -2091,16 +2093,11 @@ ], "value": "True" }, { - "id": "cf6660cb-2086-452f-a5e5-ad64db784d92", + "id": "8872eadd-b15a-48d3-8334-a54a3fa14e6d", "comment": "", - "command": "click", - "target": "css=.btn:nth-child(4) > translate-i18n", - "targets": [ - ["css=.btn:nth-child(4) > translate-i18n", "css:finder"], - ["xpath=//div[@id='header']/button/translate-i18n", "xpath:idRelative"], - ["xpath=//div/button/translate-i18n", "xpath:position"], - ["xpath=//translate-i18n[contains(.,'Back to Top')]", "xpath:innerText"] - ], + "command": "close", + "target": "", + "targets": [], "value": "" }] }], diff --git a/backend/src/integration/resources/SHIBUI-1334-1.side b/backend/src/integration/resources/SHIBUI-1334-1.side index 664dcaad0..80869679b 100644 --- a/backend/src/integration/resources/SHIBUI-1334-1.side +++ b/backend/src/integration/resources/SHIBUI-1334-1.side @@ -1768,10 +1768,11 @@ "id": "3baa7bd3-55c0-4d10-8aa3-c0daa63ec4d4", "comment": "", "command": "assertText", - "target": "css=.px-3 > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", + "target": "css=.d-block > primitive-property:nth-child(1) .text-truncate", "targets": [ - ["css=.px-3 > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", "css:finder"], - ["xpath=//summary-property/div/span", "xpath:position"], + ["css=.d-block > primitive-property:nth-child(1) .text-truncate", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section/div/div[2]/object-property/primitive-property/div/div/span[2]", "xpath:idRelative"], + ["xpath=//div/span[2]", "xpath:position"], ["xpath=//span[contains(.,'test-1234')]", "xpath:innerText"] ], "value": "test-1234" @@ -1779,34 +1780,35 @@ "id": "0d355ff0-0449-49a7-ae75-14d7c405b97c", "comment": "", "command": "assertText", - "target": "css=.px-3:nth-child(2) > summary-property:nth-child(2) tr:nth-child(2) > td:nth-child(1)", + "target": "css=.mb-4:nth-child(7) .py-2:nth-child(3) > .d-flex:nth-child(1) > .text-truncate", "targets": [ - ["css=.px-3:nth-child(2) > summary-property:nth-child(2) tr:nth-child(2) > td:nth-child(1)", "css:finder"], - ["xpath=//div[2]/section[2]/summary-property/div/table/tbody/tr[2]/td", "xpath:position"], - ["xpath=//td[contains(.,'http://test.org/assert2')]", "xpath:innerText"] + ["css=.mb-4:nth-child(7) .py-2:nth-child(3) > .d-flex:nth-child(1) > .text-truncate", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section[7]/div/div[2]/object-property/array-property/div/div[3]/div/div[2]", "xpath:idRelative"], + ["xpath=//section[7]/div/div[2]/object-property/array-property/div/div[3]/div/div[2]", "xpath:position"] ], "value": "http://test.org/assert2" }, { "id": "e53030b6-f344-4361-981d-b8303a721c5d", "comment": "", "command": "assertText", - "target": "css=summary-property:nth-child(2) > .mb-3 > .list-unstyled > li:nth-child(5)", + "target": "css=array-property:nth-child(8) .border-0", "targets": [ - ["css=summary-property:nth-child(2) > .mb-3 > .list-unstyled > li:nth-child(5)", "css:finder"], - ["xpath=//li[5]", "xpath:position"], - ["xpath=//li[contains(.,'somethingElse')]", "xpath:innerText"] + ["css=array-property:nth-child(8) .border-0", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section[8]/div/div[2]/object-property/object-property/array-property/div/ul/li[5]", "xpath:idRelative"], + ["xpath=//section[8]/div/div[2]/object-property/object-property/array-property/div/ul/li[5]", "xpath:position"] ], "value": "somethingElse" }, { "id": "18636780-2feb-458f-97be-cf4a625b22e1", "comment": "", "command": "assertText", - "target": "css=summary-property:nth-child(10) .d-block:nth-child(2)", + "target": "css=.d-flex:nth-child(5) > .py-2 > span", "targets": [ - ["css=summary-property:nth-child(10) .d-block:nth-child(2)", "css:finder"], - ["xpath=//summary-property[10]/div/span", "xpath:position"] + ["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"] ], - "value": "true" + "value": "True" }, { "id": "1406d7e4-907d-4359-8de8-a40206f0993e", "comment": "", @@ -2090,56 +2092,6 @@ ["xpath=//section[8]/div/div[2]/object-property/array-property/div/div/div[3]/div/span", "xpath:position"] ], "value": "True" - }, { - "id": "cf6660cb-2086-452f-a5e5-ad64db784d92", - "comment": "", - "command": "click", - "target": "css=.btn:nth-child(4) > translate-i18n", - "targets": [ - ["css=.btn:nth-child(4) > translate-i18n", "css:finder"], - ["xpath=//div[@id='header']/button/translate-i18n", "xpath:idRelative"], - ["xpath=//div/button/translate-i18n", "xpath:position"], - ["xpath=//translate-i18n[contains(.,'Back to Top')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "6a183f25-1a9c-4774-a2cc-975a641ecef7", - "comment": "", - "command": "click", - "target": "css=.btn-link:nth-child(1) > translate-i18n", - "targets": [ - ["css=.btn-link:nth-child(1) > translate-i18n", "css:finder"], - ["xpath=//div[@id='navigation']/div/a/translate-i18n", "xpath:idRelative"], - ["xpath=//div/a/translate-i18n", "xpath:position"], - ["xpath=//translate-i18n[contains(.,'Version History')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "c0c0f9e1-af95-47b0-8aa8-ed141735d83b", - "comment": "", - "command": "click", - "target": "css=.breadcrumb-item > a", - "targets": [ - ["css=.breadcrumb-item > a", "css:finder"], - ["xpath=//a[contains(text(),'Dashboard')]", "xpath:link"], - ["xpath=(//a[contains(@href, '/dashboard')])[2]", "xpath:href"], - ["xpath=//ol/li/a", "xpath:position"] - ], - "value": "" - }, { - "id": "2536386b-315e-4b39-b9a7-badcfd0dfbb1", - "comment": "", - "command": "click", - "target": "linkText=Test Provider", - "targets": [ - ["linkText=Test Provider", "linkText"], - ["css=td > a", "css:finder"], - ["xpath=//a[contains(text(),'Test Provider')]", "xpath:link"], - ["xpath=//a[contains(@href, '/metadata/resolver/5916c370-370b-4fae-94c2-a9a9675ae95b/configuration/options')]", "xpath:href"], - ["xpath=//td/a", "xpath:position"], - ["xpath=//a[contains(.,'Test Provider')]", "xpath:innerText"] - ], - "value": "" }, { "id": "2c46cdcd-d5a5-47fe-aa7b-0120fd2fcfc9", "comment": "", @@ -2439,6 +2391,13 @@ ["xpath=//section[2]/div/div[2]/object-property/object-property/primitive-property/div/span[3]", "xpath:position"] ], "value": "Display Name" + }, { + "id": "c88d3154-c810-47cd-b8d8-48e705bad0f4", + "comment": "", + "command": "close", + "target": "", + "targets": [], + "value": "" }] }], "suites": [{ diff --git a/backend/src/integration/resources/SHIBUI-1334-2.side b/backend/src/integration/resources/SHIBUI-1334-2.side index 943053225..2327c2f22 100644 --- a/backend/src/integration/resources/SHIBUI-1334-2.side +++ b/backend/src/integration/resources/SHIBUI-1334-2.side @@ -1114,6 +1114,13 @@ ["xpath=//object-property/object-property/primitive-property[5]/div/span[2]", "xpath:position"] ], "value": "false" + }, { + "id": "a77b2cf6-c88d-458b-9421-2745634180a7", + "comment": "", + "command": "close", + "target": "", + "targets": [], + "value": "" }] }], "suites": [{ diff --git a/backend/src/integration/resources/SHIBUI-1335-1.side b/backend/src/integration/resources/SHIBUI-1335-1.side index 68908b777..3310e52e9 100644 --- a/backend/src/integration/resources/SHIBUI-1335-1.side +++ b/backend/src/integration/resources/SHIBUI-1335-1.side @@ -1693,6 +1693,13 @@ ["xpath=//td[contains(.,'Entity Attributes Filter')]", "xpath:innerText"] ], "value": "Entity Attributes Filter" + }, { + "id": "13133548-1a88-4cc0-a861-7481794c65e0", + "comment": "", + "command": "close", + "target": "", + "targets": [], + "value": "" }] }], "suites": [{ diff --git a/backend/src/integration/resources/SHIBUI-1335-2.side b/backend/src/integration/resources/SHIBUI-1335-2.side index a91a6a6d9..623d68b8d 100644 --- a/backend/src/integration/resources/SHIBUI-1335-2.side +++ b/backend/src/integration/resources/SHIBUI-1335-2.side @@ -790,6 +790,13 @@ ["xpath=//td[contains(.,'NameIDFormat')]", "xpath:innerText"] ], "value": "NameIDFormat" + }, { + "id": "d4c36d2c-c90e-45e6-ae49-a46b3c64a629", + "comment": "", + "command": "close", + "target": "", + "targets": [], + "value": "" }] }], "suites": [{ diff --git a/backend/src/integration/resources/SHIBUI-1335-3.side b/backend/src/integration/resources/SHIBUI-1335-3.side index b45dde65e..a656ec10a 100644 --- a/backend/src/integration/resources/SHIBUI-1335-3.side +++ b/backend/src/integration/resources/SHIBUI-1335-3.side @@ -936,6 +936,13 @@ ["xpath=//td[contains(.,'EntityAttributes')]", "xpath:innerText"] ], "value": "EntityAttributes" + }, { + "id": "3c9a53c4-b56a-4a4b-9fef-12951d198754", + "comment": "", + "command": "close", + "target": "", + "targets": [], + "value": "" }] }], "suites": [{ diff --git a/backend/src/integration/resources/SHIBUI-1335-4.side b/backend/src/integration/resources/SHIBUI-1335-4.side index 5a633603f..69a78cf98 100644 --- a/backend/src/integration/resources/SHIBUI-1335-4.side +++ b/backend/src/integration/resources/SHIBUI-1335-4.side @@ -1082,6 +1082,13 @@ ["xpath=//td[contains(.,'EntityAttributes')]", "xpath:innerText"] ], "value": "EntityAttributes" + }, { + "id": "f81a35eb-de1b-49ac-a9bb-b528393e9f9e", + "comment": "", + "command": "close", + "target": "", + "targets": [], + "value": "" }] }], "suites": [{ diff --git a/backend/src/integration/resources/SHIBUI-1352-1.side b/backend/src/integration/resources/SHIBUI-1352-1.side index bc65110d2..694cbdcce 100644 --- a/backend/src/integration/resources/SHIBUI-1352-1.side +++ b/backend/src/integration/resources/SHIBUI-1352-1.side @@ -448,6 +448,13 @@ ["xpath=//td[contains(.,'LocalDynamicMetadataResolver')]", "xpath:innerText"] ], "value": "LocalDynamicMetadataResolver" + }, { + "id": "0da0b69c-a807-4961-ad8d-ef5eb1ba667e", + "comment": "", + "command": "close", + "target": "", + "targets": [], + "value": "" }] }], "suites": [{ diff --git a/backend/src/integration/resources/SHIBUI-1352-2.side b/backend/src/integration/resources/SHIBUI-1352-2.side index d3cfbd098..97907af50 100644 --- a/backend/src/integration/resources/SHIBUI-1352-2.side +++ b/backend/src/integration/resources/SHIBUI-1352-2.side @@ -370,6 +370,13 @@ ["xpath=//td[contains(.,'FilesystemMetadataResolver')]", "xpath:innerText"] ], "value": "FilesystemMetadataResolver" + }, { + "id": "4ff97235-563b-4d71-80b7-a8b263aeb90b", + "comment": "", + "command": "close", + "target": "", + "targets": [], + "value": "" }] }], "suites": [{ diff --git a/backend/src/integration/resources/SHIBUI-1361.side b/backend/src/integration/resources/SHIBUI-1361.side index a406e46d7..b858d5c7d 100644 --- a/backend/src/integration/resources/SHIBUI-1361.side +++ b/backend/src/integration/resources/SHIBUI-1361.side @@ -81,9 +81,9 @@ ], "value": "" }, { - "id": "b49d6ed7-75ea-4be8-9a79-c7fd83287aa0", + "id": "55a876d6-70b7-46f6-aab1-7efacb79156f", "comment": "", - "command": "click", + "command": "waitForElementEditable", "target": "id=/name", "targets": [ ["id=/name", "id"], @@ -92,7 +92,7 @@ ["xpath=//input[@id='/name']", "xpath:attributes"], ["xpath=//input", "xpath:position"] ], - "value": "" + "value": "30000" }, { "id": "54dc29f7-bbe0-4c2b-a76e-e67a61f57a96", "comment": "", @@ -545,15 +545,25 @@ "id": "52f5680c-c63d-411e-8332-52901f12ea3b", "comment": "", "command": "assertText", - "target": "css=.px-3:nth-child(1) > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", - "targets": [], + "target": "css=.mb-4:nth-child(1) primitive-property:nth-child(1) .d-block:nth-child(2)", + "targets": [ + ["css=.mb-4:nth-child(1) primitive-property:nth-child(1) .d-block:nth-child(2)", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section/div/div[2]/object-property/primitive-property/div/div/span[2]", "xpath:idRelative"], + ["xpath=//div/span[2]", "xpath:position"], + ["xpath=//span[contains(.,'Test Metadata Provider')]", "xpath:innerText"] + ], "value": "Test Metadata Provider" }, { "id": "67ff44aa-1efd-4b13-a0e9-3648a09911dd", "comment": "", "command": "assertText", - "target": "css=.px-3:nth-child(2) > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", - "targets": [], + "target": "css=.mb-4:nth-child(2) primitive-property:nth-child(1) .d-block:nth-child(2)", + "targets": [ + ["css=.mb-4:nth-child(2) primitive-property:nth-child(1) .d-block:nth-child(2)", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section[2]/div/div[2]/object-property/primitive-property/div/div/span[2]", "xpath:idRelative"], + ["xpath=//section[2]/div/div[2]/object-property/primitive-property/div/div/span[2]", "xpath:position"], + ["xpath=//span[contains(.,'123')]", "xpath:innerText"] + ], "value": "123" }, { "id": "f5197d46-41a7-4ef2-ac40-19f80c953929", @@ -1287,6 +1297,13 @@ "target": "rightDateIsDate", "targets": [], "value": "true" + }, { + "id": "bc352f8a-9212-4985-80b8-19a3814b5bfd", + "comment": "", + "command": "close", + "target": "", + "targets": [], + "value": "" }] }], "suites": [{ diff --git a/backend/src/integration/resources/SHIBUI-1364-1.side b/backend/src/integration/resources/SHIBUI-1364-1.side index f1c036bef..4fe142717 100644 --- a/backend/src/integration/resources/SHIBUI-1364-1.side +++ b/backend/src/integration/resources/SHIBUI-1364-1.side @@ -2239,286 +2239,12 @@ ], "value": "Entity Attributes Filter" }, { - "id": "87839260-42a5-4723-a019-1501b38e55eb", + "id": "2c05cbfc-f828-426d-be90-eae484624ac0", "comment": "", - "command": "click", - "target": "css=.btn-link:nth-child(1) > translate-i18n", - "targets": [ - ["css=.btn-link:nth-child(1) > translate-i18n", "css:finder"], - ["xpath=//div/a/translate-i18n", "xpath:position"], - ["xpath=//translate-i18n[contains(.,'Version History')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "306714df-33c5-4dca-b472-62bb27f878f3", - "comment": "", - "command": "pause", - "target": "2000", - "targets": [], - "value": "" - }, { - "id": "32f233ad-56d9-4fa5-a7f2-0a4fd8680d02", - "comment": "", - "command": "click", - "target": "css=tr:nth-child(1) a", - "targets": [ - ["linkText=Oct 08, 2019 14:58:53 (Current)", "linkText"], - ["css=tr:nth-child(1) a", "css:finder"], - ["xpath=//a[contains(@href, '/metadata/provider/dbf6d635-e471-4fd5-88cf-0f6a7a079cae/configuration/options')]", "xpath:href"], - ["xpath=//td[2]/a", "xpath:position"], - ["xpath=//a[contains(.,'Oct 08, 2019 14:58:53 (Current)')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "c2ac09ea-aa32-40dc-9c90-f102695a1f6e", - "comment": "", - "command": "pause", - "target": "2000", - "targets": [], - "value": "" - }, { - "id": "b40ce0ac-c4cf-4030-8959-25bb7b6a1b3c", - "comment": "", - "command": "click", - "target": "css=.list-group-item:nth-child(2) > filter-configuration-list-item > .d-flex > .btn", - "targets": [ - ["css=.list-group-item:nth-child(2) > filter-configuration-list-item > .d-flex > .btn", "css:finder"], - ["xpath=//div[@id='filters']/filter-configuration-list/ul/li[2]/filter-configuration-list-item/div/button", "xpath:idRelative"], - ["xpath=//li[2]/filter-configuration-list-item/div/button", "xpath:position"], - ["xpath=//button[contains(.,'Name ID Format Filter')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "bcf8e94c-d3ab-4344-b35d-995f894b579c", - "comment": "", - "command": "click", - "target": "css=.justify-content-between > .btn:nth-child(1) > translate-i18n", - "targets": [ - ["css=.justify-content-between > .btn:nth-child(1) > translate-i18n", "css:finder"], - ["xpath=//div[@id='filters']/filter-configuration-list/ul/li[2]/filter-configuration-list-item/div[2]/div/div/a/translate-i18n", "xpath:idRelative"], - ["xpath=//div[2]/div/div/a/translate-i18n", "xpath:position"], - ["xpath=//translate-i18n[contains(.,'Edit')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "73988d26-fad7-427a-ab1d-fbdc85d81bd6", - "comment": "", - "command": "pause", - "target": "2000", - "targets": [], - "value": "" - }, { - "id": "54a2515c-9700-4c65-89fe-4df681ca28e5", - "comment": "", - "command": "type", - "target": "id=/nameIdFormatFilterTarget.target", - "targets": [ - ["id=/nameIdFormatFilterTarget.target", "id"], - ["css=#\\/nameIdFormatFilterTarget\\.target", "css:finder"], - ["xpath=//input[@id='/nameIdFormatFilterTarget.target']", "xpath:attributes"], - ["xpath=//div[@id='-container']/div/input", "xpath:idRelative"], - ["xpath=//auto-complete/div/div/input", "xpath:position"] - ], - "value": "Unicorn!" - }, { - "id": "97fdec77-172d-46f6-abdc-68626ef60f7a", - "comment": "", - "command": "click", - "target": "css=.btn-success:nth-child(1)", - "targets": [ - ["css=.btn-success:nth-child(1)", "css:finder"], - ["xpath=//div[2]/div/div[2]/button", "xpath:position"], - ["xpath=//button[contains(.,'Add Entity ID')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "7e9ceff8-2a30-471f-892f-863b3c279811", - "comment": "", - "command": "click", - "target": "css=.list-group-item:nth-child(1) > span > .btn > .fa", - "targets": [ - ["css=.list-group-item:nth-child(1) > span > .btn > .fa", "css:finder"], - ["xpath=//span/button/i", "xpath:position"] - ], - "value": "" - }, { - "id": "1cf36d6d-9520-42a4-9bca-6f620c1ced7c", - "comment": "", - "command": "click", - "target": "css=.fa-save", - "targets": [ - ["css=.fa-save", "css:finder"], - ["xpath=//div[2]/button/i", "xpath:position"] - ], - "value": "" - }, { - "id": "368b3555-078b-4b00-8d3a-9b91d3081077", - "comment": "", - "command": "pause", - "target": "2000", - "targets": [], - "value": "" - }, { - "id": "d47a996b-531e-4947-9c58-690fb268c09c", - "comment": "", - "command": "click", - "target": "css=.nav-item translate-i18n", - "targets": [ - ["css=.nav-item translate-i18n", "css:finder"], - ["xpath=//div[@id='navbar']/ul/li[2]/a/translate-i18n", "xpath:idRelative"], - ["xpath=//a/translate-i18n", "xpath:position"], - ["xpath=//translate-i18n[contains(.,'Dashboard')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "afe98f72-3807-479c-ab27-85625744a6e5", - "comment": "", - "command": "pause", - "target": "2000", + "command": "close", + "target": "", "targets": [], "value": "" - }, { - "id": "ff74de1c-b63b-474d-8e25-b73cd86f0a1c", - "comment": "", - "command": "click", - "target": "linkText=Metadata Providers", - "targets": [ - ["linkText=Metadata Providers", "linkText"], - ["css=.nav > .nav-item:nth-child(2) > .nav-link", "css:finder"], - ["xpath=//a[contains(text(),'Metadata Providers')]", "xpath:link"], - ["xpath=//a[contains(@href, '/dashboard/metadata/manager/providers')]", "xpath:href"], - ["xpath=//dashboard-page/div/ul/li[2]/a", "xpath:position"], - ["xpath=//a[contains(.,'Metadata Providers')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "d49b1837-dc58-4fe1-8c11-02d1ef5d0a8c", - "comment": "", - "command": "click", - "target": "linkText=Provider Version 2", - "targets": [ - ["linkText=Provider Version 2", "linkText"], - ["css=td > a", "css:finder"], - ["xpath=//a[contains(text(),'Provider Version 2')]", "xpath:link"], - ["xpath=//a[contains(@href, '/metadata/provider/dbf6d635-e471-4fd5-88cf-0f6a7a079cae/configuration/options')]", "xpath:href"], - ["xpath=//td[2]/a", "xpath:position"], - ["xpath=//a[contains(.,'Provider Version 2')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "61010061-35cb-4a3b-ae76-6ec587320f7f", - "comment": "", - "command": "pause", - "target": "2000", - "targets": [], - "value": "" - }, { - "id": "0f5e58f5-4a71-4f1e-95a6-9c0b44981103", - "comment": "", - "command": "click", - "target": "css=.btn-link:nth-child(1) > translate-i18n", - "targets": [ - ["css=.btn-link:nth-child(1) > translate-i18n", "css:finder"], - ["xpath=//div[@id='navigation']/div/a/translate-i18n", "xpath:idRelative"], - ["xpath=//div/a/translate-i18n", "xpath:position"], - ["xpath=//translate-i18n[contains(.,'Version History')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "1bc947ab-a568-4f12-adcb-e52167e415ab", - "comment": "", - "command": "pause", - "target": "2000", - "targets": [], - "value": "" - }, { - "id": "702fdc80-3a00-4318-a1c0-fd0309e2f164", - "comment": "", - "command": "click", - "target": "css=tr:nth-child(1) .custom-control-label", - "targets": [ - ["css=tr:nth-child(1) .custom-control-label", "css:finder"], - ["xpath=//label", "xpath:position"], - ["xpath=//label[contains(.,'Check to select')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "b329a224-aaa5-4366-92a6-ffa7d197c0a1", - "comment": "", - "command": "click", - "target": "css=tr:nth-child(2) .custom-control", - "targets": [ - ["css=tr:nth-child(2) .custom-control", "css:finder"], - ["xpath=//tr[2]/td/div", "xpath:position"] - ], - "value": "" - }, { - "id": "962c5809-1282-4224-b121-4764396f9e2d", - "comment": "", - "command": "click", - "target": "css=.btn-primary", - "targets": [ - ["css=.btn-primary", "css:finder"], - ["xpath=//history-list/button", "xpath:position"], - ["xpath=//button[contains(.,'Compare Selected(2)')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "54739168-122e-4059-87db-8a1eaf80f4ca", - "comment": "", - "command": "pause", - "target": "2000", - "targets": [], - "value": "" - }, { - "id": "7aa22e3a-e1f2-48dc-ae1c-a2c7df992769", - "comment": "", - "command": "click", - "target": "css=.d-flex:nth-child(2) > .border-primary:nth-child(2) .fa", - "targets": [ - ["css=.d-flex:nth-child(2) > .border-primary:nth-child(2) .fa", "css:finder"], - ["xpath=//div[2]/div[2]/div/button/i", "xpath:position"] - ], - "value": "" - }, { - "id": "fd4ba7b3-1d29-41e7-8a35-6f2f7986494a", - "comment": "", - "command": "pause", - "target": "2000", - "targets": [], - "value": "" - }, { - "id": "800232b8-11ec-4b9d-900b-9247efb3d3b0", - "comment": "", - "command": "click", - "target": "css=.btn-primary > translate-i18n", - "targets": [ - ["css=.btn-primary > translate-i18n", "css:finder"], - ["xpath=//div[3]/button/translate-i18n", "xpath:position"], - ["xpath=//translate-i18n[contains(.,'Compare Selected')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "f9f01654-e702-4f6d-8a5c-70e4a6991868", - "comment": "", - "command": "assertText", - "target": "css=.list-unstyled:nth-child(3) > .border-0:nth-child(1)", - "targets": [ - ["css=.list-unstyled:nth-child(3) > .border-0:nth-child(1)", "css:finder"], - ["xpath=//div/div/ul/li", "xpath:position"], - ["xpath=//li[contains(.,'Unicorn!')]", "xpath:innerText"] - ], - "value": "Unicorn!" - }, { - "id": "aa77793c-31b4-4a53-bad0-56d1b0b137a1", - "comment": "", - "command": "assertText", - "target": "css=.list-unstyled:nth-child(4) > .text-truncate", - "targets": [ - ["css=.list-unstyled:nth-child(4) > .text-truncate", "css:finder"], - ["xpath=//ul[2]/li", "xpath:position"] - ], - "value": " https://idp.unicon.net/idp/shibboleth" }] }], "suites": [{ @@ -2531,4 +2257,4 @@ }], "urls": ["http://localhost:10101/"], "plugins": [] -} \ No newline at end of file +} diff --git a/backend/src/integration/resources/SHIBUI-1364-2.side b/backend/src/integration/resources/SHIBUI-1364-2.side index 5da65f6ef..56a2515eb 100644 --- a/backend/src/integration/resources/SHIBUI-1364-2.side +++ b/backend/src/integration/resources/SHIBUI-1364-2.side @@ -1239,6 +1239,13 @@ ["xpath=//section[2]/div/div[2]/object-property/primitive-property/div/div/span[3]", "xpath:position"] ], "value": "Name ID Filter" + }, { + "id": "5a4e74b2-fe33-462a-9739-37b2ffb099f0", + "comment": "", + "command": "close", + "target": "", + "targets": [], + "value": "" }] }], "suites": [{ diff --git a/backend/src/integration/resources/SHIBUI-1364-3.side b/backend/src/integration/resources/SHIBUI-1364-3.side index 25e9f3990..9f00ce132 100644 --- a/backend/src/integration/resources/SHIBUI-1364-3.side +++ b/backend/src/integration/resources/SHIBUI-1364-3.side @@ -877,7 +877,7 @@ "id": "455e24c1-5093-4da3-a62d-457bbf0cd5db", "comment": "", "command": "pause", - "target": "2000", + "target": "5000", "targets": [], "value": "" }, { @@ -1456,6 +1456,13 @@ ["xpath=//section[2]/div/div[2]/object-property/primitive-property/div/div/span[3]", "xpath:position"] ], "value": "Entity Attributes Filter" + }, { + "id": "5bf7126d-9dfb-4b97-8685-fd00778423eb", + "comment": "", + "command": "close", + "target": "", + "targets": [], + "value": "" }] }], "suites": [{ diff --git a/backend/src/integration/resources/SHIBUI-1364-4.side b/backend/src/integration/resources/SHIBUI-1364-4.side index 8cfaf83c4..2337548e7 100644 --- a/backend/src/integration/resources/SHIBUI-1364-4.side +++ b/backend/src/integration/resources/SHIBUI-1364-4.side @@ -1020,68 +1020,12 @@ ], "value": "" }, { - "id": "f79371b5-0081-45a0-bfb3-c403db903043", + "id": "f967bc76-becf-4cf1-a2a1-11a9d7c9be49", "comment": "", - "command": "pause", - "target": "2000", - "targets": [], - "value": "" - }, { - "id": "a8ed628c-53f7-4551-9ce8-fef976cc96ce", - "comment": "", - "command": "click", - "target": "css=tr:nth-child(1) .fa-arrow-circle-down", - "targets": [ - ["css=tr:nth-child(1) .fa-arrow-circle-down", "css:finder"], - ["xpath=//button[2]/i", "xpath:position"] - ], - "value": "" - }, { - "id": "6b3ec8f1-8b9a-40f5-816f-3a1e415b9d8d", - "comment": "", - "command": "pause", - "target": "2000", - "targets": [], - "value": "" - }, { - "id": "be805934-2692-4a1c-a28f-afb3cc4eb5f4", - "comment": "", - "command": "assertText", + "command": "waitForElementVisible", "target": "css=tr:nth-child(1) > .td-lg:nth-child(4)", - "targets": [ - ["css=tr:nth-child(1) > .td-lg:nth-child(4)", "css:finder"], - ["xpath=//td[4]", "xpath:position"], - ["xpath=//td[contains(.,'NameIDFormat')]", "xpath:innerText"] - ], - "value": "NameIDFormat" - }, { - "id": "039aff93-c0de-40fb-a1c9-e22ffbf7e1da", - "comment": "", - "command": "click", - "target": "css=tr:nth-child(1) .fa-arrow-circle-down", - "targets": [ - ["css=tr:nth-child(1) .fa-arrow-circle-down", "css:finder"], - ["xpath=//button[2]/i", "xpath:position"] - ], - "value": "" - }, { - "id": "403570ff-e1f0-4db9-925f-f90c5994b60e", - "comment": "", - "command": "pause", - "target": "2000", "targets": [], - "value": "" - }, { - "id": "8f2da627-e8ad-473a-a71a-bec5dd1f0999", - "comment": "", - "command": "assertText", - "target": "css=tr:nth-child(1) > .td-lg:nth-child(4)", - "targets": [ - ["css=tr:nth-child(1) > .td-lg:nth-child(4)", "css:finder"], - ["xpath=//td[4]", "xpath:position"], - ["xpath=//td[contains(.,'EntityAttributes')]", "xpath:innerText"] - ], - "value": "EntityAttributes" + "value": "30000" }, { "id": "56e4a69d-0fcd-4d50-82c6-6716af892e39", "comment": "", @@ -1111,15 +1055,15 @@ }, { "id": "4025491d-ad25-4b49-879a-af34ebd9ca7a", "comment": "", - "command": "pause", - "target": "2000", + "command": "waitForElementVisible", + "target": "css=td > a", "targets": [], - "value": "" + "value": "30000" }, { "id": "e28ed34b-a0bd-4339-844c-454835619d65", "comment": "", "command": "click", - "target": "linkText=Dynamic Http Metadata Provider", + "target": "css=td > a", "targets": [ ["linkText=Dynamic Http Metadata Provider", "linkText"], ["css=td > a", "css:finder"], @@ -1155,6 +1099,13 @@ "target": "2000", "targets": [], "value": "" + }, { + "id": "c82354e7-3041-4b44-952a-a654510d0069", + "comment": "", + "command": "waitForElementVisible", + "target": "id=/name", + "targets": [], + "value": "30000" }, { "id": "9e520768-e930-483e-b078-c39be294438f", "comment": "", @@ -1285,6 +1236,13 @@ "target": "2000", "targets": [], "value": "" + }, { + "id": "f2dd5a70-a30f-4011-a3f5-cb0862c76edb", + "comment": "", + "command": "waitForElementVisible", + "target": "css=.bg-diff > .d-block:nth-child(2)", + "targets": [], + "value": "30000" }, { "id": "678221bc-06e0-4aa3-884f-e56d8418f1b9", "comment": "", @@ -1366,12 +1324,12 @@ ], "value": "" }, { - "id": "74e14851-7254-4d18-8a33-e81af5b0b08f", + "id": "2457e1c1-6ff5-4839-bdb4-311aadc87b78", "comment": "", - "command": "pause", - "target": "2000", + "command": "waitForElementVisible", + "target": "id=/name", "targets": [], - "value": "" + "value": "30000" }, { "id": "4600a21d-e332-4d99-8903-691a6126722f", "comment": "", @@ -1557,6 +1515,13 @@ ["xpath=//section[2]/div/div[2]/object-property/primitive-property/div/div/span[3]", "xpath:position"] ], "value": "Entity Attributes Filter" + }, { + "id": "3f618724-2825-4ebe-97d5-038a67a23e9b", + "comment": "", + "command": "close", + "target": "", + "targets": [], + "value": "" }] }], "suites": [{ diff --git a/backend/src/integration/resources/SHIBUI-1385-1.side b/backend/src/integration/resources/SHIBUI-1385-1.side index af7a78773..d71c551c7 100644 --- a/backend/src/integration/resources/SHIBUI-1385-1.side +++ b/backend/src/integration/resources/SHIBUI-1385-1.side @@ -1775,10 +1775,11 @@ "id": "3baa7bd3-55c0-4d10-8aa3-c0daa63ec4d4", "comment": "", "command": "assertText", - "target": "css=.px-3 > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", + "target": "css=.d-block > primitive-property:nth-child(1) .text-truncate", "targets": [ - ["css=.px-3 > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", "css:finder"], - ["xpath=//summary-property/div/span", "xpath:position"], + ["css=.d-block > primitive-property:nth-child(1) .text-truncate", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section/div/div[2]/object-property/primitive-property/div/div/span[2]", "xpath:idRelative"], + ["xpath=//div/span[2]", "xpath:position"], ["xpath=//span[contains(.,'test-1234')]", "xpath:innerText"] ], "value": "test-1234" @@ -1786,34 +1787,35 @@ "id": "0d355ff0-0449-49a7-ae75-14d7c405b97c", "comment": "", "command": "assertText", - "target": "css=.px-3:nth-child(2) > summary-property:nth-child(2) tr:nth-child(2) > td:nth-child(1)", + "target": "css=.mb-4:nth-child(7) .py-2:nth-child(3) > .d-flex:nth-child(1) > .text-truncate", "targets": [ - ["css=.px-3:nth-child(2) > summary-property:nth-child(2) tr:nth-child(2) > td:nth-child(1)", "css:finder"], - ["xpath=//div[2]/section[2]/summary-property/div/table/tbody/tr[2]/td", "xpath:position"], - ["xpath=//td[contains(.,'http://test.org/assert2')]", "xpath:innerText"] + ["css=.mb-4:nth-child(7) .py-2:nth-child(3) > .d-flex:nth-child(1) > .text-truncate", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section[7]/div/div[2]/object-property/array-property/div/div[3]/div/div[2]", "xpath:idRelative"], + ["xpath=//section[7]/div/div[2]/object-property/array-property/div/div[3]/div/div[2]", "xpath:position"] ], "value": "http://test.org/assert2" }, { "id": "e53030b6-f344-4361-981d-b8303a721c5d", "comment": "", "command": "assertText", - "target": "css=summary-property:nth-child(2) > .mb-3 > .list-unstyled > li:nth-child(5)", + "target": "css=array-property:nth-child(8) .border-0", "targets": [ - ["css=summary-property:nth-child(2) > .mb-3 > .list-unstyled > li:nth-child(5)", "css:finder"], - ["xpath=//li[5]", "xpath:position"], - ["xpath=//li[contains(.,'somethingElse')]", "xpath:innerText"] + ["css=array-property:nth-child(8) .border-0", "css:finder"], + ["xpath=//metadata-configuration[@id='configuration']/div/section[8]/div/div[2]/object-property/object-property/array-property/div/ul/li[5]", "xpath:idRelative"], + ["xpath=//section[8]/div/div[2]/object-property/object-property/array-property/div/ul/li[5]", "xpath:position"] ], "value": "somethingElse" }, { "id": "18636780-2feb-458f-97be-cf4a625b22e1", "comment": "", "command": "assertText", - "target": "css=summary-property:nth-child(10) .d-block:nth-child(2)", + "target": "css=.d-flex:nth-child(5) > .py-2 > span", "targets": [ - ["css=summary-property:nth-child(10) .d-block:nth-child(2)", "css:finder"], - ["xpath=//summary-property[10]/div/span", "xpath:position"] + ["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"] ], - "value": "true" + "value": "True" }, { "id": "1406d7e4-907d-4359-8de8-a40206f0993e", "comment": "", @@ -2052,13 +2054,6 @@ ["xpath=//section[4]/div/div[2]/object-property/array-property/div/div[3]/div/div[2]", "xpath:position"] ], "value": "http://test.org/logout2" - }, { - "id": "e1cba732-dd34-4c73-9d4c-89c440975dd8", - "comment": "", - "command": "runScript", - "target": "window.scrollTo(0,2060)", - "targets": [], - "value": "" }, { "id": "fe47ffd2-d2a0-4264-90fe-31b998f81ac2", "comment": "", @@ -2104,56 +2099,6 @@ ["xpath=//section[8]/div/div[2]/object-property/array-property/div/div/div[3]/div/span", "xpath:position"] ], "value": "True" - }, { - "id": "cf6660cb-2086-452f-a5e5-ad64db784d92", - "comment": "", - "command": "click", - "target": "css=.btn:nth-child(4) > translate-i18n", - "targets": [ - ["css=.btn:nth-child(4) > translate-i18n", "css:finder"], - ["xpath=//div[@id='header']/button/translate-i18n", "xpath:idRelative"], - ["xpath=//div/button/translate-i18n", "xpath:position"], - ["xpath=//translate-i18n[contains(.,'Back to Top')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "6a183f25-1a9c-4774-a2cc-975a641ecef7", - "comment": "", - "command": "click", - "target": "css=.btn-link:nth-child(1) > translate-i18n", - "targets": [ - ["css=.btn-link:nth-child(1) > translate-i18n", "css:finder"], - ["xpath=//div[@id='navigation']/div/a/translate-i18n", "xpath:idRelative"], - ["xpath=//div/a/translate-i18n", "xpath:position"], - ["xpath=//translate-i18n[contains(.,'Version History')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "c0c0f9e1-af95-47b0-8aa8-ed141735d83b", - "comment": "", - "command": "click", - "target": "css=.breadcrumb-item > a", - "targets": [ - ["css=.breadcrumb-item > a", "css:finder"], - ["xpath=//a[contains(text(),'Dashboard')]", "xpath:link"], - ["xpath=(//a[contains(@href, '/dashboard')])[2]", "xpath:href"], - ["xpath=//ol/li/a", "xpath:position"] - ], - "value": "" - }, { - "id": "2536386b-315e-4b39-b9a7-badcfd0dfbb1", - "comment": "", - "command": "click", - "target": "linkText=Test Provider", - "targets": [ - ["linkText=Test Provider", "linkText"], - ["css=td > a", "css:finder"], - ["xpath=//a[contains(text(),'Test Provider')]", "xpath:link"], - ["xpath=//a[contains(@href, '/metadata/resolver/5916c370-370b-4fae-94c2-a9a9675ae95b/configuration/options')]", "xpath:href"], - ["xpath=//td/a", "xpath:position"], - ["xpath=//a[contains(.,'Test Provider')]", "xpath:innerText"] - ], - "value": "" }, { "id": "2c46cdcd-d5a5-47fe-aa7b-0120fd2fcfc9", "comment": "", @@ -2600,6 +2545,13 @@ ["xpath=//section[2]/div/div[2]/object-property/object-property/primitive-property/div/span[3]", "xpath:position"] ], "value": "Display Name" + }, { + "id": "dd9d3cb6-e895-4fcb-ae5e-c6da258a65a5", + "comment": "", + "command": "close", + "target": "", + "targets": [], + "value": "" }] }], "suites": [{ diff --git a/backend/src/integration/resources/SHIBUI-1385-2.side b/backend/src/integration/resources/SHIBUI-1385-2.side index 58b330239..923bb61c8 100644 --- a/backend/src/integration/resources/SHIBUI-1385-2.side +++ b/backend/src/integration/resources/SHIBUI-1385-2.side @@ -1313,6 +1313,13 @@ ["xpath=//span[3]", "xpath:position"] ], "value": "Test Metadata Provider" + }, { + "id": "03d7493c-75c4-4923-8330-686b12ff7a5b", + "comment": "", + "command": "close", + "target": "", + "targets": [], + "value": "" }] }], "suites": [{ diff --git a/backend/src/integration/resources/SHIBUI-1391.side b/backend/src/integration/resources/SHIBUI-1391.side index 37a0957aa..77aef6107 100644 --- a/backend/src/integration/resources/SHIBUI-1391.side +++ b/backend/src/integration/resources/SHIBUI-1391.side @@ -580,20 +580,6 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" - }, { - "id": "12673aa7-fc4e-4877-9842-a9d88dbc2d97", - "comment": "", - "command": "click", - "target": "linkText=File Backed HTTP Metadata Provider", - "targets": [ - ["linkText=File Backed HTTP Metadata Provider", "linkText"], - ["css=td > a", "css:finder"], - ["xpath=//a[contains(text(),'File Backed HTTP Metadata Provider')]", "xpath:link"], - ["xpath=//a[contains(@href, '/metadata/provider/da22a0b7-40d7-418c-bbe9-7ba4c37d3905/configuration/options')]", "xpath:href"], - ["xpath=//td[2]/a", "xpath:position"], - ["xpath=//a[contains(.,'File Backed HTTP Metadata Provider')]", "xpath:innerText"] - ], - "value": "" }, { "id": "daa2d46a-d238-4a48-aca7-0f34c9b93d5f", "comment": "", @@ -755,6 +741,13 @@ ["xpath=//div/div/input", "xpath:position"] ], "value": ".*" + }, { + "id": "f9d3ccc6-65d1-46dd-9d05-2d1bd74cc89e", + "comment": "", + "command": "close", + "target": "", + "targets": [], + "value": "" }] }], "suites": [{ diff --git a/backend/src/integration/resources/SHIBUI-1392.side b/backend/src/integration/resources/SHIBUI-1392.side index ec421765b..e47d8541f 100644 --- a/backend/src/integration/resources/SHIBUI-1392.side +++ b/backend/src/integration/resources/SHIBUI-1392.side @@ -478,6 +478,13 @@ ["xpath=//p[contains(.,'eval(true)')]", "xpath:innerText"] ], "value": "eval(true);" + }, { + "id": "29f454bc-2f1d-44b4-b9f9-fb390b2eddb2", + "comment": "", + "command": "close", + "target": "", + "targets": [], + "value": "" }] }], "suites": [{ diff --git a/backend/src/integration/resources/SHIBUI-1407-1.side b/backend/src/integration/resources/SHIBUI-1407-1.side index be28bbb23..fed3a2774 100644 --- a/backend/src/integration/resources/SHIBUI-1407-1.side +++ b/backend/src/integration/resources/SHIBUI-1407-1.side @@ -2094,70 +2094,6 @@ ["xpath=//section[8]/div/div[2]/object-property/array-property/div/div/div[3]/div/span", "xpath:position"] ], "value": "True" - }, { - "id": "cf6660cb-2086-452f-a5e5-ad64db784d92", - "comment": "", - "command": "click", - "target": "css=.btn:nth-child(4) > translate-i18n", - "targets": [ - ["css=.btn:nth-child(4) > translate-i18n", "css:finder"], - ["xpath=//div[@id='header']/button/translate-i18n", "xpath:idRelative"], - ["xpath=//div/button/translate-i18n", "xpath:position"], - ["xpath=//translate-i18n[contains(.,'Back to Top')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "6a183f25-1a9c-4774-a2cc-975a641ecef7", - "comment": "", - "command": "click", - "target": "css=.btn-link:nth-child(1) > translate-i18n", - "targets": [ - ["css=.btn-link:nth-child(1) > translate-i18n", "css:finder"], - ["xpath=//div[@id='navigation']/div/a/translate-i18n", "xpath:idRelative"], - ["xpath=//div/a/translate-i18n", "xpath:position"], - ["xpath=//translate-i18n[contains(.,'Version History')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "c0c0f9e1-af95-47b0-8aa8-ed141735d83b", - "comment": "", - "command": "click", - "target": "css=.breadcrumb-item > a", - "targets": [ - ["css=.breadcrumb-item > a", "css:finder"], - ["xpath=//a[contains(text(),'Dashboard')]", "xpath:link"], - ["xpath=(//a[contains(@href, '/dashboard')])[2]", "xpath:href"], - ["xpath=//ol/li/a", "xpath:position"] - ], - "value": "" - }, { - "id": "1a194216-9305-4151-a8d8-42a586ae8e47", - "comment": "", - "command": "pause", - "target": "3000", - "targets": [], - "value": "" - }, { - "id": "2536386b-315e-4b39-b9a7-badcfd0dfbb1", - "comment": "", - "command": "click", - "target": "linkText=Test Provider", - "targets": [ - ["linkText=Test Provider", "linkText"], - ["css=td > a", "css:finder"], - ["xpath=//a[contains(text(),'Test Provider')]", "xpath:link"], - ["xpath=//a[contains(@href, '/metadata/resolver/5916c370-370b-4fae-94c2-a9a9675ae95b/configuration/options')]", "xpath:href"], - ["xpath=//td/a", "xpath:position"], - ["xpath=//a[contains(.,'Test Provider')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "b5140c25-a360-42d2-b2c4-b90143b0d8b5", - "comment": "", - "command": "pause", - "target": "3000", - "targets": [], - "value": "" }, { "id": "2c46cdcd-d5a5-47fe-aa7b-0120fd2fcfc9", "comment": "", @@ -2428,6 +2364,13 @@ "target": "isPresent", "targets": [], "value": "true" + }, { + "id": "e901a20e-75e9-4f0d-abfc-f1fe8cf453b8", + "comment": "", + "command": "close", + "target": "", + "targets": [], + "value": "" }] }], "suites": [{ diff --git a/backend/src/integration/resources/SHIBUI-1407-2.side b/backend/src/integration/resources/SHIBUI-1407-2.side index 238e73c0a..55879b8e0 100644 --- a/backend/src/integration/resources/SHIBUI-1407-2.side +++ b/backend/src/integration/resources/SHIBUI-1407-2.side @@ -918,6 +918,13 @@ "target": "isDiff", "targets": [], "value": "true" + }, { + "id": "a0305827-1856-48c6-b02c-96c43da6241f", + "comment": "", + "command": "close", + "target": "", + "targets": [], + "value": "" }] }], "suites": [{ diff --git a/backend/src/integration/resources/SHIBUI-950.side b/backend/src/integration/resources/SHIBUI-950.side index f37692052..7eb184198 100644 --- a/backend/src/integration/resources/SHIBUI-950.side +++ b/backend/src/integration/resources/SHIBUI-950.side @@ -163,6 +163,13 @@ ["xpath=//td[contains(.,'https://wiki.shibboleth.net/shibboleth')]", "xpath:innerText"] ], "value": "https://wiki.shibboleth.net/shibboleth" + }, { + "id": "c5bfb51f-fd8e-4518-880d-2735077baebb", + "comment": "", + "command": "close", + "target": "", + "targets": [], + "value": "" }] }], "suites": [{ @@ -175,4 +182,4 @@ }], "urls": ["http://localhost:10101/"], "plugins": [] -} +} \ No newline at end of file