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 6826cd06d..a579a0543 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 @@ -106,20 +106,20 @@ class SeleniumSIDETest extends Specification { // 'Create and Delete Name ID Format Regex Filter' | '/CreateAndDeleteNameIDFormatRegexFilter.side' // 'Create and Delete Name ID Format Script Filter' | '/CreateAndDeleteNameIDFormatScriptFilter.side' // 'Create and Modify Filter Order' | '/ModifyFilterOrder.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-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 Filters' | '/SHIBUI-1335-2.side' -// 'SHIBUI-1335: Verify Local Dynamic Metadata Provider Filters' | '/SHIBUI-1335-3.side' -// 'SHIBUI-1335: Verify Dynamic HTTP Metadata Provider Filters' | '/SHIBUI-1335-4.side' -// 'SHIBUI-1392: Verify provider with script filter is persistable' | '/SHIBUI-1392.side' -// 'SHIBUI-1361: Verify dates display in proper format' | '/SHIBUI-1361.side' + 'SHIBUI-1334: Verify metadata provider versioning' | '/SHIBUI-1334-2.side' + 'SHIBUI-1335: Verify File Backed HTTP Metadata Provider Filters' | '/SHIBUI-1335-1.side' + 'SHIBUI-1335: Verify Filesystem Metadata Provider Filters' | '/SHIBUI-1335-2.side' + 'SHIBUI-1335: Verify Local Dynamic Metadata Provider Filters' | '/SHIBUI-1335-3.side' + 'SHIBUI-1335: Verify Dynamic HTTP Metadata Provider Filters' | '/SHIBUI-1335-4.side' + 'SHIBUI-1392: Verify provider with script filter is persistable' | '/SHIBUI-1392.side' + 'SHIBUI-1361: Verify dates display in proper format' | '/SHIBUI-1361.side' } } diff --git a/backend/src/integration/resources/SHIBUI-1334-1.side b/backend/src/integration/resources/SHIBUI-1334-1.side index d19bef702..8c4ed0437 100644 --- a/backend/src/integration/resources/SHIBUI-1334-1.side +++ b/backend/src/integration/resources/SHIBUI-1334-1.side @@ -2219,7 +2219,7 @@ "id": "c2d29077-30c4-45cf-81c9-b5790294e11e", "comment": "", "command": "click", - "target": "css=.btn-info > translate-i18n", + "target": "css=.btn-info", "targets": [ ["css=.btn-info > translate-i18n", "css:finder"], ["xpath=//div[2]/button/translate-i18n", "xpath:position"], @@ -2230,7 +2230,7 @@ "id": "f2e3d420-5cf5-4165-94da-41688839cf82", "comment": "", "command": "click", - "target": "css=.btn-link:nth-child(1) > translate-i18n", + "target": "css=.btn-link:nth-child(1)", "targets": [ ["css=.btn-link:nth-child(1) > translate-i18n", "css:finder"], ["xpath=//div[@id='navigation']/div/a/translate-i18n", "xpath:idRelative"], @@ -2253,7 +2253,7 @@ "id": "68972f7d-8268-4701-865c-585a39987208", "comment": "", "command": "click", - "target": "css=tr:nth-child(2) .custom-control-label", + "target": "css=tr:nth-child(3) .custom-control-label", "targets": [ ["css=tr:nth-child(2) .custom-control-label", "css:finder"], ["xpath=//tr[2]/td/div/label", "xpath:position"] @@ -2270,6 +2270,13 @@ ["xpath=//button[contains(.,'Compare Selected(2)')]", "xpath:innerText"] ], "value": "" + }, { + "id": "98aafaee-a430-4a2d-9aa5-b4c9ce0c4908", + "comment": "", + "command": "waitForElementVisible", + "target": "css=.mb-4:nth-child(2) primitive-property:nth-child(1) .d-block:nth-child(2)", + "targets": [], + "value": "10000" }, { "id": "5a976e2c-dc5f-4021-9cc6-3cad12e771ea", "comment": "", diff --git a/backend/src/integration/resources/SHIBUI-1334-2.side b/backend/src/integration/resources/SHIBUI-1334-2.side index 8451fc9ea..555b73c93 100644 --- a/backend/src/integration/resources/SHIBUI-1334-2.side +++ b/backend/src/integration/resources/SHIBUI-1334-2.side @@ -585,10 +585,10 @@ }, { "id": "5636ef67-71fb-4bca-ba58-7ecf926c7bf0", "comment": "", - "command": "waitForElementEditable", - "target": "id=/xmlId", + "command": "pause", + "target": "5000", "targets": [], - "value": "10000" + "value": "" }, { "id": "7d641e58-47ce-4d20-908c-e0002ff73cfa", "comment": "", @@ -601,14 +601,14 @@ ["xpath=//input[@id='/xmlId']", "xpath:attributes"], ["xpath=//custom-string/div/input", "xpath:position"] ], - "value": "123 v2" + "value": "123 version 2" }, { "id": "b78c81e9-41ac-41db-837a-0db6bd4f77eb", "comment": "", - "command": "waitForElementEditable", - "target": "id=/satisfyAnyPredicates.false", + "command": "pause", + "target": "5000", "targets": [], - "value": "10000" + "value": "" }, { "id": "247b04c1-e690-42bc-ae15-dfbedb44d2e9", "comment": "", @@ -714,7 +714,7 @@ ["xpath=//primitive-property[4]/div/span[2]", "xpath:position"], ["xpath=//span[contains(.,'123 v2')]", "xpath:innerText"] ], - "value": "123 v2" + "value": "123 version 2" }, { "id": "a13198b9-7827-47e2-ade3-143b981d34ee", "comment": "", @@ -797,24 +797,11 @@ ], "value": "" }, { - "id": "863e9f5e-a3d6-47e9-8b65-de639029812a", + "id": "270a048e-b903-4bc1-b95b-06ffbdef99de", "comment": "", - "command": "waitForElementVisible", - "target": "css=#\\/httpMetadataResolverAttributes\\/connectionRequestTimeout-container .btn", + "command": "pause", + "target": "3000", "targets": [], - "value": "10000" - }, { - "id": "78967fb5-8f61-46ce-9c14-9b6ceb12b03a", - "comment": "", - "command": "click", - "target": "css=#\\/httpMetadataResolverAttributes\\/connectionRequestTimeout-container .btn", - "targets": [ - ["css=#\\/httpMetadataResolverAttributes\\/connectionRequestTimeout-container .btn", "css:finder"], - ["xpath=(//button[@type='button'])[2]", "xpath:attributes"], - ["xpath=//div[@id='/httpMetadataResolverAttributes/connectionRequestTimeout-container']/div/div/button", "xpath:idRelative"], - ["xpath=//auto-complete/div/div/div/button", "xpath:position"], - ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] - ], "value": "" }, { "id": "1cde012c-d521-4fd5-a7d5-7a680bba0e7b", @@ -828,7 +815,14 @@ ], "value": "" }, { - "id": "d00ecf98-7425-467c-acbb-3b39918e3462", + "id": "863e9f5e-a3d6-47e9-8b65-de639029812a", + "comment": "", + "command": "waitForElementVisible", + "target": "css=#\\/httpMetadataResolverAttributes\\/connectionRequestTimeout-container .btn", + "targets": [], + "value": "10000" + }, { + "id": "78967fb5-8f61-46ce-9c14-9b6ceb12b03a", "comment": "", "command": "click", "target": "css=#\\/httpMetadataResolverAttributes\\/connectionRequestTimeout-container .btn", @@ -936,6 +930,13 @@ ["xpath=//button[contains(.,'Save')]", "xpath:innerText"] ], "value": "" + }, { + "id": "c3ad6c24-736a-492a-8952-b368e123d8e1", + "comment": "", + "command": "waitForElementVisible", + "target": "linkText=Test Metadata Provider", + "targets": [], + "value": "10000" }, { "id": "8868c054-2e6a-403e-ba2b-499a56730d71", "comment": "", @@ -954,7 +955,7 @@ "id": "0092cd5c-a885-4a48-a233-b3af447b02bc", "comment": "", "command": "click", - "target": "css=.btn-link:nth-child(1) > translate-i18n", + "target": "css=.btn-link:nth-child(1)", "targets": [ ["css=.btn-link:nth-child(1) > translate-i18n", "css:finder"], ["xpath=//div[@id='navigation']/div/a/translate-i18n", "xpath:idRelative"],