diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolverControllerVersionEndpointsIntegrationTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolverControllerVersionEndpointsIntegrationTests.groovy index 8cb3df104..92d53ff65 100644 --- a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolverControllerVersionEndpointsIntegrationTests.groovy +++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolverControllerVersionEndpointsIntegrationTests.groovy @@ -150,6 +150,37 @@ class MetadataResolverControllerVersionEndpointsIntegrationTests extends Specifi mrv2.body.name == 'resolverUPDATED' } + def "SHIBUI-2182"() { + given: + def mr = new DynamicHttpMetadataResolver().with { + it.name = 'resolver2' + it.metadataRequestURLConstructionScheme = new RegexScheme().with { + it.match = 'This is the match field' + it.content = 'some content' + it + } + it + } + mr = repository.save(mr) + //Will create a second version for UPDATE revision + mr.name = 'resolverUPDATED' + mr.metadataRequestURLConstructionScheme.match = 'This is the match field too' + repository.save(mr) + + when: + def allVersions = getAllMetadataResolverVersions(mr.resourceId, List) + def mrv1 = getMetadataResolverForVersion(mr.resourceId, allVersions.body[0].id, MetadataResolver) + def mrv2 = getMetadataResolverForVersion(mr.resourceId, allVersions.body[1].id, MetadataResolver) + + then: + mrv1.statusCodeValue == 200 + mrv1.body.name == 'resolver2' + mrv1.body.metadataRequestURLConstructionScheme.match == 'This is the match field' + mrv2.statusCodeValue == 200 + mrv2.body.name == 'resolverUPDATED' + mrv2.body.metadataRequestURLConstructionScheme.match == 'This is the match field too' + } + def "SHIBUI-1386"() { given: MetadataResolver mr = new FileBackedHttpMetadataResolver(name: 'testme') @@ -292,4 +323,4 @@ trait AttributeReleaseAndOverrides { Map overrides(int filterIndex) { (this.metadataFilters[filterIndex] as EntityAttributesFilter).relyingPartyOverrides } -} +} \ No newline at end of file diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy index 936093615..071cd130f 100644 --- a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy +++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy @@ -646,7 +646,9 @@ class EntityDescriptorEnversVersioningTests extends Specification { entityDescriptorHistory.size() == 2 attrs2.attributes[0].attributeValues[0].xsStringvalue == 'attr1' attrs2.attributes[0].attributeValues[1].xsStringvalue == 'attr2' - getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() + + // TODO: does this check really make sense? + // getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() //Check the initial revision is intact attrs.attributes[0].attributeValues[0].storedValue == 'true' 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 f3e51f28f..f60242089 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 @@ -97,13 +97,13 @@ class SeleniumSIDETest extends Specification { assert result.level.exitCode == 0 cleanup: - runner.getWrappedDriver().quit() + runner?.getWrappedDriver()?.quit() where: name | file 'SHIBUI-1364: Compare FBHTTPMP with filters' | '/SHIBUI-1364-1.side' - 'SHIBUI-1364: Compare FSMP with filters' | '/SHIBUI-1364-2.side' - 'SHIBUI-1364: Compare LDMP with filters' | '/SHIBUI-1364-3.side' + 'SHIBUI-1364: Compare 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' @@ -114,10 +114,10 @@ class SeleniumSIDETest extends Specification { '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' // adding filters to this resolver type was removed in the react update - 'SHIBUI-1335: Verify Local Dynamic Metadata Provider Filters' | '/SHIBUI-1335-3.side' // adding filters to this resolver type was removed in the react update + 'SHIBUI-1335: Verify 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. There is a bug in the IDE where it thinks there is a missing ')'. + 'SHIBUI-1361: Verify dates display in proper format' | '/SHIBUI-1361.side' 'SHIBUI-1385: Restore a metadata source version' | '/SHIBUI-1385-1.side' 'SHIBUI-1385: Restore a metadata provider version' | '/SHIBUI-1385-2.side' 'SHIBUI-1391: Regex Validation' | '/SHIBUI-1391.side' diff --git a/backend/src/integration/resources/SHIBUI-1281.side b/backend/src/integration/resources/SHIBUI-1281.side index b15ab88fd..ce3222850 100644 --- a/backend/src/integration/resources/SHIBUI-1281.side +++ b/backend/src/integration/resources/SHIBUI-1281.side @@ -590,13 +590,13 @@ "id": "9033e5ad-4255-4aa7-a878-c7beab69ee8e", "comment": "", "command": "click", - "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0", + "target": "id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0", "targets": [ - ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0", "id"], + ["id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0", "id"], ["linkText=urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", "linkText"], - ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0", "css:finder"], - ["xpath=//a[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_0']/a", "xpath:idRelative"], + ["css=#option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_0']/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '#')]", "xpath:href"], ["xpath=//div[2]/a", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified')]", "xpath:innerText"] @@ -642,13 +642,13 @@ "id": "d07b2d83-3699-4f48-90e8-6fc883d3a02a", "comment": "", "command": "click", - "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1", + "target": "id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1", "targets": [ - ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1", "id"], + ["id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1", "id"], ["linkText=urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress", "linkText"], - ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_1']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_1']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress')]", "xpath:innerText"] @@ -697,13 +697,13 @@ "id": "686e004c-2b0f-4308-8622-b04bc05a50a9", "comment": "", "command": "click", - "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2", + "target": "id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2", "targets": [ - ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2", "id"], + ["id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:nameid-format:persistent", "linkText"], - ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_2']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_2']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent')]", "xpath:innerText"] @@ -750,13 +750,13 @@ "id": "b6ac5230-772b-44bc-b9d1-6ae8a58e0368", "comment": "", "command": "click", - "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3", + "target": "id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3", "targets": [ - ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3", "id"], + ["id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:nameid-format:transient", "linkText"], - ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_3']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_3']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:nameid-format:transient')]", "xpath:innerText"] @@ -790,13 +790,13 @@ "id": "3cfbc4e0-f120-43ca-8a59-8727f91b5a1c", "comment": "", "command": "click", - "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", + "target": "id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "targets": [ - ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "id"], + ["id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "id"], ["linkText=somethingElse", "linkText"], - ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "css:finder"], - ["xpath=//a[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4']/a[5]", "xpath:idRelative"], + ["css=#option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_4']/a[5]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[5]", "xpath:href"], ["xpath=//a[5]", "xpath:position"], ["xpath=//a[contains(.,'somethingElse')]", "xpath:innerText"] @@ -1447,13 +1447,13 @@ "id": "6e8718ef-e053-48d8-91e5-f5128e371f56", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-0", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-0", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-0", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-0", "id"], ["linkText=urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-0", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-0']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_0']/a", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-0", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-0']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_0']/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '#')]", "xpath:href"], ["xpath=//div[2]/a", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified')]", "xpath:innerText"] @@ -1500,13 +1500,13 @@ "id": "3cd47415-5e57-4148-a40b-9571e6791f3f", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_1-item-1", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_1-item-1", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_1-item-1", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_1-item-1", "id"], ["linkText=urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_1-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_1-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_1']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_1-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_1-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_1']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress')]", "xpath:innerText"] @@ -1553,13 +1553,13 @@ "id": "b4beb2b3-8481-4431-9299-a39a4107f17f", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_2-item-2", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_2-item-2", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_2-item-2", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_2-item-2", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:nameid-format:persistent", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_2-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_2-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_2']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_2-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_2-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_2']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent')]", "xpath:innerText"] @@ -1606,13 +1606,13 @@ "id": "c82d6951-13e2-4d32-9e19-eac52bfdc188", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_3-item-3", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_3-item-3", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_3-item-3", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_3-item-3", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:nameid-format:transient", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_3-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_3-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_3']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_3-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_3-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_3']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:nameid-format:transient')]", "xpath:innerText"] @@ -1654,11 +1654,20 @@ ], "value": "somethingElse" }, { - "id": "b505f2f8-396a-47b3-adb9-c3edb083cafb", + "id": "7193385b-22a5-41db-babe-593f7c0fc397", "comment": "", "command": "click", - "target": "css=body", - "targets": [], + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_4-item-4", + "targets": [ + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_4-item-4", "id"], + ["linkText=somethingElse", "linkText"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_4-item-4", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_4-item-4']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_4']/a[5]", "xpath:idRelative"], + ["xpath=(//a[contains(@href, '#')])[5]", "xpath:href"], + ["xpath=//a[5]", "xpath:position"], + ["xpath=//a[contains(.,'somethingElse')]", "xpath:innerText"] + ], "value": "" }, { "id": "c8bb3bee-3d61-4324-a3aa-38b78232b969", @@ -1702,13 +1711,13 @@ "id": "6c62d514-0143-49d9-97b3-6b7cb443df9d", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_0-item-0", + "target": "id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_0-item-0", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_0-item-0", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_0-item-0", "id"], ["linkText=https://refeds.org/profile/mfa", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_0-item-0", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_0-item-0']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_0']/a", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_authenticationMethods_0-item-0", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_0-item-0']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_0']/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '#')]", "xpath:href"], ["xpath=//div[2]/a", "xpath:position"], ["xpath=//a[contains(.,'https://refeds.org/profile/mfa')]", "xpath:innerText"] @@ -1754,13 +1763,13 @@ "id": "5a32d59b-1ac3-4cd0-a2d8-0e934f8182fd", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_1-item-1", + "target": "id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_1-item-1", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_1-item-1", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_1-item-1", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:ac:classes:TimeSyncToken", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_1-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_1-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_1']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_authenticationMethods_1-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_1-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_1']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:ac:classes:TimeSyncToken')]", "xpath:innerText"] @@ -1806,13 +1815,13 @@ "id": "6a7bce1a-34be-4d4c-b732-d2f198e8b8a1", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_2-item-2", + "target": "id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_2-item-2", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_2-item-2", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_2-item-2", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_2-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_2-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_2']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_authenticationMethods_2-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_2-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_2']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport')]", "xpath:innerText"] @@ -1854,11 +1863,20 @@ ], "value": "otherThings" }, { - "id": "5b836abc-eb72-417f-acdc-8b3ec267cd96", + "id": "1e11daff-c541-43a3-b05a-5ab23ed08d64", "comment": "", "command": "click", - "target": "css=body", - "targets": [], + "target": "id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_3-item-3", + "targets": [ + ["id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_3-item-3", "id"], + ["linkText=otherThings", "linkText"], + ["css=#option-selector-items-root_relyingPartyOverrides_authenticationMethods_3-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_3-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_3']/a[4]", "xpath:idRelative"], + ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], + ["xpath=//a[4]", "xpath:position"], + ["xpath=//a[contains(.,'otherThings')]", "xpath:innerText"] + ], "value": "" }, { "id": "7c85fe59-dc95-4328-a010-33d1a06a5ce5", diff --git a/backend/src/integration/resources/SHIBUI-1311.side b/backend/src/integration/resources/SHIBUI-1311.side index a63c3af30..01edf7f02 100644 --- a/backend/src/integration/resources/SHIBUI-1311.side +++ b/backend/src/integration/resources/SHIBUI-1311.side @@ -272,13 +272,13 @@ "id": "5fc6a348-0533-4d94-bb76-ebb891a0db8f", "comment": "", "command": "click", - "target": "id=option-selector-root_backupFileInitNextRefreshDelay-item-1", + "target": "id=option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "targets": [ - ["id=option-selector-root_backupFileInitNextRefreshDelay-item-1", "id"], + ["id=option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_backupFileInitNextRefreshDelay-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_backupFileInitNextRefreshDelay-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_backupFileInitNextRefreshDelay']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_backupFileInitNextRefreshDelay-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_backupFileInitNextRefreshDelay']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] @@ -377,13 +377,13 @@ "id": "a159e056-c870-4e02-a7e9-4b3a60d83718", "comment": "", "command": "click", - "target": "id=option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", + "target": "id=option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "targets": [ - ["id=option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "id"], + ["id=option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] @@ -419,13 +419,13 @@ "id": "820397f5-aabb-46f5-a65a-56747ce29091", "comment": "", "command": "click", - "target": "id=option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", + "target": "id=option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "targets": [ - ["id=option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "id"], + ["id=option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "id"], ["linkText=PT10M", "linkText"], - ["css=#option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'PT10M')]", "xpath:innerText"] @@ -485,13 +485,13 @@ "id": "b8d999f1-0c59-4a9a-9991-91d222f52b8e", "comment": "", "command": "click", - "target": "id=option-selector-root_metadataFilters_0_maxValidityInterval-item-1", + "target": "id=option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1", "targets": [ - ["id=option-selector-root_metadataFilters_0_maxValidityInterval-item-1", "id"], + ["id=option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_metadataFilters_0_maxValidityInterval-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_metadataFilters_0_maxValidityInterval-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_metadataFilters_0_maxValidityInterval']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_metadataFilters_0_maxValidityInterval']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] @@ -883,13 +883,13 @@ "id": "38816b0f-9f4d-46d2-b900-937503ef93a0", "comment": "", "command": "click", - "target": "id=option-selector-root_backupFileInitNextRefreshDelay-item-2", + "target": "id=option-selector-items-root_backupFileInitNextRefreshDelay-item-2", "targets": [ - ["id=option-selector-root_backupFileInitNextRefreshDelay-item-2", "id"], + ["id=option-selector-items-root_backupFileInitNextRefreshDelay-item-2", "id"], ["linkText=PT1M", "linkText"], - ["css=#option-selector-root_backupFileInitNextRefreshDelay-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_backupFileInitNextRefreshDelay-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_backupFileInitNextRefreshDelay']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_backupFileInitNextRefreshDelay-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_backupFileInitNextRefreshDelay-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_backupFileInitNextRefreshDelay']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'PT1M')]", "xpath:innerText"] diff --git a/backend/src/integration/resources/SHIBUI-1333.side b/backend/src/integration/resources/SHIBUI-1333.side index fc3873982..bdc73b6ce 100644 --- a/backend/src/integration/resources/SHIBUI-1333.side +++ b/backend/src/integration/resources/SHIBUI-1333.side @@ -604,13 +604,13 @@ "id": "9033e5ad-4255-4aa7-a878-c7beab69ee8e", "comment": "", "command": "click", - "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0", + "target": "id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0", "targets": [ - ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0", "id"], + ["id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0", "id"], ["linkText=urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", "linkText"], - ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0", "css:finder"], - ["xpath=//a[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_0']/a", "xpath:idRelative"], + ["css=#option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_0']/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '#')]", "xpath:href"], ["xpath=//div[2]/a", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified')]", "xpath:innerText"] @@ -656,13 +656,13 @@ "id": "d07b2d83-3699-4f48-90e8-6fc883d3a02a", "comment": "", "command": "click", - "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1", + "target": "id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1", "targets": [ - ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1", "id"], + ["id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1", "id"], ["linkText=urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress", "linkText"], - ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_1']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_1']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress')]", "xpath:innerText"] @@ -709,13 +709,13 @@ "id": "686e004c-2b0f-4308-8622-b04bc05a50a9", "comment": "", "command": "click", - "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2", + "target": "id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2", "targets": [ - ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2", "id"], + ["id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:nameid-format:persistent", "linkText"], - ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_2']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_2']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent')]", "xpath:innerText"] @@ -762,13 +762,13 @@ "id": "b6ac5230-772b-44bc-b9d1-6ae8a58e0368", "comment": "", "command": "click", - "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3", + "target": "id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3", "targets": [ - ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3", "id"], + ["id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:nameid-format:transient", "linkText"], - ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_3']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_3']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:nameid-format:transient')]", "xpath:innerText"] @@ -801,13 +801,13 @@ "id": "6f0363e3-cd0b-45cc-8210-7cad7c29997e", "comment": "", "command": "click", - "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", + "target": "id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "targets": [ - ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "id"], + ["id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "id"], ["linkText=somethingElse", "linkText"], - ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "css:finder"], - ["xpath=//a[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4']/a[5]", "xpath:idRelative"], + ["css=#option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_4']/a[5]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[5]", "xpath:href"], ["xpath=//a[5]", "xpath:position"], ["xpath=//a[contains(.,'somethingElse')]", "xpath:innerText"] @@ -1437,13 +1437,13 @@ "id": "6e8718ef-e053-48d8-91e5-f5128e371f56", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-0", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-0", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-0", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-0", "id"], ["linkText=urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-0", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-0']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_0']/a", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-0", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-0']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_0']/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '#')]", "xpath:href"], ["xpath=//div[2]/a", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified')]", "xpath:innerText"] @@ -1490,13 +1490,13 @@ "id": "3cd47415-5e57-4148-a40b-9571e6791f3f", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_1-item-1", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_1-item-1", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_1-item-1", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_1-item-1", "id"], ["linkText=urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_1-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_1-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_1']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_1-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_1-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_1']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress')]", "xpath:innerText"] @@ -1543,13 +1543,13 @@ "id": "b4beb2b3-8481-4431-9299-a39a4107f17f", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_2-item-2", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_2-item-2", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_2-item-2", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_2-item-2", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:nameid-format:persistent", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_2-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_2-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_2']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_2-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_2-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_2']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent')]", "xpath:innerText"] @@ -1596,13 +1596,13 @@ "id": "c82d6951-13e2-4d32-9e19-eac52bfdc188", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_3-item-3", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_3-item-3", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_3-item-3", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_3-item-3", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:nameid-format:transient", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_3-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_3-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_3']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_3-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_3-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_3']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:nameid-format:transient')]", "xpath:innerText"] @@ -1647,13 +1647,13 @@ "id": "3a2e2040-7443-4e3a-99b1-363f87580cba", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_4-item-4", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_4-item-4", "id"], ["linkText=somethingElse", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_4']/a[5]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_4-item-4", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_4-item-4']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_4']/a[5]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[5]", "xpath:href"], ["xpath=//a[5]", "xpath:position"], ["xpath=//a[contains(.,'somethingElse')]", "xpath:innerText"] @@ -1701,13 +1701,13 @@ "id": "6c62d514-0143-49d9-97b3-6b7cb443df9d", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_0-item-0", + "target": "id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_0-item-0", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_0-item-0", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_0-item-0", "id"], ["linkText=https://refeds.org/profile/mfa", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_0-item-0", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_0-item-0']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_0']/a", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_authenticationMethods_0-item-0", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_0-item-0']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_0']/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '#')]", "xpath:href"], ["xpath=//div[2]/a", "xpath:position"], ["xpath=//a[contains(.,'https://refeds.org/profile/mfa')]", "xpath:innerText"] @@ -1753,13 +1753,13 @@ "id": "5a32d59b-1ac3-4cd0-a2d8-0e934f8182fd", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_1-item-1", + "target": "id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_1-item-1", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_1-item-1", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_1-item-1", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:ac:classes:TimeSyncToken", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_1-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_1-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_1']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_authenticationMethods_1-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_1-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_1']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:ac:classes:TimeSyncToken')]", "xpath:innerText"] @@ -1805,13 +1805,13 @@ "id": "6a7bce1a-34be-4d4c-b732-d2f198e8b8a1", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_2-item-2", + "target": "id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_2-item-2", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_2-item-2", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_2-item-2", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_2-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_2-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_2']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_authenticationMethods_2-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_2-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_2']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport')]", "xpath:innerText"] @@ -1856,13 +1856,13 @@ "id": "1f62c43d-e605-4d62-9ce4-51f950788ac4", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3", + "target": "id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_3-item-3", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_3-item-3", "id"], ["linkText=otherThings", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_3']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_authenticationMethods_3-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_3-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_3']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'otherThings')]", "xpath:innerText"] @@ -2164,10 +2164,10 @@ "id": "3f2c3eab-ecbf-45f3-bcdc-a5cad766b27c", "comment": "", "command": "assertText", - "target": "css=div:nth-child(2) > div:nth-child(4) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block", + "target": "css=div:nth-child(5) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block", "targets": [ - ["css=div:nth-child(2) > div:nth-child(4) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div[2]/div[3]/span", "xpath:idRelative"], + ["css=div:nth-child(5) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[5]/div[2]/div[3]/span", "xpath:idRelative"], ["xpath=//div[3]/span", "xpath:position"], ["xpath=//span[contains(.,'user@test.org')]", "xpath:innerText"] ], diff --git a/backend/src/integration/resources/SHIBUI-1334-1.side b/backend/src/integration/resources/SHIBUI-1334-1.side index 9c8248bf9..9187fd0bd 100644 --- a/backend/src/integration/resources/SHIBUI-1334-1.side +++ b/backend/src/integration/resources/SHIBUI-1334-1.side @@ -604,13 +604,13 @@ "id": "9033e5ad-4255-4aa7-a878-c7beab69ee8e", "comment": "", "command": "click", - "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0", + "target": "id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0", "targets": [ - ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0", "id"], + ["id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0", "id"], ["linkText=urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", "linkText"], - ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0", "css:finder"], - ["xpath=//a[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_0']/a", "xpath:idRelative"], + ["css=#option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_0']/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '#')]", "xpath:href"], ["xpath=//div[2]/a", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified')]", "xpath:innerText"] @@ -656,13 +656,13 @@ "id": "d07b2d83-3699-4f48-90e8-6fc883d3a02a", "comment": "", "command": "click", - "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1", + "target": "id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1", "targets": [ - ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1", "id"], + ["id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1", "id"], ["linkText=urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress", "linkText"], - ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_1']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_1']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress')]", "xpath:innerText"] @@ -709,13 +709,13 @@ "id": "686e004c-2b0f-4308-8622-b04bc05a50a9", "comment": "", "command": "click", - "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2", + "target": "id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2", "targets": [ - ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2", "id"], + ["id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:nameid-format:persistent", "linkText"], - ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_2']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_2']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent')]", "xpath:innerText"] @@ -762,13 +762,13 @@ "id": "b6ac5230-772b-44bc-b9d1-6ae8a58e0368", "comment": "", "command": "click", - "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3", + "target": "id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3", "targets": [ - ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3", "id"], + ["id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:nameid-format:transient", "linkText"], - ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_3']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_3']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:nameid-format:transient')]", "xpath:innerText"] @@ -802,13 +802,13 @@ "id": "c11bf56d-4516-4397-9a19-e07cc12eda2a", "comment": "", "command": "click", - "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", + "target": "id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "targets": [ - ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "id"], + ["id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "id"], ["linkText=somethingElse", "linkText"], - ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "css:finder"], - ["xpath=//a[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4']/a[5]", "xpath:idRelative"], + ["css=#option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_4']/a[5]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[5]", "xpath:href"], ["xpath=//a[5]", "xpath:position"], ["xpath=//a[contains(.,'somethingElse')]", "xpath:innerText"] @@ -1443,13 +1443,13 @@ "id": "6e8718ef-e053-48d8-91e5-f5128e371f56", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-0", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-0", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-0", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-0", "id"], ["linkText=urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-0", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-0']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_0']/a", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-0", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-0']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_0']/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '#')]", "xpath:href"], ["xpath=//div[2]/a", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified')]", "xpath:innerText"] @@ -1496,13 +1496,13 @@ "id": "3cd47415-5e57-4148-a40b-9571e6791f3f", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_1-item-1", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_1-item-1", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_1-item-1", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_1-item-1", "id"], ["linkText=urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_1-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_1-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_1']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_1-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_1-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_1']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress')]", "xpath:innerText"] @@ -1549,13 +1549,13 @@ "id": "b4beb2b3-8481-4431-9299-a39a4107f17f", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_2-item-2", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_2-item-2", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_2-item-2", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_2-item-2", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:nameid-format:persistent", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_2-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_2-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_2']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_2-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_2-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_2']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent')]", "xpath:innerText"] @@ -1602,13 +1602,13 @@ "id": "c82d6951-13e2-4d32-9e19-eac52bfdc188", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_3-item-3", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_3-item-3", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_3-item-3", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_3-item-3", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:nameid-format:transient", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_3-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_3-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_3']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_3-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_3-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_3']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:nameid-format:transient')]", "xpath:innerText"] @@ -1654,13 +1654,13 @@ "id": "26146f5e-533f-42c6-b1e6-e107a471ba8f", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_4-item-4", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_4-item-4", "id"], ["linkText=somethingElse", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_4']/a[5]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_4-item-4", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_4-item-4']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_4']/a[5]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[5]", "xpath:href"], ["xpath=//a[5]", "xpath:position"], ["xpath=//a[contains(.,'somethingElse')]", "xpath:innerText"] @@ -1708,13 +1708,13 @@ "id": "6c62d514-0143-49d9-97b3-6b7cb443df9d", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_0-item-0", + "target": "id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_0-item-0", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_0-item-0", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_0-item-0", "id"], ["linkText=https://refeds.org/profile/mfa", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_0-item-0", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_0-item-0']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_0']/a", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_authenticationMethods_0-item-0", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_0-item-0']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_0']/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '#')]", "xpath:href"], ["xpath=//div[2]/a", "xpath:position"], ["xpath=//a[contains(.,'https://refeds.org/profile/mfa')]", "xpath:innerText"] @@ -1760,13 +1760,13 @@ "id": "5a32d59b-1ac3-4cd0-a2d8-0e934f8182fd", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_1-item-1", + "target": "id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_1-item-1", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_1-item-1", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_1-item-1", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:ac:classes:TimeSyncToken", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_1-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_1-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_1']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_authenticationMethods_1-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_1-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_1']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:ac:classes:TimeSyncToken')]", "xpath:innerText"] @@ -1812,13 +1812,13 @@ "id": "6a7bce1a-34be-4d4c-b732-d2f198e8b8a1", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_2-item-2", + "target": "id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_2-item-2", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_2-item-2", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_2-item-2", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_2-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_2-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_2']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_authenticationMethods_2-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_2-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_2']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport')]", "xpath:innerText"] @@ -1864,13 +1864,13 @@ "id": "7e80934c-c706-42e3-84c2-012dfcfb88a3", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3", + "target": "id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_3-item-3", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_3-item-3", "id"], ["linkText=otherThings", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_3']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_authenticationMethods_3-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_3-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_3']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'otherThings')]", "xpath:innerText"] @@ -2188,10 +2188,10 @@ "id": "3f2c3eab-ecbf-45f3-bcdc-a5cad766b27c", "comment": "", "command": "assertText", - "target": "css=div:nth-child(2) > div:nth-child(4) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block", + "target": "css=div:nth-child(5) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block", "targets": [ - ["css=div:nth-child(2) > div:nth-child(4) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div[2]/div[3]/span", "xpath:idRelative"], + ["css=div:nth-child(5) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[5]/div[2]/div[3]/span", "xpath:idRelative"], ["xpath=//div[3]/span", "xpath:position"], ["xpath=//span[contains(.,'user@test.org')]", "xpath:innerText"] ], diff --git a/backend/src/integration/resources/SHIBUI-1334-2.side b/backend/src/integration/resources/SHIBUI-1334-2.side index 84d2fa73a..37a6992a0 100644 --- a/backend/src/integration/resources/SHIBUI-1334-2.side +++ b/backend/src/integration/resources/SHIBUI-1334-2.side @@ -259,13 +259,13 @@ "id": "5fc6a348-0533-4d94-bb76-ebb891a0db8f", "comment": "", "command": "click", - "target": "id=option-selector-root_backupFileInitNextRefreshDelay-item-1", + "target": "id=option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "targets": [ - ["id=option-selector-root_backupFileInitNextRefreshDelay-item-1", "id"], + ["id=option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_backupFileInitNextRefreshDelay-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_backupFileInitNextRefreshDelay-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_backupFileInitNextRefreshDelay']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_backupFileInitNextRefreshDelay-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_backupFileInitNextRefreshDelay']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] @@ -364,13 +364,13 @@ "id": "a159e056-c870-4e02-a7e9-4b3a60d83718", "comment": "", "command": "click", - "target": "id=option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", + "target": "id=option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "targets": [ - ["id=option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "id"], + ["id=option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] @@ -406,13 +406,13 @@ "id": "820397f5-aabb-46f5-a65a-56747ce29091", "comment": "", "command": "click", - "target": "id=option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", + "target": "id=option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "targets": [ - ["id=option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "id"], + ["id=option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "id"], ["linkText=PT10M", "linkText"], - ["css=#option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'PT10M')]", "xpath:innerText"] @@ -471,13 +471,13 @@ "id": "b8d999f1-0c59-4a9a-9991-91d222f52b8e", "comment": "", "command": "click", - "target": "id=option-selector-root_metadataFilters_0_maxValidityInterval-item-1", + "target": "id=option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1", "targets": [ - ["id=option-selector-root_metadataFilters_0_maxValidityInterval-item-1", "id"], + ["id=option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_metadataFilters_0_maxValidityInterval-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_metadataFilters_0_maxValidityInterval-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_metadataFilters_0_maxValidityInterval']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_metadataFilters_0_maxValidityInterval']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] @@ -833,7 +833,7 @@ "id": "ce328b6a-f6ee-45e9-975c-5a5608f373dc", "comment": "", "command": "waitForElementVisible", - "target": "css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", + "target": "css=div:nth-child(4) > .bg-diff > .d-block:nth-child(2)", "targets": [ ["css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", "css:finder"], ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[2]", "xpath:idRelative"], @@ -845,11 +845,11 @@ "id": "68103f0e-e3f1-419b-903d-5d8c30bc6700", "comment": "", "command": "assertText", - "target": "css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", + "target": "css=div:nth-child(4) > .bg-diff > .d-block:nth-child(2)", "targets": [ - ["css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[2]", "xpath:idRelative"], - ["xpath=//div[3]/div/span[2]", "xpath:position"], + ["css=div:nth-child(4) > .bg-diff > .d-block:nth-child(2)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div/span[2]", "xpath:idRelative"], + ["xpath=//div[4]/div/span[2]", "xpath:position"], ["xpath=//span[contains(.,'123 version 2')]", "xpath:innerText"] ], "value": "123 version 2" @@ -857,33 +857,33 @@ "id": "a13198b9-7827-47e2-ade3-143b981d34ee", "comment": "", "command": "assertText", - "target": "css=div:nth-child(3) > .bg-diff > .d-block:nth-child(3)", + "target": "css=div:nth-child(4) > .bg-diff > .d-block:nth-child(3)", "targets": [ - ["css=div:nth-child(3) > .bg-diff > .d-block:nth-child(3)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[3]", "xpath:idRelative"], - ["xpath=//div[3]/div/span[3]", "xpath:position"] + ["css=div:nth-child(4) > .bg-diff > .d-block:nth-child(3)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div/span[3]", "xpath:idRelative"], + ["xpath=//div[4]/div/span[3]", "xpath:position"] ], "value": "123" }, { "id": "3d83741c-299e-4fcb-9ce6-4b7291c423a4", "comment": "", "command": "assertText", - "target": "css=div:nth-child(11) > .bg-diff > .d-block:nth-child(2)", + "target": "css=div:nth-child(12) > .bg-diff > .d-block:nth-child(2)", "targets": [ - ["css=div:nth-child(11) > .bg-diff > .d-block:nth-child(2)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[11]/div/span[2]", "xpath:idRelative"], - ["xpath=//div[11]/div/span[2]", "xpath:position"] + ["css=div:nth-child(12) > .bg-diff > .d-block:nth-child(2)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[12]/div/span[2]", "xpath:idRelative"], + ["xpath=//div[12]/div/span[2]", "xpath:position"] ], "value": "false" }, { "id": "190cc157-d427-4046-aff2-180392395ad3", "comment": "", "command": "assertText", - "target": "css=div:nth-child(11) > .bg-diff > .d-block:nth-child(3)", + "target": "css=div:nth-child(12) > .bg-diff > .d-block:nth-child(3)", "targets": [ - ["css=div:nth-child(11) > .bg-diff > .d-block:nth-child(3)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[11]/div/span[3]", "xpath:idRelative"], - ["xpath=//div[11]/div/span[3]", "xpath:position"], + ["css=div:nth-child(12) > .bg-diff > .d-block:nth-child(3)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[12]/div/span[3]", "xpath:idRelative"], + ["xpath=//div[12]/div/span[3]", "xpath:position"], ["xpath=//span[contains(.,'true')]", "xpath:innerText"] ], "value": "true" @@ -989,13 +989,13 @@ "id": "8ba62572-354d-47f4-bb72-f9309c1cb201", "comment": "", "command": "click", - "target": "id=option-selector-root_httpMetadataResolverAttributes_connectionRequestTimeout-item-1", + "target": "id=option-selector-items-root_httpMetadataResolverAttributes_connectionRequestTimeout-item-1", "targets": [ - ["id=option-selector-root_httpMetadataResolverAttributes_connectionRequestTimeout-item-1", "id"], + ["id=option-selector-items-root_httpMetadataResolverAttributes_connectionRequestTimeout-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_httpMetadataResolverAttributes_connectionRequestTimeout-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_httpMetadataResolverAttributes_connectionRequestTimeout-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_httpMetadataResolverAttributes_connectionRequestTimeout']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_httpMetadataResolverAttributes_connectionRequestTimeout-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_httpMetadataResolverAttributes_connectionRequestTimeout-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_httpMetadataResolverAttributes_connectionRequestTimeout']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] @@ -1031,13 +1031,13 @@ "id": "337ac160-7990-425f-83da-2788d8a0985e", "comment": "", "command": "click", - "target": "id=option-selector-root_httpMetadataResolverAttributes_connectionTimeout-item-2", + "target": "id=option-selector-items-root_httpMetadataResolverAttributes_connectionTimeout-item-2", "targets": [ - ["id=option-selector-root_httpMetadataResolverAttributes_connectionTimeout-item-2", "id"], + ["id=option-selector-items-root_httpMetadataResolverAttributes_connectionTimeout-item-2", "id"], ["linkText=PT1M", "linkText"], - ["css=#option-selector-root_httpMetadataResolverAttributes_connectionTimeout-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_httpMetadataResolverAttributes_connectionTimeout-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_httpMetadataResolverAttributes_connectionTimeout']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_httpMetadataResolverAttributes_connectionTimeout-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_httpMetadataResolverAttributes_connectionTimeout-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_httpMetadataResolverAttributes_connectionTimeout']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'PT1M')]", "xpath:innerText"] @@ -1073,13 +1073,13 @@ "id": "34693225-4754-4b27-92ee-3e37304a8cd7", "comment": "", "command": "click", - "target": "id=option-selector-root_httpMetadataResolverAttributes_socketTimeout-item-3", + "target": "id=option-selector-items-root_httpMetadataResolverAttributes_socketTimeout-item-3", "targets": [ - ["id=option-selector-root_httpMetadataResolverAttributes_socketTimeout-item-3", "id"], + ["id=option-selector-items-root_httpMetadataResolverAttributes_socketTimeout-item-3", "id"], ["linkText=PT10M", "linkText"], - ["css=#option-selector-root_httpMetadataResolverAttributes_socketTimeout-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_httpMetadataResolverAttributes_socketTimeout-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_httpMetadataResolverAttributes_socketTimeout']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_httpMetadataResolverAttributes_socketTimeout-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_httpMetadataResolverAttributes_socketTimeout-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_httpMetadataResolverAttributes_socketTimeout']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'PT10M')]", "xpath:innerText"] diff --git a/backend/src/integration/resources/SHIBUI-1335-1.side b/backend/src/integration/resources/SHIBUI-1335-1.side index 844323040..2ed4eda91 100644 --- a/backend/src/integration/resources/SHIBUI-1335-1.side +++ b/backend/src/integration/resources/SHIBUI-1335-1.side @@ -259,13 +259,13 @@ "id": "35dfa0f8-c0f2-4356-a6b0-18b5dc35337b", "comment": "", "command": "click", - "target": "id=option-selector-root_backupFileInitNextRefreshDelay-item-1", + "target": "id=option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "targets": [ - ["id=option-selector-root_backupFileInitNextRefreshDelay-item-1", "id"], + ["id=option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_backupFileInitNextRefreshDelay-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_backupFileInitNextRefreshDelay-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_backupFileInitNextRefreshDelay']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_backupFileInitNextRefreshDelay-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_backupFileInitNextRefreshDelay']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] @@ -345,13 +345,13 @@ "id": "9ee7065a-823e-4b4a-b212-0582eeaf7a00", "comment": "", "command": "click", - "target": "id=option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-0", + "target": "id=option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-0", "targets": [ - ["id=option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-0", "id"], + ["id=option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-0", "id"], ["linkText=PT0S", "linkText"], - ["css=#option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-0", "css:finder"], - ["xpath=//a[@id='option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-0']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay']/a", "xpath:idRelative"], + ["css=#option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-0", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-0']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay']/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '#')]", "xpath:href"], ["xpath=//div[2]/a", "xpath:position"], ["xpath=//a[contains(.,'PT0S')]", "xpath:innerText"] @@ -387,13 +387,13 @@ "id": "a89f1b4d-10bd-48f7-9b97-865710cfe01f", "comment": "", "command": "click", - "target": "id=option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", + "target": "id=option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", "targets": [ - ["id=option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", "id"], + ["id=option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", "id"], ["linkText=PT1M", "linkText"], - ["css=#option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'PT1M')]", "xpath:innerText"] @@ -465,13 +465,13 @@ "id": "a4470d6f-04a7-4c4b-8c1e-70cff2f35e8a", "comment": "", "command": "click", - "target": "id=option-selector-root_metadataFilters_0_maxValidityInterval-item-1", + "target": "id=option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1", "targets": [ - ["id=option-selector-root_metadataFilters_0_maxValidityInterval-item-1", "id"], + ["id=option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_metadataFilters_0_maxValidityInterval-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_metadataFilters_0_maxValidityInterval-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_metadataFilters_0_maxValidityInterval']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_metadataFilters_0_maxValidityInterval']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] @@ -882,13 +882,13 @@ "id": "cc233154-4159-425b-8ac5-761c26a0de15", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-0", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-0", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-0", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-0", "id"], ["linkText=urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-0", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-0']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_0']/a", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-0", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-0']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_0']/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '#')]", "xpath:href"], ["xpath=//div[2]/a", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified')]", "xpath:innerText"] @@ -934,13 +934,13 @@ "id": "f5f27af2-b869-4b99-a3d9-3efce014be06", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_1-item-1", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_1-item-1", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_1-item-1", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_1-item-1", "id"], ["linkText=urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_1-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_1-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_1']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_1-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_1-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_1']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress')]", "xpath:innerText"] @@ -987,13 +987,13 @@ "id": "4655a981-c5d6-4b48-aad2-77295dc37859", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_2-item-2", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_2-item-2", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_2-item-2", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_2-item-2", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:nameid-format:persistent", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_2-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_2-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_2']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_2-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_2-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_2']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent')]", "xpath:innerText"] @@ -1040,13 +1040,13 @@ "id": "cd34bc8a-564b-4d15-90c9-f09e12d7e078", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_3-item-3", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_3-item-3", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_3-item-3", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_3-item-3", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:nameid-format:transient", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_3-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_3-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_3']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_3-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_3-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_3']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:nameid-format:transient')]", "xpath:innerText"] @@ -1097,7 +1097,7 @@ "id": "0c417f2a-a400-4b34-91fc-e73efb92faff", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_4-item-4", "targets": [], "value": "" }, { @@ -1142,13 +1142,13 @@ "id": "9bb8951c-c932-4236-89d8-9d2c8d49a702", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_0-item-0", + "target": "id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_0-item-0", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_0-item-0", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_0-item-0", "id"], ["linkText=https://refeds.org/profile/mfa", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_0-item-0", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_0-item-0']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_0']/a", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_authenticationMethods_0-item-0", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_0-item-0']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_0']/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '#')]", "xpath:href"], ["xpath=//div[2]/a", "xpath:position"], ["xpath=//a[contains(.,'https://refeds.org/profile/mfa')]", "xpath:innerText"] @@ -1194,13 +1194,13 @@ "id": "8f00493c-94ef-4182-8423-5d23bd01136f", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_1-item-1", + "target": "id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_1-item-1", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_1-item-1", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_1-item-1", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:ac:classes:TimeSyncToken", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_1-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_1-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_1']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_authenticationMethods_1-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_1-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_1']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:ac:classes:TimeSyncToken')]", "xpath:innerText"] @@ -1246,13 +1246,13 @@ "id": "3dcbc6b1-2571-4ab8-9014-66b19727fe0a", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_2-item-2", + "target": "id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_2-item-2", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_2-item-2", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_2-item-2", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_2-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_2-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_2']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_authenticationMethods_2-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_2-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_2']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport')]", "xpath:innerText"] @@ -1284,7 +1284,7 @@ "id": "9a850c80-fc21-48c8-b146-a665307c5ac6", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3", + "target": "id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_3-item-3", "targets": [], "value": "" }, { @@ -1493,13 +1493,13 @@ "id": "ee812306-8d00-4162-9d92-eb598802f4bc", "comment": "", "command": "click", - "target": "id=option-selector-root_formats_0-item-0", + "target": "id=option-selector-items-root_formats_0-item-0", "targets": [ - ["id=option-selector-root_formats_0-item-0", "id"], + ["id=option-selector-items-root_formats_0-item-0", "id"], ["linkText=urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", "linkText"], - ["css=#option-selector-root_formats_0-item-0", "css:finder"], - ["xpath=//a[@id='option-selector-root_formats_0-item-0']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_formats_0']/a", "xpath:idRelative"], + ["css=#option-selector-items-root_formats_0-item-0", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_formats_0-item-0']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_formats_0']/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '#')]", "xpath:href"], ["xpath=//div[2]/a", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified')]", "xpath:innerText"] @@ -1545,13 +1545,13 @@ "id": "aa0cb8e5-a5b5-4956-91dc-d25ea30ff87a", "comment": "", "command": "click", - "target": "id=option-selector-root_formats_1-item-1", + "target": "id=option-selector-items-root_formats_1-item-1", "targets": [ - ["id=option-selector-root_formats_1-item-1", "id"], + ["id=option-selector-items-root_formats_1-item-1", "id"], ["linkText=urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress", "linkText"], - ["css=#option-selector-root_formats_1-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_formats_1-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_formats_1']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_formats_1-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_formats_1-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_formats_1']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress')]", "xpath:innerText"] @@ -1598,13 +1598,13 @@ "id": "bf10f8f1-f5b8-43f5-b1d8-6e4e67e92621", "comment": "", "command": "click", - "target": "id=option-selector-root_formats_2-item-2", + "target": "id=option-selector-items-root_formats_2-item-2", "targets": [ - ["id=option-selector-root_formats_2-item-2", "id"], + ["id=option-selector-items-root_formats_2-item-2", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:nameid-format:persistent", "linkText"], - ["css=#option-selector-root_formats_2-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_formats_2-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_formats_2']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_formats_2-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_formats_2-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_formats_2']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent')]", "xpath:innerText"] @@ -1650,13 +1650,13 @@ "id": "3cba2ead-22cd-4bc9-b0ca-bb1f5ebb10a2", "comment": "", "command": "click", - "target": "id=option-selector-root_formats_3-item-3", + "target": "id=option-selector-items-root_formats_3-item-3", "targets": [ - ["id=option-selector-root_formats_3-item-3", "id"], + ["id=option-selector-items-root_formats_3-item-3", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:nameid-format:transient", "linkText"], - ["css=#option-selector-root_formats_3-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_formats_3-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_formats_3']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_formats_3-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_formats_3-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_formats_3']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:nameid-format:transient')]", "xpath:innerText"] @@ -1688,13 +1688,13 @@ "id": "fffef61c-1c28-4180-b337-00b69a0148d3", "comment": "", "command": "click", - "target": "id=option-selector-root_formats_4-item-4", + "target": "id=option-selector-items-root_formats_4-item-4", "targets": [ - ["id=option-selector-root_formats_4-item-4", "id"], + ["id=option-selector-items-root_formats_4-item-4", "id"], ["linkText=name id format", "linkText"], - ["css=#option-selector-root_formats_4-item-4", "css:finder"], - ["xpath=//a[@id='option-selector-root_formats_4-item-4']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_formats_4']/a[5]", "xpath:idRelative"], + ["css=#option-selector-items-root_formats_4-item-4", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_formats_4-item-4']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_formats_4']/a[5]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[5]", "xpath:href"], ["xpath=//a[5]", "xpath:position"], ["xpath=//a[contains(.,'name id format')]", "xpath:innerText"] diff --git a/backend/src/integration/resources/SHIBUI-1335-2.side b/backend/src/integration/resources/SHIBUI-1335-2.side index 80009fd84..f3719c173 100644 --- a/backend/src/integration/resources/SHIBUI-1335-2.side +++ b/backend/src/integration/resources/SHIBUI-1335-2.side @@ -256,13 +256,13 @@ "id": "0f1a7a34-0955-45bb-bd2a-a5e4f246869b", "comment": "", "command": "click", - "target": "id=option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", + "target": "id=option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "targets": [ - ["id=option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "id"], + ["id=option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] @@ -298,13 +298,13 @@ "id": "80a08176-de7d-4938-8d49-1d296a8ba27c", "comment": "", "command": "click", - "target": "id=option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", + "target": "id=option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", "targets": [ - ["id=option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", "id"], + ["id=option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", "id"], ["linkText=PT1M", "linkText"], - ["css=#option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'PT1M')]", "xpath:innerText"] diff --git a/backend/src/integration/resources/SHIBUI-1335-3.side b/backend/src/integration/resources/SHIBUI-1335-3.side index 7454cc6b9..f10c8d687 100644 --- a/backend/src/integration/resources/SHIBUI-1335-3.side +++ b/backend/src/integration/resources/SHIBUI-1335-3.side @@ -256,13 +256,13 @@ "id": "443a9cfc-17c8-49da-9d87-bfabda8fd0b6", "comment": "", "command": "click", - "target": "id=option-selector-root_dynamicMetadataResolverAttributes_minCacheDuration-item-0", + "target": "id=option-selector-items-root_dynamicMetadataResolverAttributes_minCacheDuration-item-0", "targets": [ - ["id=option-selector-root_dynamicMetadataResolverAttributes_minCacheDuration-item-0", "id"], + ["id=option-selector-items-root_dynamicMetadataResolverAttributes_minCacheDuration-item-0", "id"], ["linkText=PT0S", "linkText"], - ["css=#option-selector-root_dynamicMetadataResolverAttributes_minCacheDuration-item-0", "css:finder"], - ["xpath=//a[@id='option-selector-root_dynamicMetadataResolverAttributes_minCacheDuration-item-0']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_dynamicMetadataResolverAttributes_minCacheDuration']/a", "xpath:idRelative"], + ["css=#option-selector-items-root_dynamicMetadataResolverAttributes_minCacheDuration-item-0", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_dynamicMetadataResolverAttributes_minCacheDuration-item-0']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_dynamicMetadataResolverAttributes_minCacheDuration']/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '#')]", "xpath:href"], ["xpath=//div[2]/a", "xpath:position"], ["xpath=//a[contains(.,'PT0S')]", "xpath:innerText"] @@ -298,13 +298,13 @@ "id": "c03be15d-ee34-4cd1-bac9-c52e3baa70a3", "comment": "", "command": "click", - "target": "id=option-selector-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-2", + "target": "id=option-selector-items-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-2", "targets": [ - ["id=option-selector-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-2", "id"], + ["id=option-selector-items-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-2", "id"], ["linkText=PT1M", "linkText"], - ["css=#option-selector-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_dynamicMetadataResolverAttributes_maxCacheDuration']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_dynamicMetadataResolverAttributes_maxCacheDuration']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'PT1M')]", "xpath:innerText"] @@ -340,13 +340,13 @@ "id": "dd663319-7eef-4301-a0d4-24d9583eab7f", "comment": "", "command": "click", - "target": "id=option-selector-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-1", + "target": "id=option-selector-items-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-1", "targets": [ - ["id=option-selector-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-1", "id"], + ["id=option-selector-items-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_dynamicMetadataResolverAttributes_maxIdleEntityData']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_dynamicMetadataResolverAttributes_maxIdleEntityData']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] @@ -395,13 +395,13 @@ "id": "e7f2439a-e9a1-4b23-b0b9-d992f5b477d4", "comment": "", "command": "click", - "target": "id=option-selector-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3", + "target": "id=option-selector-items-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3", "targets": [ - ["id=option-selector-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3", "id"], + ["id=option-selector-items-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3", "id"], ["linkText=PT10M", "linkText"], - ["css=#option-selector-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_dynamicMetadataResolverAttributes_cleanupTaskInterval']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_dynamicMetadataResolverAttributes_cleanupTaskInterval']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'PT10M')]", "xpath:innerText"] diff --git a/backend/src/integration/resources/SHIBUI-1335-4.side b/backend/src/integration/resources/SHIBUI-1335-4.side index cc66f27c4..5fa6b3dd9 100644 --- a/backend/src/integration/resources/SHIBUI-1335-4.side +++ b/backend/src/integration/resources/SHIBUI-1335-4.side @@ -321,13 +321,13 @@ "id": "b1ec3405-0d75-45d6-8986-51c2f09c4dc4", "comment": "", "command": "click", - "target": "id=option-selector-root_dynamicMetadataResolverAttributes_minCacheDuration-item-1", + "target": "id=option-selector-items-root_dynamicMetadataResolverAttributes_minCacheDuration-item-1", "targets": [ - ["id=option-selector-root_dynamicMetadataResolverAttributes_minCacheDuration-item-1", "id"], + ["id=option-selector-items-root_dynamicMetadataResolverAttributes_minCacheDuration-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_dynamicMetadataResolverAttributes_minCacheDuration-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_dynamicMetadataResolverAttributes_minCacheDuration-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_dynamicMetadataResolverAttributes_minCacheDuration']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_dynamicMetadataResolverAttributes_minCacheDuration-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_dynamicMetadataResolverAttributes_minCacheDuration-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_dynamicMetadataResolverAttributes_minCacheDuration']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] @@ -363,13 +363,13 @@ "id": "87084a6a-8e89-4c00-a3d9-c104107a3ba2", "comment": "", "command": "click", - "target": "id=option-selector-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-3", + "target": "id=option-selector-items-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-3", "targets": [ - ["id=option-selector-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-3", "id"], + ["id=option-selector-items-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-3", "id"], ["linkText=PT10M", "linkText"], - ["css=#option-selector-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_dynamicMetadataResolverAttributes_maxCacheDuration']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_dynamicMetadataResolverAttributes_maxCacheDuration']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'PT10M')]", "xpath:innerText"] @@ -405,13 +405,13 @@ "id": "d477fd6a-2c15-4fb6-a199-d49aa495ef94", "comment": "", "command": "click", - "target": "id=option-selector-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-2", + "target": "id=option-selector-items-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-2", "targets": [ - ["id=option-selector-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-2", "id"], + ["id=option-selector-items-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-2", "id"], ["linkText=PT1M", "linkText"], - ["css=#option-selector-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_dynamicMetadataResolverAttributes_maxIdleEntityData']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_dynamicMetadataResolverAttributes_maxIdleEntityData']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'PT1M')]", "xpath:innerText"] @@ -447,13 +447,13 @@ "id": "bf855df4-326e-484e-9022-d2c84e09e6f3", "comment": "", "command": "click", - "target": "id=option-selector-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3", + "target": "id=option-selector-items-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3", "targets": [ - ["id=option-selector-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3", "id"], + ["id=option-selector-items-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3", "id"], ["linkText=PT10M", "linkText"], - ["css=#option-selector-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_dynamicMetadataResolverAttributes_cleanupTaskInterval']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_dynamicMetadataResolverAttributes_cleanupTaskInterval']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'PT10M')]", "xpath:innerText"] @@ -553,13 +553,13 @@ "id": "22f7bf37-718c-4126-867b-67a383eefff5", "comment": "", "command": "click", - "target": "id=option-selector-root_metadataFilters_0_maxValidityInterval-item-2", + "target": "id=option-selector-items-root_metadataFilters_0_maxValidityInterval-item-2", "targets": [ - ["id=option-selector-root_metadataFilters_0_maxValidityInterval-item-2", "id"], + ["id=option-selector-items-root_metadataFilters_0_maxValidityInterval-item-2", "id"], ["linkText=PT1M", "linkText"], - ["css=#option-selector-root_metadataFilters_0_maxValidityInterval-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_metadataFilters_0_maxValidityInterval-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_metadataFilters_0_maxValidityInterval']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_metadataFilters_0_maxValidityInterval-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_metadataFilters_0_maxValidityInterval-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_metadataFilters_0_maxValidityInterval']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'PT1M')]", "xpath:innerText"] @@ -896,13 +896,13 @@ "id": "b269b8f4-8191-47c1-a84a-5b64df6aadcb", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-2", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-2", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-2", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-2", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:nameid-format:persistent", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_0']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_0']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent')]", "xpath:innerText"] diff --git a/backend/src/integration/resources/SHIBUI-1352-1.side b/backend/src/integration/resources/SHIBUI-1352-1.side index ce0a0b85f..ab74cc9cc 100644 --- a/backend/src/integration/resources/SHIBUI-1352-1.side +++ b/backend/src/integration/resources/SHIBUI-1352-1.side @@ -282,13 +282,13 @@ "id": "8db04a8f-565a-4fa9-b5c0-8ce4b200b11c", "comment": "", "command": "click", - "target": "id=option-selector-root_dynamicMetadataResolverAttributes_minCacheDuration-item-1", + "target": "id=option-selector-items-root_dynamicMetadataResolverAttributes_minCacheDuration-item-1", "targets": [ - ["id=option-selector-root_dynamicMetadataResolverAttributes_minCacheDuration-item-1", "id"], + ["id=option-selector-items-root_dynamicMetadataResolverAttributes_minCacheDuration-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_dynamicMetadataResolverAttributes_minCacheDuration-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_dynamicMetadataResolverAttributes_minCacheDuration-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_dynamicMetadataResolverAttributes_minCacheDuration']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_dynamicMetadataResolverAttributes_minCacheDuration-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_dynamicMetadataResolverAttributes_minCacheDuration-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_dynamicMetadataResolverAttributes_minCacheDuration']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] @@ -324,13 +324,13 @@ "id": "bf7f5914-5aad-485a-8af0-aa510605e1dc", "comment": "", "command": "click", - "target": "id=option-selector-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-3", + "target": "id=option-selector-items-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-3", "targets": [ - ["id=option-selector-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-3", "id"], + ["id=option-selector-items-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-3", "id"], ["linkText=PT10M", "linkText"], - ["css=#option-selector-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_dynamicMetadataResolverAttributes_maxCacheDuration']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_dynamicMetadataResolverAttributes_maxCacheDuration']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'PT10M')]", "xpath:innerText"] @@ -366,13 +366,13 @@ "id": "9a411cfc-479d-4951-aab2-e8d09ba64b4e", "comment": "", "command": "click", - "target": "id=option-selector-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-5", + "target": "id=option-selector-items-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-5", "targets": [ - ["id=option-selector-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-5", "id"], + ["id=option-selector-items-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-5", "id"], ["linkText=PT1H", "linkText"], - ["css=#option-selector-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-5", "css:finder"], - ["xpath=//a[@id='option-selector-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-5']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_dynamicMetadataResolverAttributes_maxIdleEntityData']/a[6]", "xpath:idRelative"], + ["css=#option-selector-items-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-5", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-5']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_dynamicMetadataResolverAttributes_maxIdleEntityData']/a[6]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[6]", "xpath:href"], ["xpath=//a[6]", "xpath:position"], ["xpath=//a[contains(.,'PT1H')]", "xpath:innerText"] @@ -421,13 +421,13 @@ "id": "c30bf781-4d5d-46ad-9bbc-4a5165788870", "comment": "", "command": "click", - "target": "id=option-selector-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-1", + "target": "id=option-selector-items-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-1", "targets": [ - ["id=option-selector-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-1", "id"], + ["id=option-selector-items-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_dynamicMetadataResolverAttributes_cleanupTaskInterval']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_dynamicMetadataResolverAttributes_cleanupTaskInterval']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] diff --git a/backend/src/integration/resources/SHIBUI-1352-2.side b/backend/src/integration/resources/SHIBUI-1352-2.side index 611da7aa9..fe4538846 100644 --- a/backend/src/integration/resources/SHIBUI-1352-2.side +++ b/backend/src/integration/resources/SHIBUI-1352-2.side @@ -269,13 +269,13 @@ "id": "d449fec4-84f9-4eda-98e5-2dc40d185a63", "comment": "", "command": "click", - "target": "id=option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", + "target": "id=option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "targets": [ - ["id=option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "id"], + ["id=option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] @@ -311,13 +311,13 @@ "id": "119a39c2-6d86-4d94-a093-6669e89e78e4", "comment": "", "command": "click", - "target": "id=option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", + "target": "id=option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "targets": [ - ["id=option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "id"], + ["id=option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "id"], ["linkText=PT10M", "linkText"], - ["css=#option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'PT10M')]", "xpath:innerText"] diff --git a/backend/src/integration/resources/SHIBUI-1361.side b/backend/src/integration/resources/SHIBUI-1361.side index ebb82a22a..ee3ed5e8f 100644 --- a/backend/src/integration/resources/SHIBUI-1361.side +++ b/backend/src/integration/resources/SHIBUI-1361.side @@ -273,13 +273,13 @@ "id": "5fc6a348-0533-4d94-bb76-ebb891a0db8f", "comment": "", "command": "click", - "target": "id=option-selector-root_backupFileInitNextRefreshDelay-item-1", + "target": "id=option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "targets": [ - ["id=option-selector-root_backupFileInitNextRefreshDelay-item-1", "id"], + ["id=option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_backupFileInitNextRefreshDelay-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_backupFileInitNextRefreshDelay-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_backupFileInitNextRefreshDelay']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_backupFileInitNextRefreshDelay-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_backupFileInitNextRefreshDelay']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] @@ -378,13 +378,13 @@ "id": "a159e056-c870-4e02-a7e9-4b3a60d83718", "comment": "", "command": "click", - "target": "id=option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", + "target": "id=option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "targets": [ - ["id=option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "id"], + ["id=option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] @@ -420,13 +420,13 @@ "id": "820397f5-aabb-46f5-a65a-56747ce29091", "comment": "", "command": "click", - "target": "id=option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", + "target": "id=option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "targets": [ - ["id=option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "id"], + ["id=option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "id"], ["linkText=PT10M", "linkText"], - ["css=#option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'PT10M')]", "xpath:innerText"] @@ -485,13 +485,13 @@ "id": "b8d999f1-0c59-4a9a-9991-91d222f52b8e", "comment": "", "command": "click", - "target": "id=option-selector-root_metadataFilters_0_maxValidityInterval-item-1", + "target": "id=option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1", "targets": [ - ["id=option-selector-root_metadataFilters_0_maxValidityInterval-item-1", "id"], + ["id=option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_metadataFilters_0_maxValidityInterval-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_metadataFilters_0_maxValidityInterval-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_metadataFilters_0_maxValidityInterval']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_metadataFilters_0_maxValidityInterval']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] @@ -893,7 +893,7 @@ "id": "ce328b6a-f6ee-45e9-975c-5a5608f373dc", "comment": "", "command": "waitForElementVisible", - "target": "css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", + "target": "css=div:nth-child(4) > .bg-diff > .d-block:nth-child(2)", "targets": [ ["css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", "css:finder"], ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[2]", "xpath:idRelative"], @@ -905,11 +905,11 @@ "id": "68103f0e-e3f1-419b-903d-5d8c30bc6700", "comment": "", "command": "assertText", - "target": "css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", + "target": "css=div:nth-child(4) > .bg-diff > .d-block:nth-child(2)", "targets": [ - ["css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[2]", "xpath:idRelative"], - ["xpath=//div[3]/div/span[2]", "xpath:position"], + ["css=div:nth-child(4) > .bg-diff > .d-block:nth-child(2)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div/span[2]", "xpath:idRelative"], + ["xpath=//div[4]/div/span[2]", "xpath:position"], ["xpath=//span[contains(.,'123 v2')]", "xpath:innerText"] ], "value": "123 v2" @@ -917,33 +917,33 @@ "id": "a13198b9-7827-47e2-ade3-143b981d34ee", "comment": "", "command": "assertText", - "target": "css=div:nth-child(3) > .bg-diff > .d-block:nth-child(3)", + "target": "css=div:nth-child(4) > .bg-diff > .d-block:nth-child(3)", "targets": [ - ["css=div:nth-child(3) > .bg-diff > .d-block:nth-child(3)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[3]", "xpath:idRelative"], - ["xpath=//div[3]/div/span[3]", "xpath:position"] + ["css=div:nth-child(4) > .bg-diff > .d-block:nth-child(3)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div/span[3]", "xpath:idRelative"], + ["xpath=//div[4]/div/span[3]", "xpath:position"] ], "value": "123" }, { "id": "3d83741c-299e-4fcb-9ce6-4b7291c423a4", "comment": "", "command": "assertText", - "target": "css=div:nth-child(11) > .bg-diff > .d-block:nth-child(2)", + "target": "css=div:nth-child(12) > .bg-diff > .d-block:nth-child(2)", "targets": [ - ["css=div:nth-child(11) > .bg-diff > .d-block:nth-child(2)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[11]/div/span[2]", "xpath:idRelative"], - ["xpath=//div[11]/div/span[2]", "xpath:position"] + ["css=div:nth-child(12) > .bg-diff > .d-block:nth-child(2)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[12]/div/span[2]", "xpath:idRelative"], + ["xpath=//div[12]/div/span[2]", "xpath:position"] ], "value": "false" }, { "id": "190cc157-d427-4046-aff2-180392395ad3", "comment": "", "command": "assertText", - "target": "css=div:nth-child(11) > .bg-diff > .d-block:nth-child(3)", + "target": "css=div:nth-child(12) > .bg-diff > .d-block:nth-child(3)", "targets": [ - ["css=div:nth-child(11) > .bg-diff > .d-block:nth-child(3)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[11]/div/span[3]", "xpath:idRelative"], - ["xpath=//div[11]/div/span[3]", "xpath:position"], + ["css=div:nth-child(12) > .bg-diff > .d-block:nth-child(3)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[12]/div/span[3]", "xpath:idRelative"], + ["xpath=//div[12]/div/span[3]", "xpath:position"], ["xpath=//span[contains(.,'true')]", "xpath:innerText"] ], "value": "true" @@ -1049,13 +1049,13 @@ "id": "8ba62572-354d-47f4-bb72-f9309c1cb201", "comment": "", "command": "click", - "target": "id=option-selector-root_httpMetadataResolverAttributes_connectionRequestTimeout-item-1", + "target": "id=option-selector-items-root_httpMetadataResolverAttributes_connectionRequestTimeout-item-1", "targets": [ - ["id=option-selector-root_httpMetadataResolverAttributes_connectionRequestTimeout-item-1", "id"], + ["id=option-selector-items-root_httpMetadataResolverAttributes_connectionRequestTimeout-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_httpMetadataResolverAttributes_connectionRequestTimeout-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_httpMetadataResolverAttributes_connectionRequestTimeout-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_httpMetadataResolverAttributes_connectionRequestTimeout']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_httpMetadataResolverAttributes_connectionRequestTimeout-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_httpMetadataResolverAttributes_connectionRequestTimeout-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_httpMetadataResolverAttributes_connectionRequestTimeout']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] @@ -1091,13 +1091,13 @@ "id": "337ac160-7990-425f-83da-2788d8a0985e", "comment": "", "command": "click", - "target": "id=option-selector-root_httpMetadataResolverAttributes_connectionTimeout-item-2", + "target": "id=option-selector-items-root_httpMetadataResolverAttributes_connectionTimeout-item-2", "targets": [ - ["id=option-selector-root_httpMetadataResolverAttributes_connectionTimeout-item-2", "id"], + ["id=option-selector-items-root_httpMetadataResolverAttributes_connectionTimeout-item-2", "id"], ["linkText=PT1M", "linkText"], - ["css=#option-selector-root_httpMetadataResolverAttributes_connectionTimeout-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_httpMetadataResolverAttributes_connectionTimeout-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_httpMetadataResolverAttributes_connectionTimeout']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_httpMetadataResolverAttributes_connectionTimeout-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_httpMetadataResolverAttributes_connectionTimeout-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_httpMetadataResolverAttributes_connectionTimeout']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'PT1M')]", "xpath:innerText"] @@ -1133,13 +1133,13 @@ "id": "34693225-4754-4b27-92ee-3e37304a8cd7", "comment": "", "command": "click", - "target": "id=option-selector-root_httpMetadataResolverAttributes_socketTimeout-item-3", + "target": "id=option-selector-items-root_httpMetadataResolverAttributes_socketTimeout-item-3", "targets": [ - ["id=option-selector-root_httpMetadataResolverAttributes_socketTimeout-item-3", "id"], + ["id=option-selector-items-root_httpMetadataResolverAttributes_socketTimeout-item-3", "id"], ["linkText=PT10M", "linkText"], - ["css=#option-selector-root_httpMetadataResolverAttributes_socketTimeout-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_httpMetadataResolverAttributes_socketTimeout-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_httpMetadataResolverAttributes_socketTimeout']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_httpMetadataResolverAttributes_socketTimeout-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_httpMetadataResolverAttributes_socketTimeout-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_httpMetadataResolverAttributes_socketTimeout']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'PT10M')]", "xpath:innerText"] @@ -1341,9 +1341,9 @@ "id": "0687fe3f-c1af-4a5a-9708-09b7b92734bc", "comment": "", "command": "assertText", - "target": "css=div:nth-child(4) > .bg-diff > .d-block:nth-child(2)", + "target": "css=div:nth-child(1) > div:nth-child(4) > .d-flex > .d-block:nth-child(2)", "targets": [ - ["css=div:nth-child(4) > .bg-diff > .d-block:nth-child(2)", "css:finder"], + ["css=div:nth-child(1) > div:nth-child(4) > .d-flex > .d-block:nth-child(2)", "css:finder"], ["xpath=//div[@id='root']/div/main/div/section/div/div/section[4]/div/div[2]/div[2]/div/div[4]/div/span[2]", "xpath:idRelative"], ["xpath=//div[2]/div[2]/div/div[4]/div/span[2]", "xpath:position"], ["xpath=//span[contains(.,'PT1M')]", "xpath:innerText"] diff --git a/backend/src/integration/resources/SHIBUI-1364-1.side b/backend/src/integration/resources/SHIBUI-1364-1.side index 1b2d59271..2ad78b831 100644 --- a/backend/src/integration/resources/SHIBUI-1364-1.side +++ b/backend/src/integration/resources/SHIBUI-1364-1.side @@ -274,13 +274,13 @@ "id": "35dfa0f8-c0f2-4356-a6b0-18b5dc35337b", "comment": "", "command": "click", - "target": "id=option-selector-root_backupFileInitNextRefreshDelay-item-1", + "target": "id=option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "targets": [ - ["id=option-selector-root_backupFileInitNextRefreshDelay-item-1", "id"], + ["id=option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_backupFileInitNextRefreshDelay-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_backupFileInitNextRefreshDelay-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_backupFileInitNextRefreshDelay']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_backupFileInitNextRefreshDelay-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_backupFileInitNextRefreshDelay']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] @@ -367,13 +367,13 @@ "id": "9ee7065a-823e-4b4a-b212-0582eeaf7a00", "comment": "", "command": "click", - "target": "id=option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-0", + "target": "id=option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-0", "targets": [ - ["id=option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-0", "id"], + ["id=option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-0", "id"], ["linkText=PT0S", "linkText"], - ["css=#option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-0", "css:finder"], - ["xpath=//a[@id='option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-0']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay']/a", "xpath:idRelative"], + ["css=#option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-0", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-0']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay']/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '#')]", "xpath:href"], ["xpath=//div[2]/a", "xpath:position"], ["xpath=//a[contains(.,'PT0S')]", "xpath:innerText"] @@ -409,13 +409,13 @@ "id": "a89f1b4d-10bd-48f7-9b97-865710cfe01f", "comment": "", "command": "click", - "target": "id=option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", + "target": "id=option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", "targets": [ - ["id=option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", "id"], + ["id=option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", "id"], ["linkText=PT1M", "linkText"], - ["css=#option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'PT1M')]", "xpath:innerText"] @@ -480,13 +480,13 @@ "id": "a4470d6f-04a7-4c4b-8c1e-70cff2f35e8a", "comment": "", "command": "click", - "target": "id=option-selector-root_metadataFilters_0_maxValidityInterval-item-1", + "target": "id=option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1", "targets": [ - ["id=option-selector-root_metadataFilters_0_maxValidityInterval-item-1", "id"], + ["id=option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_metadataFilters_0_maxValidityInterval-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_metadataFilters_0_maxValidityInterval-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_metadataFilters_0_maxValidityInterval']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_metadataFilters_0_maxValidityInterval']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] @@ -939,13 +939,13 @@ "id": "645be3e5-166a-4ef6-8e7f-18113387c3ab", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-0", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-0", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-0", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-0", "id"], ["linkText=urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-0", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-0']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_0']/a", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-0", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-0']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_0']/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '#')]", "xpath:href"], ["xpath=//div[2]/a", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified')]", "xpath:innerText"] @@ -976,10 +976,10 @@ "id": "5e8fc8bb-5cb8-4e25-b7ed-95a7cd4654e3", "comment": "", "command": "click", - "target": "css=#option-selector-root_relyingPartyOverrides_nameIdFormats_1-item-1 > span", + "target": "css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_1-item-1 > span", "targets": [ - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_1-item-1 > span", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_1-item-1']/span", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_1-item-1 > span", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_1-item-1']/span", "xpath:idRelative"], ["xpath=//a[2]/span", "xpath:position"], ["xpath=//span[contains(.,'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress')]", "xpath:innerText"] ], @@ -1013,10 +1013,10 @@ "id": "d195071e-6f5a-4eca-b618-c8b926dc7753", "comment": "", "command": "click", - "target": "css=#option-selector-root_relyingPartyOverrides_nameIdFormats_2-item-2 > span", + "target": "css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_2-item-2 > span", "targets": [ - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_2-item-2 > span", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_2-item-2']/span", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_2-item-2 > span", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_2-item-2']/span", "xpath:idRelative"], ["xpath=//a[3]/span", "xpath:position"], ["xpath=//span[contains(.,'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent')]", "xpath:innerText"] ], @@ -1047,13 +1047,13 @@ "id": "0aa7801a-8156-4b45-9947-b2e60218e503", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_3-item-3", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_3-item-3", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_3-item-3", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_3-item-3", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:nameid-format:transient", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_3-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_3-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_3']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_3-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_3-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_3']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:nameid-format:transient')]", "xpath:innerText"] @@ -1100,13 +1100,13 @@ "id": "22098498-fa16-468f-abfa-768e5736d317", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_4-item-4", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_4-item-4", "id"], ["linkText=someNameID", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_4']/a[5]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_4-item-4", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_4-item-4']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_4']/a[5]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[5]", "xpath:href"], ["xpath=//a[5]", "xpath:position"], ["xpath=//a[contains(.,'someNameID')]", "xpath:innerText"] @@ -1140,13 +1140,13 @@ "id": "9af0bdca-6c53-4192-8d51-1e6bb96fda3a", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_0-item-0", + "target": "id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_0-item-0", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_0-item-0", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_0-item-0", "id"], ["linkText=https://refeds.org/profile/mfa", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_0-item-0", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_0-item-0']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_0']/a", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_authenticationMethods_0-item-0", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_0-item-0']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_0']/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '#')]", "xpath:href"], ["xpath=//div[2]/a", "xpath:position"], ["xpath=//a[contains(.,'https://refeds.org/profile/mfa')]", "xpath:innerText"] @@ -1180,13 +1180,13 @@ "id": "c8ca751b-d9a3-4878-9be7-92befd0bc6a4", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_1-item-1", + "target": "id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_1-item-1", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_1-item-1", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_1-item-1", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:ac:classes:TimeSyncToken", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_1-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_1-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_1']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_authenticationMethods_1-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_1-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_1']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:ac:classes:TimeSyncToken')]", "xpath:innerText"] @@ -1220,10 +1220,10 @@ "id": "4aff346b-b423-4999-9e8b-b099f6b275ac", "comment": "", "command": "click", - "target": "css=#option-selector-root_relyingPartyOverrides_authenticationMethods_2-item-2 > span", + "target": "css=#option-selector-items-root_relyingPartyOverrides_authenticationMethods_2-item-2 > span", "targets": [ - ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_2-item-2 > span", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_2-item-2']/span", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_authenticationMethods_2-item-2 > span", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_2-item-2']/span", "xpath:idRelative"], ["xpath=//a[3]/span", "xpath:position"], ["xpath=//span[contains(.,'urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport')]", "xpath:innerText"] ], @@ -1268,13 +1268,13 @@ "id": "3d9af697-8021-4a7b-bc09-7fbcc501817e", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3", + "target": "id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_3-item-3", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_3-item-3", "id"], ["linkText=SomeAuthnMethod", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_3']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_authenticationMethods_3-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_3-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_3']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'SomeAuthnMethod')]", "xpath:innerText"] @@ -1501,13 +1501,13 @@ "id": "0513bc68-fb27-426e-8f51-4018c0e2497a", "comment": "", "command": "click", - "target": "id=option-selector-root_formats_0-item-0", + "target": "id=option-selector-items-root_formats_0-item-0", "targets": [ - ["id=option-selector-root_formats_0-item-0", "id"], + ["id=option-selector-items-root_formats_0-item-0", "id"], ["linkText=urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", "linkText"], - ["css=#option-selector-root_formats_0-item-0", "css:finder"], - ["xpath=//a[@id='option-selector-root_formats_0-item-0']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_formats_0']/a", "xpath:idRelative"], + ["css=#option-selector-items-root_formats_0-item-0", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_formats_0-item-0']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_formats_0']/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '#')]", "xpath:href"], ["xpath=//div[2]/a", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified')]", "xpath:innerText"] @@ -1542,13 +1542,13 @@ "id": "81d7e06f-ab01-4eb9-ab56-9e49508f2fbf", "comment": "", "command": "click", - "target": "id=option-selector-root_formats_1-item-1", + "target": "id=option-selector-items-root_formats_1-item-1", "targets": [ - ["id=option-selector-root_formats_1-item-1", "id"], + ["id=option-selector-items-root_formats_1-item-1", "id"], ["linkText=urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress", "linkText"], - ["css=#option-selector-root_formats_1-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_formats_1-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_formats_1']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_formats_1-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_formats_1-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_formats_1']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress')]", "xpath:innerText"] @@ -1583,13 +1583,13 @@ "id": "1e0353c9-84c4-4a62-9598-4c512e08fb4b", "comment": "", "command": "click", - "target": "id=option-selector-root_formats_2-item-2", + "target": "id=option-selector-items-root_formats_2-item-2", "targets": [ - ["id=option-selector-root_formats_2-item-2", "id"], + ["id=option-selector-items-root_formats_2-item-2", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:nameid-format:persistent", "linkText"], - ["css=#option-selector-root_formats_2-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_formats_2-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_formats_2']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_formats_2-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_formats_2-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_formats_2']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent')]", "xpath:innerText"] @@ -1617,13 +1617,13 @@ "id": "1f17992f-336f-4ab1-90fa-6b86c0c3aa4f", "comment": "", "command": "click", - "target": "id=option-selector-root_formats_3-item-3", + "target": "id=option-selector-items-root_formats_3-item-3", "targets": [ - ["id=option-selector-root_formats_3-item-3", "id"], + ["id=option-selector-items-root_formats_3-item-3", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:nameid-format:transient", "linkText"], - ["css=#option-selector-root_formats_3-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_formats_3-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_formats_3']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_formats_3-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_formats_3-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_formats_3']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:nameid-format:transient')]", "xpath:innerText"] @@ -1670,13 +1670,13 @@ "id": "875914ff-80a4-41cd-ab6c-602d1ddaaa8f", "comment": "", "command": "click", - "target": "id=option-selector-root_formats_4-item-4", + "target": "id=option-selector-items-root_formats_4-item-4", "targets": [ - ["id=option-selector-root_formats_4-item-4", "id"], + ["id=option-selector-items-root_formats_4-item-4", "id"], ["linkText=SomeOtherNameIDFormat", "linkText"], - ["css=#option-selector-root_formats_4-item-4", "css:finder"], - ["xpath=//a[@id='option-selector-root_formats_4-item-4']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_formats_4']/a[5]", "xpath:idRelative"], + ["css=#option-selector-items-root_formats_4-item-4", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_formats_4-item-4']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_formats_4']/a[5]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[5]", "xpath:href"], ["xpath=//a[5]", "xpath:position"], ["xpath=//a[contains(.,'SomeOtherNameIDFormat')]", "xpath:innerText"] @@ -1915,13 +1915,13 @@ "id": "6ebd7167-8187-4564-b441-213daa903faa", "comment": "", "command": "click", - "target": "id=option-selector-root_backupFileInitNextRefreshDelay-item-2", + "target": "id=option-selector-items-root_backupFileInitNextRefreshDelay-item-2", "targets": [ - ["id=option-selector-root_backupFileInitNextRefreshDelay-item-2", "id"], + ["id=option-selector-items-root_backupFileInitNextRefreshDelay-item-2", "id"], ["linkText=PT1M", "linkText"], - ["css=#option-selector-root_backupFileInitNextRefreshDelay-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_backupFileInitNextRefreshDelay-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_backupFileInitNextRefreshDelay']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_backupFileInitNextRefreshDelay-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_backupFileInitNextRefreshDelay-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_backupFileInitNextRefreshDelay']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'PT1M')]", "xpath:innerText"] @@ -2034,11 +2034,11 @@ "id": "63e1b12d-a50a-4877-9588-21209a08b364", "comment": "", "command": "assertText", - "target": "css=div:nth-child(7) .d-block:nth-child(2)", + "target": "css=section > div > div > section:nth-child(2) > div > div.p-2 > div:nth-child(2) > div:nth-child(8) > div > span:nth-child(2)", "targets": [ - ["css=div:nth-child(7) .d-block:nth-child(2)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[7]/div/span[2]", "xpath:idRelative"], - ["xpath=//div[7]/div/span[2]", "xpath:position"], + ["css=div:nth-child(8) > .bg-diff > .d-block:nth-child(2)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[8]/div/span[2]", "xpath:idRelative"], + ["xpath=//div[8]/div/span[2]", "xpath:position"], ["xpath=//span[contains(.,'PT1M')]", "xpath:innerText"] ], "value": "PT1M" @@ -2078,7 +2078,7 @@ "id": "75f45cb6-9c38-44e7-82dc-a473fa7fab62", "comment": "", "command": "assertText", - "target": "css=div:nth-child(2) > .d-flex > .d-block:nth-child(2)", + "target": "css=section > div > div > section:nth-child(2) > div > div.p-2 > div:nth-child(2) > div:nth-child(2) > div > span:nth-child(2)", "targets": [ ["css=div:nth-child(2) > .d-flex > .d-block:nth-child(2)", "css:finder"], ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[2]/div/span[2]", "xpath:idRelative"], diff --git a/backend/src/integration/resources/SHIBUI-1364-2.side b/backend/src/integration/resources/SHIBUI-1364-2.side index 4b731fdc4..784151a04 100644 --- a/backend/src/integration/resources/SHIBUI-1364-2.side +++ b/backend/src/integration/resources/SHIBUI-1364-2.side @@ -250,13 +250,13 @@ "id": "0f1a7a34-0955-45bb-bd2a-a5e4f246869b", "comment": "", "command": "click", - "target": "id=option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", + "target": "id=option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "targets": [ - ["id=option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "id"], + ["id=option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] @@ -292,13 +292,13 @@ "id": "80a08176-de7d-4938-8d49-1d296a8ba27c", "comment": "", "command": "click", - "target": "id=option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", + "target": "id=option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", "targets": [ - ["id=option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", "id"], + ["id=option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", "id"], ["linkText=PT1M", "linkText"], - ["css=#option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'PT1M')]", "xpath:innerText"] diff --git a/backend/src/integration/resources/SHIBUI-1364-3.side b/backend/src/integration/resources/SHIBUI-1364-3.side index a0e7435a9..af7d0bb84 100644 --- a/backend/src/integration/resources/SHIBUI-1364-3.side +++ b/backend/src/integration/resources/SHIBUI-1364-3.side @@ -249,13 +249,13 @@ "id": "443a9cfc-17c8-49da-9d87-bfabda8fd0b6", "comment": "", "command": "click", - "target": "id=option-selector-root_dynamicMetadataResolverAttributes_minCacheDuration-item-0", + "target": "id=option-selector-items-root_dynamicMetadataResolverAttributes_minCacheDuration-item-0", "targets": [ - ["id=option-selector-root_dynamicMetadataResolverAttributes_minCacheDuration-item-0", "id"], + ["id=option-selector-items-root_dynamicMetadataResolverAttributes_minCacheDuration-item-0", "id"], ["linkText=PT0S", "linkText"], - ["css=#option-selector-root_dynamicMetadataResolverAttributes_minCacheDuration-item-0", "css:finder"], - ["xpath=//a[@id='option-selector-root_dynamicMetadataResolverAttributes_minCacheDuration-item-0']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_dynamicMetadataResolverAttributes_minCacheDuration']/a", "xpath:idRelative"], + ["css=#option-selector-items-root_dynamicMetadataResolverAttributes_minCacheDuration-item-0", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_dynamicMetadataResolverAttributes_minCacheDuration-item-0']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_dynamicMetadataResolverAttributes_minCacheDuration']/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '#')]", "xpath:href"], ["xpath=//div[2]/a", "xpath:position"], ["xpath=//a[contains(.,'PT0S')]", "xpath:innerText"] @@ -291,13 +291,13 @@ "id": "c03be15d-ee34-4cd1-bac9-c52e3baa70a3", "comment": "", "command": "click", - "target": "id=option-selector-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-2", + "target": "id=option-selector-items-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-2", "targets": [ - ["id=option-selector-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-2", "id"], + ["id=option-selector-items-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-2", "id"], ["linkText=PT1M", "linkText"], - ["css=#option-selector-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_dynamicMetadataResolverAttributes_maxCacheDuration']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_dynamicMetadataResolverAttributes_maxCacheDuration']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'PT1M')]", "xpath:innerText"] @@ -333,13 +333,13 @@ "id": "dd663319-7eef-4301-a0d4-24d9583eab7f", "comment": "", "command": "click", - "target": "id=option-selector-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-1", + "target": "id=option-selector-items-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-1", "targets": [ - ["id=option-selector-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-1", "id"], + ["id=option-selector-items-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_dynamicMetadataResolverAttributes_maxIdleEntityData']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_dynamicMetadataResolverAttributes_maxIdleEntityData']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] @@ -388,13 +388,13 @@ "id": "e7f2439a-e9a1-4b23-b0b9-d992f5b477d4", "comment": "", "command": "click", - "target": "id=option-selector-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3", + "target": "id=option-selector-items-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3", "targets": [ - ["id=option-selector-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3", "id"], + ["id=option-selector-items-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3", "id"], ["linkText=PT10M", "linkText"], - ["css=#option-selector-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_dynamicMetadataResolverAttributes_cleanupTaskInterval']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_dynamicMetadataResolverAttributes_cleanupTaskInterval']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'PT10M')]", "xpath:innerText"] diff --git a/backend/src/integration/resources/SHIBUI-1364-4.side b/backend/src/integration/resources/SHIBUI-1364-4.side index 387405cbd..6096a62ac 100644 --- a/backend/src/integration/resources/SHIBUI-1364-4.side +++ b/backend/src/integration/resources/SHIBUI-1364-4.side @@ -305,13 +305,13 @@ "id": "b1ec3405-0d75-45d6-8986-51c2f09c4dc4", "comment": "", "command": "click", - "target": "id=option-selector-root_dynamicMetadataResolverAttributes_minCacheDuration-item-1", + "target": "id=option-selector-items-root_dynamicMetadataResolverAttributes_minCacheDuration-item-1", "targets": [ - ["id=option-selector-root_dynamicMetadataResolverAttributes_minCacheDuration-item-1", "id"], + ["id=option-selector-items-root_dynamicMetadataResolverAttributes_minCacheDuration-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_dynamicMetadataResolverAttributes_minCacheDuration-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_dynamicMetadataResolverAttributes_minCacheDuration-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_dynamicMetadataResolverAttributes_minCacheDuration']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_dynamicMetadataResolverAttributes_minCacheDuration-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_dynamicMetadataResolverAttributes_minCacheDuration-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_dynamicMetadataResolverAttributes_minCacheDuration']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] @@ -347,13 +347,13 @@ "id": "87084a6a-8e89-4c00-a3d9-c104107a3ba2", "comment": "", "command": "click", - "target": "id=option-selector-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-3", + "target": "id=option-selector-items-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-3", "targets": [ - ["id=option-selector-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-3", "id"], + ["id=option-selector-items-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-3", "id"], ["linkText=PT10M", "linkText"], - ["css=#option-selector-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_dynamicMetadataResolverAttributes_maxCacheDuration']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_dynamicMetadataResolverAttributes_maxCacheDuration-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_dynamicMetadataResolverAttributes_maxCacheDuration']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'PT10M')]", "xpath:innerText"] @@ -389,13 +389,13 @@ "id": "d477fd6a-2c15-4fb6-a199-d49aa495ef94", "comment": "", "command": "click", - "target": "id=option-selector-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-2", + "target": "id=option-selector-items-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-2", "targets": [ - ["id=option-selector-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-2", "id"], + ["id=option-selector-items-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-2", "id"], ["linkText=PT1M", "linkText"], - ["css=#option-selector-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_dynamicMetadataResolverAttributes_maxIdleEntityData']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_dynamicMetadataResolverAttributes_maxIdleEntityData-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_dynamicMetadataResolverAttributes_maxIdleEntityData']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'PT1M')]", "xpath:innerText"] @@ -444,13 +444,13 @@ "id": "bf855df4-326e-484e-9022-d2c84e09e6f3", "comment": "", "command": "click", - "target": "id=option-selector-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3", + "target": "id=option-selector-items-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3", "targets": [ - ["id=option-selector-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3", "id"], + ["id=option-selector-items-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3", "id"], ["linkText=PT10M", "linkText"], - ["css=#option-selector-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_dynamicMetadataResolverAttributes_cleanupTaskInterval']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_dynamicMetadataResolverAttributes_cleanupTaskInterval-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_dynamicMetadataResolverAttributes_cleanupTaskInterval']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'PT10M')]", "xpath:innerText"] @@ -536,13 +536,13 @@ "id": "22f7bf37-718c-4126-867b-67a383eefff5", "comment": "", "command": "click", - "target": "id=option-selector-root_metadataFilters_0_maxValidityInterval-item-2", + "target": "id=option-selector-items-root_metadataFilters_0_maxValidityInterval-item-2", "targets": [ - ["id=option-selector-root_metadataFilters_0_maxValidityInterval-item-2", "id"], + ["id=option-selector-items-root_metadataFilters_0_maxValidityInterval-item-2", "id"], ["linkText=PT1M", "linkText"], - ["css=#option-selector-root_metadataFilters_0_maxValidityInterval-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_metadataFilters_0_maxValidityInterval-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_metadataFilters_0_maxValidityInterval']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_metadataFilters_0_maxValidityInterval-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_metadataFilters_0_maxValidityInterval-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_metadataFilters_0_maxValidityInterval']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'PT1M')]", "xpath:innerText"] @@ -858,13 +858,13 @@ "id": "bbe6893b-033c-4a57-9065-afe00d75a818", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-2", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-2", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-2", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-2", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:nameid-format:persistent", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_0']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_0']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent')]", "xpath:innerText"] diff --git a/backend/src/integration/resources/SHIBUI-1385-1.side b/backend/src/integration/resources/SHIBUI-1385-1.side index 05225b3f6..8c2dcc5cb 100644 --- a/backend/src/integration/resources/SHIBUI-1385-1.side +++ b/backend/src/integration/resources/SHIBUI-1385-1.side @@ -617,13 +617,13 @@ "id": "9033e5ad-4255-4aa7-a878-c7beab69ee8e", "comment": "", "command": "click", - "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0", + "target": "id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0", "targets": [ - ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0", "id"], + ["id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0", "id"], ["linkText=urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", "linkText"], - ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0", "css:finder"], - ["xpath=//a[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_0']/a", "xpath:idRelative"], + ["css=#option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_0']/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '#')]", "xpath:href"], ["xpath=//div[2]/a", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified')]", "xpath:innerText"] @@ -672,13 +672,13 @@ "id": "d07b2d83-3699-4f48-90e8-6fc883d3a02a", "comment": "", "command": "click", - "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1", + "target": "id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1", "targets": [ - ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1", "id"], + ["id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1", "id"], ["linkText=urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress", "linkText"], - ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_1']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_1']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress')]", "xpath:innerText"] @@ -727,13 +727,13 @@ "id": "686e004c-2b0f-4308-8622-b04bc05a50a9", "comment": "", "command": "click", - "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2", + "target": "id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2", "targets": [ - ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2", "id"], + ["id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:nameid-format:persistent", "linkText"], - ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_2']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_2']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent')]", "xpath:innerText"] @@ -782,13 +782,13 @@ "id": "b6ac5230-772b-44bc-b9d1-6ae8a58e0368", "comment": "", "command": "click", - "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3", + "target": "id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3", "targets": [ - ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3", "id"], + ["id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:nameid-format:transient", "linkText"], - ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_3']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_3']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:nameid-format:transient')]", "xpath:innerText"] @@ -823,13 +823,13 @@ "id": "ac842b8d-4596-4749-85c6-4657cb499b83", "comment": "", "command": "click", - "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", + "target": "id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "targets": [ - ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "id"], + ["id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "id"], ["linkText=somethingElse", "linkText"], - ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "css:finder"], - ["xpath=//a[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4']/a[5]", "xpath:idRelative"], + ["css=#option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_4']/a[5]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[5]", "xpath:href"], ["xpath=//a[5]", "xpath:position"], ["xpath=//a[contains(.,'somethingElse')]", "xpath:innerText"] @@ -1467,13 +1467,13 @@ "id": "6e8718ef-e053-48d8-91e5-f5128e371f56", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-0", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-0", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-0", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-0", "id"], ["linkText=urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-0", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-0']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_0']/a", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-0", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-0']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_0']/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '#')]", "xpath:href"], ["xpath=//div[2]/a", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified')]", "xpath:innerText"] @@ -1522,13 +1522,13 @@ "id": "3cd47415-5e57-4148-a40b-9571e6791f3f", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_1-item-1", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_1-item-1", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_1-item-1", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_1-item-1", "id"], ["linkText=urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_1-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_1-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_1']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_1-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_1-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_1']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress')]", "xpath:innerText"] @@ -1577,13 +1577,13 @@ "id": "b4beb2b3-8481-4431-9299-a39a4107f17f", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_2-item-2", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_2-item-2", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_2-item-2", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_2-item-2", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:nameid-format:persistent", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_2-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_2-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_2']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_2-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_2-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_2']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent')]", "xpath:innerText"] @@ -1632,13 +1632,13 @@ "id": "c82d6951-13e2-4d32-9e19-eac52bfdc188", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_3-item-3", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_3-item-3", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_3-item-3", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_3-item-3", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:nameid-format:transient", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_3-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_3-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_3']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_3-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_3-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_3']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:nameid-format:transient')]", "xpath:innerText"] @@ -1686,13 +1686,13 @@ "id": "d378468f-965e-4d99-8429-2e4100b3a161", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_4-item-4", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_4-item-4", "id"], ["linkText=somethingElse", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_4']/a[5]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_4-item-4", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_4-item-4']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_4']/a[5]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[5]", "xpath:href"], ["xpath=//a[5]", "xpath:position"], ["xpath=//a[contains(.,'somethingElse')]", "xpath:innerText"] @@ -1740,7 +1740,7 @@ "id": "6c62d514-0143-49d9-97b3-6b7cb443df9d", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_0-item-0", + "target": "id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_0-item-0", "targets": [ ["id=/relyingPartyOverrides/authenticationMethods/0__option--0", "id"], ["css=#\\/relyingPartyOverrides\\/authenticationMethods\\/0__option--0", "css:finder"], @@ -1791,7 +1791,7 @@ "id": "5a32d59b-1ac3-4cd0-a2d8-0e934f8182fd", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_1-item-1", + "target": "id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_1-item-1", "targets": [ ["id=/relyingPartyOverrides/authenticationMethods/1__option--1", "id"], ["css=#\\/relyingPartyOverrides\\/authenticationMethods\\/1__option--1", "css:finder"], @@ -1842,13 +1842,13 @@ "id": "6a7bce1a-34be-4d4c-b732-d2f198e8b8a1", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_2-item-2", + "target": "id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_2-item-2", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_2-item-2", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_2-item-2", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_2-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_2-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_2']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_authenticationMethods_2-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_2-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_2']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport')]", "xpath:innerText"] @@ -1896,13 +1896,13 @@ "id": "e9e0639e-2f65-43eb-af05-e0565591dbdc", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3", + "target": "id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_3-item-3", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_3-item-3", "id"], ["linkText=otherThings", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_3']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_authenticationMethods_3-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_3-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_3']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'otherThings')]", "xpath:innerText"] @@ -2203,10 +2203,10 @@ "id": "3f2c3eab-ecbf-45f3-bcdc-a5cad766b27c", "comment": "", "command": "assertText", - "target": "css=div:nth-child(2) > div:nth-child(4) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block", + "target": "css=div:nth-child(5) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block", "targets": [ - ["css=div:nth-child(2) > div:nth-child(4) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div[2]/div[3]/span", "xpath:idRelative"], + ["css=div:nth-child(5) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[5]/div[2]/div[3]/span", "xpath:idRelative"], ["xpath=//div[3]/span", "xpath:position"], ["xpath=//span[contains(.,'user@test.org')]", "xpath:innerText"] ], diff --git a/backend/src/integration/resources/SHIBUI-1385-2.side b/backend/src/integration/resources/SHIBUI-1385-2.side index ec627f3c6..57e73890b 100644 --- a/backend/src/integration/resources/SHIBUI-1385-2.side +++ b/backend/src/integration/resources/SHIBUI-1385-2.side @@ -272,13 +272,13 @@ "id": "5fc6a348-0533-4d94-bb76-ebb891a0db8f", "comment": "", "command": "click", - "target": "id=option-selector-root_backupFileInitNextRefreshDelay-item-1", + "target": "id=option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "targets": [ - ["id=option-selector-root_backupFileInitNextRefreshDelay-item-1", "id"], + ["id=option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_backupFileInitNextRefreshDelay-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_backupFileInitNextRefreshDelay-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_backupFileInitNextRefreshDelay']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_backupFileInitNextRefreshDelay-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_backupFileInitNextRefreshDelay']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] @@ -377,13 +377,13 @@ "id": "a159e056-c870-4e02-a7e9-4b3a60d83718", "comment": "", "command": "click", - "target": "id=option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", + "target": "id=option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "targets": [ - ["id=option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "id"], + ["id=option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] @@ -419,13 +419,13 @@ "id": "820397f5-aabb-46f5-a65a-56747ce29091", "comment": "", "command": "click", - "target": "id=option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", + "target": "id=option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "targets": [ - ["id=option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "id"], + ["id=option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "id"], ["linkText=PT10M", "linkText"], - ["css=#option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'PT10M')]", "xpath:innerText"] @@ -484,13 +484,13 @@ "id": "b8d999f1-0c59-4a9a-9991-91d222f52b8e", "comment": "", "command": "click", - "target": "id=option-selector-root_metadataFilters_0_maxValidityInterval-item-1", + "target": "id=option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1", "targets": [ - ["id=option-selector-root_metadataFilters_0_maxValidityInterval-item-1", "id"], + ["id=option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_metadataFilters_0_maxValidityInterval-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_metadataFilters_0_maxValidityInterval-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_metadataFilters_0_maxValidityInterval']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_metadataFilters_0_maxValidityInterval']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] @@ -841,7 +841,7 @@ "id": "ce328b6a-f6ee-45e9-975c-5a5608f373dc", "comment": "", "command": "waitForElementVisible", - "target": "css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", + "target": "css=div:nth-child(4) > .bg-diff > .d-block:nth-child(2)", "targets": [ ["css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", "css:finder"], ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[2]", "xpath:idRelative"], @@ -853,11 +853,11 @@ "id": "68103f0e-e3f1-419b-903d-5d8c30bc6700", "comment": "", "command": "assertText", - "target": "css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", + "target": "css=div:nth-child(4) > .bg-diff > .d-block:nth-child(2)", "targets": [ - ["css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[2]", "xpath:idRelative"], - ["xpath=//div[3]/div/span[2]", "xpath:position"], + ["css=div:nth-child(4) > .bg-diff > .d-block:nth-child(2)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div/span[2]", "xpath:idRelative"], + ["xpath=//div[4]/div/span[2]", "xpath:position"], ["xpath=//span[contains(.,'123 version 2')]", "xpath:innerText"] ], "value": "123 version 2" @@ -865,7 +865,7 @@ "id": "7c42f2aa-9628-43e0-8eda-92105288270c", "comment": "", "command": "waitForElementVisible", - "target": "css=div:nth-child(3) > .bg-diff > .d-block:nth-child(3)", + "target": "css=div:nth-child(4) > .bg-diff > .d-block:nth-child(3)", "targets": [ ["css=div:nth-child(3) > .bg-diff > .d-block:nth-child(3)", "css:finder"], ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[3]", "xpath:idRelative"], @@ -876,33 +876,33 @@ "id": "a13198b9-7827-47e2-ade3-143b981d34ee", "comment": "", "command": "assertText", - "target": "css=div:nth-child(3) > .bg-diff > .d-block:nth-child(3)", + "target": "css=div:nth-child(4) > .bg-diff > .d-block:nth-child(3)", "targets": [ - ["css=div:nth-child(3) > .bg-diff > .d-block:nth-child(3)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[3]", "xpath:idRelative"], - ["xpath=//div[3]/div/span[3]", "xpath:position"] + ["css=div:nth-child(4) > .bg-diff > .d-block:nth-child(3)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div/span[3]", "xpath:idRelative"], + ["xpath=//div[4]/div/span[3]", "xpath:position"] ], "value": "123" }, { "id": "3d83741c-299e-4fcb-9ce6-4b7291c423a4", "comment": "", "command": "assertText", - "target": "css=div:nth-child(11) > .bg-diff > .d-block:nth-child(2)", + "target": "css=div:nth-child(12) > .bg-diff > .d-block:nth-child(2)", "targets": [ - ["css=div:nth-child(11) > .bg-diff > .d-block:nth-child(2)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[11]/div/span[2]", "xpath:idRelative"], - ["xpath=//div[11]/div/span[2]", "xpath:position"] + ["css=div:nth-child(12) > .bg-diff > .d-block:nth-child(2)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[12]/div/span[2]", "xpath:idRelative"], + ["xpath=//div[12]/div/span[2]", "xpath:position"] ], "value": "false" }, { "id": "190cc157-d427-4046-aff2-180392395ad3", "comment": "", "command": "assertText", - "target": "css=div:nth-child(11) > .bg-diff > .d-block:nth-child(3)", + "target": "css=div:nth-child(12) > .bg-diff > .d-block:nth-child(3)", "targets": [ - ["css=div:nth-child(11) > .bg-diff > .d-block:nth-child(3)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[11]/div/span[3]", "xpath:idRelative"], - ["xpath=//div[11]/div/span[3]", "xpath:position"], + ["css=div:nth-child(12) > .bg-diff > .d-block:nth-child(3)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[12]/div/span[3]", "xpath:idRelative"], + ["xpath=//div[12]/div/span[3]", "xpath:position"], ["xpath=//span[contains(.,'true')]", "xpath:innerText"] ], "value": "true" @@ -1022,13 +1022,13 @@ "id": "8ba62572-354d-47f4-bb72-f9309c1cb201", "comment": "", "command": "click", - "target": "id=option-selector-root_httpMetadataResolverAttributes_connectionRequestTimeout-item-1", + "target": "id=option-selector-items-root_httpMetadataResolverAttributes_connectionRequestTimeout-item-1", "targets": [ - ["id=option-selector-root_httpMetadataResolverAttributes_connectionRequestTimeout-item-1", "id"], + ["id=option-selector-items-root_httpMetadataResolverAttributes_connectionRequestTimeout-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_httpMetadataResolverAttributes_connectionRequestTimeout-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_httpMetadataResolverAttributes_connectionRequestTimeout-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_httpMetadataResolverAttributes_connectionRequestTimeout']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_httpMetadataResolverAttributes_connectionRequestTimeout-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_httpMetadataResolverAttributes_connectionRequestTimeout-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_httpMetadataResolverAttributes_connectionRequestTimeout']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] @@ -1064,13 +1064,13 @@ "id": "337ac160-7990-425f-83da-2788d8a0985e", "comment": "", "command": "click", - "target": "id=option-selector-root_httpMetadataResolverAttributes_connectionTimeout-item-2", + "target": "id=option-selector-items-root_httpMetadataResolverAttributes_connectionTimeout-item-2", "targets": [ - ["id=option-selector-root_httpMetadataResolverAttributes_connectionTimeout-item-2", "id"], + ["id=option-selector-items-root_httpMetadataResolverAttributes_connectionTimeout-item-2", "id"], ["linkText=PT1M", "linkText"], - ["css=#option-selector-root_httpMetadataResolverAttributes_connectionTimeout-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_httpMetadataResolverAttributes_connectionTimeout-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_httpMetadataResolverAttributes_connectionTimeout']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_httpMetadataResolverAttributes_connectionTimeout-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_httpMetadataResolverAttributes_connectionTimeout-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_httpMetadataResolverAttributes_connectionTimeout']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'PT1M')]", "xpath:innerText"] @@ -1106,13 +1106,13 @@ "id": "34693225-4754-4b27-92ee-3e37304a8cd7", "comment": "", "command": "click", - "target": "id=option-selector-root_httpMetadataResolverAttributes_socketTimeout-item-3", + "target": "id=option-selector-items-root_httpMetadataResolverAttributes_socketTimeout-item-3", "targets": [ - ["id=option-selector-root_httpMetadataResolverAttributes_socketTimeout-item-3", "id"], + ["id=option-selector-items-root_httpMetadataResolverAttributes_socketTimeout-item-3", "id"], ["linkText=PT10M", "linkText"], - ["css=#option-selector-root_httpMetadataResolverAttributes_socketTimeout-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_httpMetadataResolverAttributes_socketTimeout-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_httpMetadataResolverAttributes_socketTimeout']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_httpMetadataResolverAttributes_socketTimeout-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_httpMetadataResolverAttributes_socketTimeout-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_httpMetadataResolverAttributes_socketTimeout']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'PT10M')]", "xpath:innerText"] @@ -1351,11 +1351,11 @@ "id": "30aae338-393c-4312-8ccc-f3fd8acb3aad", "comment": "", "command": "assertText", - "target": "css=div:nth-child(2) > div:nth-child(3) .text-truncate", + "target": "css=div:nth-child(2) > div:nth-child(4) .text-truncate", "targets": [ - ["css=div:nth-child(2) > div:nth-child(3) .text-truncate", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[2]", "xpath:idRelative"], - ["xpath=//div[3]/div/span[2]", "xpath:position"], + ["css=div:nth-child(2) > div:nth-child(4) .text-truncate", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div/span[2]", "xpath:idRelative"], + ["xpath=//div[4]/div/span[2]", "xpath:position"], ["xpath=//span[contains(.,'123 version 2')]", "xpath:innerText"] ], "value": "123 version 2" @@ -1416,7 +1416,7 @@ "id": "20bfdc06-e12b-4287-ad14-3ca578d84de1", "comment": "", "command": "waitForElementVisible", - "target": "css=div:nth-child(2) > div:nth-child(3) .d-block:nth-child(2)", + "target": "css=div:nth-child(2) > div:nth-child(4) .d-block:nth-child(2)", "targets": [ ["css=div:nth-child(2) > div:nth-child(3) .d-block:nth-child(2)", "css:finder"], ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[2]", "xpath:idRelative"], @@ -1428,11 +1428,11 @@ "id": "a6c78ab6-5584-490f-9bfd-b1eda70b864b", "comment": "", "command": "assertText", - "target": "css=div:nth-child(2) > div:nth-child(3) .d-block:nth-child(2)", + "target": "css=div:nth-child(2) > div:nth-child(4) .d-block:nth-child(2)", "targets": [ - ["css=div:nth-child(2) > div:nth-child(3) .d-block:nth-child(2)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[2]", "xpath:idRelative"], - ["xpath=//div[3]/div/span[2]", "xpath:position"], + ["css=div:nth-child(2) > div:nth-child(4) .d-block:nth-child(2)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div/span[2]", "xpath:idRelative"], + ["xpath=//div[4]/div/span[2]", "xpath:position"], ["xpath=//span[contains(.,'123 version 2')]", "xpath:innerText"] ], "value": "123 version 2" @@ -1451,11 +1451,11 @@ "id": "17832263-6fd7-4df8-86ba-f3e2fdc5d8ce", "comment": "", "command": "assertText", - "target": "css=div:nth-child(2) > div:nth-child(3) .d-block:nth-child(3)", + "target": "css=div:nth-child(2) > div:nth-child(4) .d-block:nth-child(3)", "targets": [ - ["css=div:nth-child(2) > div:nth-child(3) .d-block:nth-child(3)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[3]", "xpath:idRelative"], - ["xpath=//div[3]/div/span[3]", "xpath:position"] + ["css=div:nth-child(2) > div:nth-child(4) .d-block:nth-child(3)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div/span[3]", "xpath:idRelative"], + ["xpath=//div[4]/div/span[3]", "xpath:position"] ], "value": "123 version 2" }, { diff --git a/backend/src/integration/resources/SHIBUI-1391.side b/backend/src/integration/resources/SHIBUI-1391.side index d2c80fcac..aae00f2ab 100644 --- a/backend/src/integration/resources/SHIBUI-1391.side +++ b/backend/src/integration/resources/SHIBUI-1391.side @@ -245,13 +245,13 @@ "id": "35dfa0f8-c0f2-4356-a6b0-18b5dc35337b", "comment": "", "command": "click", - "target": "id=option-selector-root_backupFileInitNextRefreshDelay-item-1", + "target": "id=option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "targets": [ - ["id=option-selector-root_backupFileInitNextRefreshDelay-item-1", "id"], + ["id=option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_backupFileInitNextRefreshDelay-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_backupFileInitNextRefreshDelay-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_backupFileInitNextRefreshDelay']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_backupFileInitNextRefreshDelay-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_backupFileInitNextRefreshDelay']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] @@ -331,13 +331,13 @@ "id": "d5bc189f-eb4f-4378-9507-c82d98d8ecb4", "comment": "", "command": "click", - "target": "id=option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-0", + "target": "id=option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-0", "targets": [ - ["id=option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-0", "id"], + ["id=option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-0", "id"], ["linkText=PT0S", "linkText"], - ["css=#option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-0", "css:finder"], - ["xpath=//a[@id='option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-0']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay']/a", "xpath:idRelative"], + ["css=#option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-0", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-0']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay']/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '#')]", "xpath:href"], ["xpath=//div[2]/a", "xpath:position"], ["xpath=//a[contains(.,'PT0S')]", "xpath:innerText"] @@ -373,13 +373,13 @@ "id": "a89f1b4d-10bd-48f7-9b97-865710cfe01f", "comment": "", "command": "click", - "target": "id=option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", + "target": "id=option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", "targets": [ - ["id=option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", "id"], + ["id=option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", "id"], ["linkText=PT1M", "linkText"], - ["css=#option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'PT1M')]", "xpath:innerText"] @@ -437,13 +437,13 @@ "id": "a4470d6f-04a7-4c4b-8c1e-70cff2f35e8a", "comment": "", "command": "click", - "target": "id=option-selector-root_metadataFilters_0_maxValidityInterval-item-1", + "target": "id=option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1", "targets": [ - ["id=option-selector-root_metadataFilters_0_maxValidityInterval-item-1", "id"], + ["id=option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_metadataFilters_0_maxValidityInterval-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_metadataFilters_0_maxValidityInterval-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_metadataFilters_0_maxValidityInterval']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_metadataFilters_0_maxValidityInterval']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] diff --git a/backend/src/integration/resources/SHIBUI-1407-1.side b/backend/src/integration/resources/SHIBUI-1407-1.side index 8a6f6aaab..2a587d5ce 100644 --- a/backend/src/integration/resources/SHIBUI-1407-1.side +++ b/backend/src/integration/resources/SHIBUI-1407-1.side @@ -610,13 +610,13 @@ "id": "9033e5ad-4255-4aa7-a878-c7beab69ee8e", "comment": "", "command": "click", - "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0", + "target": "id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0", "targets": [ - ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0", "id"], + ["id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0", "id"], ["linkText=urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", "linkText"], - ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0", "css:finder"], - ["xpath=//a[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_0']/a", "xpath:idRelative"], + ["css=#option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_0-item-0']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_0']/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '#')]", "xpath:href"], ["xpath=//div[2]/a", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified')]", "xpath:innerText"] @@ -665,13 +665,13 @@ "id": "d07b2d83-3699-4f48-90e8-6fc883d3a02a", "comment": "", "command": "click", - "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1", + "target": "id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1", "targets": [ - ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1", "id"], + ["id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1", "id"], ["linkText=urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress", "linkText"], - ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_1']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_1-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_1']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress')]", "xpath:innerText"] @@ -720,13 +720,13 @@ "id": "686e004c-2b0f-4308-8622-b04bc05a50a9", "comment": "", "command": "click", - "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2", + "target": "id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2", "targets": [ - ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2", "id"], + ["id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:nameid-format:persistent", "linkText"], - ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_2']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_2-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_2']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent')]", "xpath:innerText"] @@ -775,13 +775,13 @@ "id": "b6ac5230-772b-44bc-b9d1-6ae8a58e0368", "comment": "", "command": "click", - "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3", + "target": "id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3", "targets": [ - ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3", "id"], + ["id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:nameid-format:transient", "linkText"], - ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_3']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_3-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_3']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:nameid-format:transient')]", "xpath:innerText"] @@ -817,13 +817,13 @@ "id": "ce53cbc9-f15b-416c-9201-a56366e1837f", "comment": "", "command": "click", - "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", + "target": "id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "targets": [ - ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "id"], + ["id=option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "id"], ["linkText=somethingElse", "linkText"], - ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "css:finder"], - ["xpath=//a[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4']/a[5]", "xpath:idRelative"], + ["css=#option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_serviceProviderSsoDescriptor_nameIdFormats_4']/a[5]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[5]", "xpath:href"], ["xpath=//a[5]", "xpath:position"], ["xpath=//a[contains(.,'somethingElse')]", "xpath:innerText"] @@ -1461,13 +1461,13 @@ "id": "6e8718ef-e053-48d8-91e5-f5128e371f56", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-0", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-0", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-0", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-0", "id"], ["linkText=urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-0", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_0-item-0']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_0']/a", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-0", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_0-item-0']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_0']/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '#')]", "xpath:href"], ["xpath=//div[2]/a", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified')]", "xpath:innerText"] @@ -1513,13 +1513,13 @@ "id": "3cd47415-5e57-4148-a40b-9571e6791f3f", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_1-item-1", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_1-item-1", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_1-item-1", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_1-item-1", "id"], ["linkText=urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_1-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_1-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_1']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_1-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_1-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_1']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress')]", "xpath:innerText"] @@ -1568,13 +1568,13 @@ "id": "b4beb2b3-8481-4431-9299-a39a4107f17f", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_2-item-2", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_2-item-2", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_2-item-2", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_2-item-2", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:nameid-format:persistent", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_2-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_2-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_2']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_2-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_2-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_2']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent')]", "xpath:innerText"] @@ -1623,13 +1623,13 @@ "id": "c82d6951-13e2-4d32-9e19-eac52bfdc188", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_3-item-3", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_3-item-3", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_3-item-3", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_3-item-3", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:nameid-format:transient", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_3-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_3-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_3']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_3-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_3-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_3']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:nameid-format:transient')]", "xpath:innerText"] @@ -1678,13 +1678,13 @@ "id": "c8bb3bee-3d61-4324-a3aa-38b78232b969", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4", + "target": "id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_4-item-4", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_nameIdFormats_4-item-4", "id"], ["linkText=somethingElse", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_4']/a[5]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_nameIdFormats_4-item-4", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_4-item-4']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_nameIdFormats_4']/a[5]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[5]", "xpath:href"], ["xpath=//a[5]", "xpath:position"], ["xpath=//a[contains(.,'somethingElse')]", "xpath:innerText"] @@ -1739,13 +1739,13 @@ "id": "6c62d514-0143-49d9-97b3-6b7cb443df9d", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_0-item-0", + "target": "id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_0-item-0", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_0-item-0", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_0-item-0", "id"], ["linkText=https://refeds.org/profile/mfa", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_0-item-0", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_0-item-0']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_0']/a", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_authenticationMethods_0-item-0", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_0-item-0']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_0']/a", "xpath:idRelative"], ["xpath=//a[contains(@href, '#')]", "xpath:href"], ["xpath=//div[2]/a", "xpath:position"], ["xpath=//a[contains(.,'https://refeds.org/profile/mfa')]", "xpath:innerText"] @@ -1793,13 +1793,13 @@ "id": "5a32d59b-1ac3-4cd0-a2d8-0e934f8182fd", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_1-item-1", + "target": "id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_1-item-1", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_1-item-1", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_1-item-1", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:ac:classes:TimeSyncToken", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_1-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_1-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_1']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_authenticationMethods_1-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_1-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_1']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:ac:classes:TimeSyncToken')]", "xpath:innerText"] @@ -1847,13 +1847,13 @@ "id": "6a7bce1a-34be-4d4c-b732-d2f198e8b8a1", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_2-item-2", + "target": "id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_2-item-2", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_2-item-2", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_2-item-2", "id"], ["linkText=urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_2-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_2-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_2']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_authenticationMethods_2-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_2-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_2']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//a[3]", "xpath:position"], ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport')]", "xpath:innerText"] @@ -1901,13 +1901,13 @@ "id": "74827780-a9c2-49c6-a709-7578597bf20d", "comment": "", "command": "click", - "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3", + "target": "id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_3-item-3", "targets": [ - ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3", "id"], + ["id=option-selector-items-root_relyingPartyOverrides_authenticationMethods_3-item-3", "id"], ["linkText=otherThings", "linkText"], - ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_3']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_relyingPartyOverrides_authenticationMethods_3-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_3-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_relyingPartyOverrides_authenticationMethods_3']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'otherThings')]", "xpath:innerText"] @@ -2197,10 +2197,10 @@ "id": "3f2c3eab-ecbf-45f3-bcdc-a5cad766b27c", "comment": "", "command": "assertText", - "target": "css=div:nth-child(2) > div:nth-child(4) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block", + "target": "css=div:nth-child(5) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block", "targets": [ - ["css=div:nth-child(2) > div:nth-child(4) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div[2]/div[3]/span", "xpath:idRelative"], + ["css=div:nth-child(5) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[5]/div[2]/div[3]/span", "xpath:idRelative"], ["xpath=//div[3]/span", "xpath:position"], ["xpath=//span[contains(.,'user@test.org')]", "xpath:innerText"] ], @@ -2532,7 +2532,7 @@ "id": "e9c047ad-fd1f-4ee8-bedb-3750f0c553e4", "comment": "", "command": "storeAttribute", - "target": "xpath=//section[1]/div/div[2]/div[2]/div[4]@class", + "target": "xpath=//section[1]/div/div[2]/div[2]/div[5]@class", "targets": [], "value": "classes" }, { diff --git a/backend/src/integration/resources/SHIBUI-1407-2.side b/backend/src/integration/resources/SHIBUI-1407-2.side index 798c1e1a3..5ddb62a47 100644 --- a/backend/src/integration/resources/SHIBUI-1407-2.side +++ b/backend/src/integration/resources/SHIBUI-1407-2.side @@ -272,13 +272,13 @@ "id": "5fc6a348-0533-4d94-bb76-ebb891a0db8f", "comment": "", "command": "click", - "target": "id=option-selector-root_backupFileInitNextRefreshDelay-item-1", + "target": "id=option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "targets": [ - ["id=option-selector-root_backupFileInitNextRefreshDelay-item-1", "id"], + ["id=option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_backupFileInitNextRefreshDelay-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_backupFileInitNextRefreshDelay-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_backupFileInitNextRefreshDelay']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_backupFileInitNextRefreshDelay-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_backupFileInitNextRefreshDelay']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] @@ -377,13 +377,13 @@ "id": "a159e056-c870-4e02-a7e9-4b3a60d83718", "comment": "", "command": "click", - "target": "id=option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", + "target": "id=option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "targets": [ - ["id=option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "id"], + ["id=option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] @@ -419,13 +419,13 @@ "id": "820397f5-aabb-46f5-a65a-56747ce29091", "comment": "", "command": "click", - "target": "id=option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", + "target": "id=option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "targets": [ - ["id=option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "id"], + ["id=option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "id"], ["linkText=PT10M", "linkText"], - ["css=#option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "css:finder"], - ["xpath=//a[@id='option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay']/a[4]", "xpath:idRelative"], + ["css=#option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay']/a[4]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"], ["xpath=//a[4]", "xpath:position"], ["xpath=//a[contains(.,'PT10M')]", "xpath:innerText"] @@ -491,13 +491,13 @@ "id": "b8d999f1-0c59-4a9a-9991-91d222f52b8e", "comment": "", "command": "click", - "target": "id=option-selector-root_metadataFilters_0_maxValidityInterval-item-1", + "target": "id=option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1", "targets": [ - ["id=option-selector-root_metadataFilters_0_maxValidityInterval-item-1", "id"], + ["id=option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_metadataFilters_0_maxValidityInterval-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_metadataFilters_0_maxValidityInterval-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_metadataFilters_0_maxValidityInterval']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_metadataFilters_0_maxValidityInterval']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] @@ -848,7 +848,7 @@ "id": "ce328b6a-f6ee-45e9-975c-5a5608f373dc", "comment": "", "command": "waitForElementVisible", - "target": "css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", + "target": "css=div:nth-child(4) > .bg-diff > .d-block:nth-child(2)", "targets": [ ["css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", "css:finder"], ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[2]", "xpath:idRelative"], @@ -860,11 +860,11 @@ "id": "68103f0e-e3f1-419b-903d-5d8c30bc6700", "comment": "", "command": "assertText", - "target": "css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", + "target": "css=div:nth-child(4) > .bg-diff > .d-block:nth-child(2)", "targets": [ - ["css=div:nth-child(3) > .bg-diff > .d-block:nth-child(2)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[2]", "xpath:idRelative"], - ["xpath=//div[3]/div/span[2]", "xpath:position"], + ["css=div:nth-child(4) > .bg-diff > .d-block:nth-child(2)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div/span[2]", "xpath:idRelative"], + ["xpath=//div[4]/div/span[2]", "xpath:position"], ["xpath=//span[contains(.,'123 version 2')]", "xpath:innerText"] ], "value": "123 version 2" @@ -872,7 +872,7 @@ "id": "135a8cb5-7454-46af-8fb7-5fc72e206237", "comment": "", "command": "waitForElementVisible", - "target": "css=div:nth-child(3) > .bg-diff > .d-block:nth-child(3)", + "target": "css=div:nth-child(4) > .bg-diff > .d-block:nth-child(3)", "targets": [ ["css=div:nth-child(3) > .bg-diff > .d-block:nth-child(3)", "css:finder"], ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[3]", "xpath:idRelative"], @@ -883,33 +883,33 @@ "id": "a13198b9-7827-47e2-ade3-143b981d34ee", "comment": "", "command": "assertText", - "target": "css=div:nth-child(3) > .bg-diff > .d-block:nth-child(3)", + "target": "css=div:nth-child(4) > .bg-diff > .d-block:nth-child(3)", "targets": [ - ["css=div:nth-child(3) > .bg-diff > .d-block:nth-child(3)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[3]/div/span[3]", "xpath:idRelative"], - ["xpath=//div[3]/div/span[3]", "xpath:position"] + ["css=div:nth-child(4) > .bg-diff > .d-block:nth-child(3)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div/span[3]", "xpath:idRelative"], + ["xpath=//div[4]/div/span[3]", "xpath:position"] ], "value": "123" }, { "id": "3d83741c-299e-4fcb-9ce6-4b7291c423a4", "comment": "", "command": "assertText", - "target": "css=div:nth-child(11) > .bg-diff > .d-block:nth-child(2)", + "target": "css=div:nth-child(12) > .bg-diff > .d-block:nth-child(2)", "targets": [ - ["css=div:nth-child(11) > .bg-diff > .d-block:nth-child(2)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[11]/div/span[2]", "xpath:idRelative"], - ["xpath=//div[11]/div/span[2]", "xpath:position"] + ["css=div:nth-child(12) > .bg-diff > .d-block:nth-child(2)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[12]/div/span[2]", "xpath:idRelative"], + ["xpath=//div[12]/div/span[2]", "xpath:position"] ], "value": "false" }, { "id": "190cc157-d427-4046-aff2-180392395ad3", "comment": "", "command": "assertText", - "target": "css=div:nth-child(11) > .bg-diff > .d-block:nth-child(3)", + "target": "css=div:nth-child(12) > .bg-diff > .d-block:nth-child(3)", "targets": [ - ["css=div:nth-child(11) > .bg-diff > .d-block:nth-child(3)", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[11]/div/span[3]", "xpath:idRelative"], - ["xpath=//div[11]/div/span[3]", "xpath:position"], + ["css=div:nth-child(12) > .bg-diff > .d-block:nth-child(3)", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[12]/div/span[3]", "xpath:idRelative"], + ["xpath=//div[12]/div/span[3]", "xpath:position"], ["xpath=//span[contains(.,'true')]", "xpath:innerText"] ], "value": "true" @@ -917,7 +917,7 @@ "id": "aa3e1818-24e5-420b-838e-0eb7d6b6d4e3", "comment": "", "command": "storeAttribute", - "target": "xpath=//section[1]/div/div[2]/div[2]/div[3]/div@class", + "target": "xpath=//section[1]/div/div[2]/div[2]/div[4]/div@class", "targets": [], "value": "classes" }, { @@ -959,7 +959,7 @@ "id": "d7e53d38-a2c1-4ae7-a481-2726000eb556", "comment": "", "command": "storeAttribute", - "target": "xpath=//section[1]/div/div[2]/div[2]/div[11]/div@class", + "target": "xpath=//section[1]/div/div[2]/div[2]/div[12]/div@class", "targets": [], "value": "classes" }, { diff --git a/backend/src/integration/resources/SHIBUI-1732-1.side b/backend/src/integration/resources/SHIBUI-1732-1.side index bd1d7cb7e..b898f8bf9 100644 --- a/backend/src/integration/resources/SHIBUI-1732-1.side +++ b/backend/src/integration/resources/SHIBUI-1732-1.side @@ -584,6 +584,13 @@ ["xpath=//a[contains(.,'Add a new metadata provider')]", "xpath:innerText"] ], "value": "" + }, { + "id": "bb1d9d3f-631a-40eb-8f51-bd502a90c2b2", + "comment": "", + "command": "waitForElementEditable", + "target": "name=type", + "targets": [], + "value": "30000" }, { "id": "c6e4f105-81ce-4132-b82b-d28d11f27746", "comment": "", @@ -597,6 +604,13 @@ ["xpath=//input", "xpath:position"] ], "value": "Test" + }, { + "id": "7a088a82-2f0c-4466-9304-60c7c504913c", + "comment": "", + "command": "select", + "target": "name=type", + "targets": [], + "value": "label=FileBackedHttpMetadataResolver" }, { "id": "2c98e69c-d595-48a7-ac67-eca5d9f3a784", "comment": "", @@ -684,13 +698,13 @@ "id": "b1f14d82-d268-4c50-b1bc-dc33cf852d01", "comment": "", "command": "click", - "target": "id=option-selector-root_backupFileInitNextRefreshDelay-item-1", + "target": "id=option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "targets": [ - ["id=option-selector-root_backupFileInitNextRefreshDelay-item-1", "id"], + ["id=option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_backupFileInitNextRefreshDelay-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_backupFileInitNextRefreshDelay-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_backupFileInitNextRefreshDelay']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_backupFileInitNextRefreshDelay-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_backupFileInitNextRefreshDelay']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] diff --git a/backend/src/integration/resources/SHIBUI-1732-2.side b/backend/src/integration/resources/SHIBUI-1732-2.side index 82bfdd00a..3b3777779 100644 --- a/backend/src/integration/resources/SHIBUI-1732-2.side +++ b/backend/src/integration/resources/SHIBUI-1732-2.side @@ -564,6 +564,13 @@ ["xpath=//input", "xpath:position"] ], "value": "Test" + }, { + "id": "9a4b3759-61b9-478a-9888-00e512721d4f", + "comment": "", + "command": "select", + "target": "name=type", + "targets": [], + "value": "label=FileBackedHttpMetadataResolver" }, { "id": "7c10b23a-a427-4cc4-bae9-9e5606712b6e", "comment": "", @@ -638,13 +645,13 @@ "id": "0c0e50f7-3733-4404-ac57-94ebbfb6d0cd", "comment": "", "command": "click", - "target": "id=option-selector-root_backupFileInitNextRefreshDelay-item-1", + "target": "id=option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "targets": [ - ["id=option-selector-root_backupFileInitNextRefreshDelay-item-1", "id"], + ["id=option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_backupFileInitNextRefreshDelay-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_backupFileInitNextRefreshDelay-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_backupFileInitNextRefreshDelay']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_backupFileInitNextRefreshDelay-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_backupFileInitNextRefreshDelay']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] diff --git a/backend/src/integration/resources/SHIBUI-1732-3.side b/backend/src/integration/resources/SHIBUI-1732-3.side index 6a3927fda..5a794676b 100644 --- a/backend/src/integration/resources/SHIBUI-1732-3.side +++ b/backend/src/integration/resources/SHIBUI-1732-3.side @@ -685,12 +685,38 @@ ["xpath=//section[7]/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "5491ac17-6d58-4fe3-861a-06bc89470aa5", + "comment": "", + "command": "pause", + "target": "1000", + "targets": [], + "value": "" + }, { + "id": "65be7a0b-462f-43be-9e2f-c7dc71f15467", + "comment": "", + "command": "select", + "target": "id=root_relyingPartyOverrides_CustomList_0", + "targets": [ + ["id=root_relyingPartyOverrides_CustomList_0", "id"], + ["css=#root_relyingPartyOverrides_CustomList_0", "css:finder"], + ["xpath=//select[@id='root_relyingPartyOverrides_CustomList_0']", "xpath:attributes"], + ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div[2]/div/form/div/div/div/div/div[8]/div/div/div/div[6]/div/div/div/div/div/div[2]/div/div/div/div/div/div/select", "xpath:idRelative"], + ["xpath=//select", "xpath:position"] + ], + "value": "label=foo" }, { "id": "e4abb650-c762-4060-bc81-428b4758f08e", "comment": "", "command": "select", "target": "id=root_relyingPartyOverrides_CustomList_0", - "targets": [], + "targets": [ + ["id=root_relyingPartyOverrides_CustomList_0", "id"], + ["css=#root_relyingPartyOverrides_CustomList_0", "css:finder"], + ["xpath=//select[@id='root_relyingPartyOverrides_CustomList_0']", "xpath:attributes"], + ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div[2]/div/form/div/div/div/div/div[8]/div/div/div/div[6]/div/div/div/div/div/div[2]/div/div/div/div/div/div/select", "xpath:idRelative"], + ["xpath=//select", "xpath:position"] + ], "value": "label=foo" }, { "id": "992e127d-5ac1-4796-b54f-f212683624ac", @@ -808,6 +834,13 @@ ["xpath=//input", "xpath:position"] ], "value": "Test" + }, { + "id": "f21989e9-8b54-4e55-a6f7-c699939f0992", + "comment": "", + "command": "select", + "target": "name=type", + "targets": [], + "value": "label=FileBackedHttpMetadataResolver" }, { "id": "3c298664-b8c4-40de-986e-a955c760ba3e", "comment": "", @@ -889,13 +922,13 @@ "id": "74de5b81-69b2-446b-b4a7-0561676886be", "comment": "", "command": "click", - "target": "id=option-selector-root_backupFileInitNextRefreshDelay-item-1", + "target": "id=option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "targets": [ - ["id=option-selector-root_backupFileInitNextRefreshDelay-item-1", "id"], + ["id=option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_backupFileInitNextRefreshDelay-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_backupFileInitNextRefreshDelay-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_backupFileInitNextRefreshDelay']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_backupFileInitNextRefreshDelay-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_backupFileInitNextRefreshDelay']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] diff --git a/backend/src/integration/resources/SHIBUI-1732-4.side b/backend/src/integration/resources/SHIBUI-1732-4.side index 0197187c0..5c7260a30 100644 --- a/backend/src/integration/resources/SHIBUI-1732-4.side +++ b/backend/src/integration/resources/SHIBUI-1732-4.side @@ -578,6 +578,13 @@ ["xpath=//input", "xpath:position"] ], "value": "Test" + }, { + "id": "94bd599c-4de3-4f7c-b28b-719012acf8b5", + "comment": "", + "command": "select", + "target": "name=type", + "targets": [], + "value": "label=FileBackedHttpMetadataResolver" }, { "id": "befba204-65a3-4a26-91ca-75141306ee8a", "comment": "", @@ -652,13 +659,13 @@ "id": "1a74bc57-4d6a-427a-80a0-09fd35fa1eca", "comment": "", "command": "click", - "target": "id=option-selector-root_backupFileInitNextRefreshDelay-item-1", + "target": "id=option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "targets": [ - ["id=option-selector-root_backupFileInitNextRefreshDelay-item-1", "id"], + ["id=option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_backupFileInitNextRefreshDelay-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_backupFileInitNextRefreshDelay-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_backupFileInitNextRefreshDelay']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_backupFileInitNextRefreshDelay-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_backupFileInitNextRefreshDelay']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] diff --git a/backend/src/integration/resources/SHIBUI-1732-5.side b/backend/src/integration/resources/SHIBUI-1732-5.side index d63ab5568..a74508f17 100644 --- a/backend/src/integration/resources/SHIBUI-1732-5.side +++ b/backend/src/integration/resources/SHIBUI-1732-5.side @@ -578,6 +578,13 @@ ["xpath=//input", "xpath:position"] ], "value": "Test" + }, { + "id": "12eebf6a-616b-4bb3-af32-aad829ba1133", + "comment": "", + "command": "select", + "target": "name=type", + "targets": [], + "value": "label=FileBackedHttpMetadataResolver" }, { "id": "577b9b53-a904-419f-b0d8-4e899aaee297", "comment": "", @@ -659,13 +666,13 @@ "id": "ab704c2c-fbe5-47df-9308-bfaf6fbd1eb8", "comment": "", "command": "click", - "target": "id=option-selector-root_backupFileInitNextRefreshDelay-item-1", + "target": "id=option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "targets": [ - ["id=option-selector-root_backupFileInitNextRefreshDelay-item-1", "id"], + ["id=option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_backupFileInitNextRefreshDelay-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_backupFileInitNextRefreshDelay-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_backupFileInitNextRefreshDelay']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_backupFileInitNextRefreshDelay-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_backupFileInitNextRefreshDelay']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] diff --git a/backend/src/integration/resources/SHIBUI-1732-6.side b/backend/src/integration/resources/SHIBUI-1732-6.side index 07f534f37..e90e128f2 100644 --- a/backend/src/integration/resources/SHIBUI-1732-6.side +++ b/backend/src/integration/resources/SHIBUI-1732-6.side @@ -578,6 +578,13 @@ ["xpath=//input", "xpath:position"] ], "value": "Test" + }, { + "id": "c8293710-35ad-4ac6-a175-33ca8fcab2ff", + "comment": "", + "command": "select", + "target": "name=type", + "targets": [], + "value": "label=FileBackedHttpMetadataResolver" }, { "id": "a26d50d7-f81f-4fbe-9942-804853b58f19", "comment": "", @@ -659,13 +666,13 @@ "id": "0134f9c2-3bd4-4343-980e-27086ff70e86", "comment": "", "command": "click", - "target": "id=option-selector-root_backupFileInitNextRefreshDelay-item-2", + "target": "id=option-selector-items-root_backupFileInitNextRefreshDelay-item-2", "targets": [ - ["id=option-selector-root_backupFileInitNextRefreshDelay-item-2", "id"], + ["id=option-selector-items-root_backupFileInitNextRefreshDelay-item-2", "id"], ["linkText=PT1M", "linkText"], - ["css=#option-selector-root_backupFileInitNextRefreshDelay-item-2", "css:finder"], - ["xpath=//a[@id='option-selector-root_backupFileInitNextRefreshDelay-item-2']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_backupFileInitNextRefreshDelay']/a[3]", "xpath:idRelative"], + ["css=#option-selector-items-root_backupFileInitNextRefreshDelay-item-2", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_backupFileInitNextRefreshDelay-item-2']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_backupFileInitNextRefreshDelay']/a[3]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"], ["xpath=//div[2]/a[3]", "xpath:position"], ["xpath=//a[contains(.,'PT1M')]", "xpath:innerText"] diff --git a/backend/src/integration/resources/SHIBUI-1732-7.side b/backend/src/integration/resources/SHIBUI-1732-7.side index 7a350de62..fd55d0449 100644 --- a/backend/src/integration/resources/SHIBUI-1732-7.side +++ b/backend/src/integration/resources/SHIBUI-1732-7.side @@ -554,6 +554,13 @@ ["xpath=//input", "xpath:position"] ], "value": "Test" + }, { + "id": "506e9329-0c23-449b-b285-96541b2fa557", + "comment": "", + "command": "select", + "target": "name=type", + "targets": [], + "value": "label=FileBackedHttpMetadataResolver" }, { "id": "f26372d3-0701-4cc3-9746-8f96175686e6", "comment": "", @@ -635,13 +642,13 @@ "id": "67a3627d-6562-455b-aa32-b5fc8a71162e", "comment": "", "command": "click", - "target": "id=option-selector-root_backupFileInitNextRefreshDelay-item-1", + "target": "id=option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "targets": [ - ["id=option-selector-root_backupFileInitNextRefreshDelay-item-1", "id"], + ["id=option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "id"], ["linkText=PT30S", "linkText"], - ["css=#option-selector-root_backupFileInitNextRefreshDelay-item-1", "css:finder"], - ["xpath=//a[@id='option-selector-root_backupFileInitNextRefreshDelay-item-1']", "xpath:attributes"], - ["xpath=//div[@id='option-selector-root_backupFileInitNextRefreshDelay']/a[2]", "xpath:idRelative"], + ["css=#option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "css:finder"], + ["xpath=//a[@id='option-selector-items-root_backupFileInitNextRefreshDelay-item-1']", "xpath:attributes"], + ["xpath=//div[@id='option-selector-items-root_backupFileInitNextRefreshDelay']/a[2]", "xpath:idRelative"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], ["xpath=//div[2]/a[2]", "xpath:position"], ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"] diff --git a/backend/src/integration/resources/SHIBUI-2052.side b/backend/src/integration/resources/SHIBUI-2052.side index 4ddd7ba06..f034b03bf 100644 --- a/backend/src/integration/resources/SHIBUI-2052.side +++ b/backend/src/integration/resources/SHIBUI-2052.side @@ -100,7 +100,7 @@ ["xpath=//div/span", "xpath:position"], ["xpath=//span[contains(.,'admingroup')]", "xpath:innerText"] ], - "value": "admingroup" + "value": "ADMIN-GROUP" }, { "id": "3ea1eebd-bb9d-4171-ac81-4ef47e2d9315", "comment": "", diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy index 049869b64..79420f6d0 100644 --- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy +++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy @@ -89,6 +89,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService { } void constructXmlNodeForFilter(EntityAttributesFilter filter, def markupBuilderDelegate) { + if (!filter.isFilterEnabled()) { return } markupBuilderDelegate.MetadataFilter('xsi:type': 'EntityAttributes') { // TODO: enhance. currently this does weird things with namespaces filter.attributes.each { attribute -> @@ -128,6 +129,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService { // TODO: enhance void constructXmlNodeForFilter(EntityRoleWhiteListFilter filter, def markupBuilderDelegate) { + if (!filter.isFilterEnabled()) { return } if (!filter.retainedRoles?.isEmpty()) { markupBuilderDelegate.MetadataFilter( 'xsi:type': 'EntityRoleWhiteList', @@ -142,6 +144,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService { } void constructXmlNodeForFilter(NameIdFormatFilter filter, def markupBuilderDelegate) { + if (!filter.isFilterEnabled()) { return } def type = filter.nameIdFormatFilterTarget.nameIdFormatFilterTargetType markupBuilderDelegate.MetadataFilter( 'xsi:type': 'NameIDFormat', @@ -180,6 +183,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService { } void constructXmlNodeForFilter(RequiredValidUntilFilter filter, def markupBuilderDelegate) { + if (!filter.isFilterEnabled()) { return } if (filter.xmlShouldBeGenerated()) { markupBuilderDelegate.MetadataFilter( 'xsi:type': 'RequiredValidUntil', @@ -189,6 +193,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService { } void constructXmlNodeForFilter(SignatureValidationFilter filter, def markupBuilderDelegate) { + if (!filter.isFilterEnabled()) { return } if (filter.xmlShouldBeGenerated()) { markupBuilderDelegate.MetadataFilter(id: filter.name, 'xsi:type': 'SignatureValidation', @@ -459,8 +464,10 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService { } } mr.metadataFilters.each { edu.internet2.tier.shibboleth.admin.ui.domain.filters.MetadataFilter filter -> - doNamespaceProtectionFilter() - constructXmlNodeForFilter(filter, delegate) + if (filter.isFilterEnabled()) { + doNamespaceProtectionFilter() + constructXmlNodeForFilter(filter, delegate) + } } doNamespaceProtectionFilter() } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAuditable.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAuditable.java index 89560f04f..6600307af 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAuditable.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAuditable.java @@ -4,6 +4,7 @@ import java.time.ZoneId; import java.time.ZoneOffset; import java.time.ZonedDateTime; +import java.time.temporal.ChronoUnit; import javax.persistence.Column; import javax.persistence.EntityListeners; @@ -41,14 +42,14 @@ public abstract class AbstractAuditable implements Auditable { @CreationTimestamp @CreatedDate - @Column(nullable = false, updatable = false, columnDefinition = "DATETIME(9)") - @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSSSSSSS") + @Column(nullable = false, updatable = false, columnDefinition = "DATETIME(6)") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSSSS") private LocalDateTime createdDate; @UpdateTimestamp @LastModifiedDate - @Column(nullable = false, columnDefinition = "DATETIME(9)") - @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSSSSSSS") + @Column(nullable = false, columnDefinition = "DATETIME(6)") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSSSS") private LocalDateTime modifiedDate; @Column(name = "created_by") @@ -130,6 +131,7 @@ private static ZonedDateTime toZonedDateTime(LocalDateTime localDateTime) { .atZone(ZoneId.systemDefault()) .toInstant() .atOffset(ZoneOffset.UTC) - .toZonedDateTime(); + .toZonedDateTime() + .truncatedTo(ChronoUnit.MILLIS); } } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/frontend/EntityDescriptorRepresentation.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/frontend/EntityDescriptorRepresentation.java index c662b1388..61d24652e 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/frontend/EntityDescriptorRepresentation.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/frontend/EntityDescriptorRepresentation.java @@ -11,13 +11,14 @@ import java.io.Serializable; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; +import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.List; import java.util.Map; public class EntityDescriptorRepresentation implements Serializable { private static final long serialVersionUID = 7753435553892353966L; - private DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSSSSSSS"); + private DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSSSS"); private List assertionConsumerServices; @@ -133,7 +134,7 @@ public String getModifiedDate() { @JsonIgnore public LocalDateTime getModifiedDateAsDate() { // we shouldn't have an ED without either modified or created date, so this is mostly for testing where data can be odd - return modifiedDate != null ? modifiedDate : createdDate != null ? createdDate : LocalDateTime.now(); + return modifiedDate != null ? modifiedDate : createdDate != null ? createdDate : LocalDateTime.now().truncatedTo(ChronoUnit.MILLIS); } public OrganizationRepresentation getOrganization() { @@ -246,4 +247,4 @@ public void setServiceProviderSsoDescriptor(ServiceProviderSsoDescriptorRepresen public void setVersion(int version) { this.version = version; } -} \ No newline at end of file +} diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataRequestURLConstructionScheme.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataRequestURLConstructionScheme.java index a1223840e..e24b5cb02 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataRequestURLConstructionScheme.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataRequestURLConstructionScheme.java @@ -64,4 +64,7 @@ public String toString() { String type; String content; -} + + @Transient + String match; +} \ No newline at end of file diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversMetadataResolverVersionService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversMetadataResolverVersionService.java index b0d90195f..558af5789 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversMetadataResolverVersionService.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversMetadataResolverVersionService.java @@ -40,4 +40,4 @@ public MetadataResolver findSpecificVersionOfMetadataResolver(String resourceId, return resolver; } -} +} \ No newline at end of file diff --git a/backend/src/main/resources/dynamic-http-metadata-provider.schema.json b/backend/src/main/resources/dynamic-http-metadata-provider.schema.json index 8be8bbf9b..165fc904c 100644 --- a/backend/src/main/resources/dynamic-http-metadata-provider.schema.json +++ b/backend/src/main/resources/dynamic-http-metadata-provider.schema.json @@ -9,7 +9,7 @@ "properties": { "name": { "title": "label.metadata-provider-name-dashboard-display-only", - "description": "tooltip.metadata-provider-name-dashboard-display-only", + "description": "tooltip.metadata-provider-name", "type": "string" }, "@type": { @@ -47,13 +47,10 @@ ] }, "match": { + "$id": "match", "title": "label.match", "description": "tooltip.match", - "type": "string", - "widget": { - "id": "string", - "required": true - } + "type": "string" } }, "required": [ diff --git a/backend/src/main/resources/file-system-metadata-provider.schema.json b/backend/src/main/resources/file-system-metadata-provider.schema.json index d238018b9..7969495f2 100644 --- a/backend/src/main/resources/file-system-metadata-provider.schema.json +++ b/backend/src/main/resources/file-system-metadata-provider.schema.json @@ -9,7 +9,7 @@ "properties": { "name": { "title": "label.metadata-provider-name-dashboard-display-only", - "description": "tooltip.metadata-provider-name-dashboard-display-only", + "description": "tooltip.metadata-provider-name", "type": "string", "widget": { "id": "string", diff --git a/backend/src/main/resources/filebacked-http-metadata-provider.schema.json b/backend/src/main/resources/filebacked-http-metadata-provider.schema.json index 9ce22ca94..f678ee306 100644 --- a/backend/src/main/resources/filebacked-http-metadata-provider.schema.json +++ b/backend/src/main/resources/filebacked-http-metadata-provider.schema.json @@ -28,7 +28,7 @@ "properties": { "name": { "title": "label.metadata-provider-name-dashboard-display-only", - "description": "tooltip.metadata-provider-name-dashboard-display-only", + "description": "tooltip.metadata-provider-name", "type": "string", "widget": { "id": "string", diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties index 4c22a97ff..0a7880b36 100644 --- a/backend/src/main/resources/i18n/messages.properties +++ b/backend/src/main/resources/i18n/messages.properties @@ -69,12 +69,15 @@ action.groups=Groups action.source-group=Group action.enable=Enable action.disable=Disable +action.get-latest=Get latest changes action.add-new-role=Add new role action.roles=Roles action.source-role=Role action.select-bundle=Select Bundle +action.get-latest=Get latest + value.enabled=Enabled value.disabled=Disabled value.current=Current @@ -597,6 +600,7 @@ message.invalid-signing=Unless the response or the assertions are signed, SAML s message.session-timeout-heading=Session timed out message.session-timeout-body=Your session has timed out. Please login again. +message.session-timeout=An error has occurred while saving. Your session may have timed out. tooltip.entity-id=Entity ID tooltip.service-provider-name=Service Provider Name (Dashboard Display Only) @@ -662,7 +666,7 @@ tooltip.max-cache-entry-size=The maximum response body size that may be cached, tooltip.metadata-provider-name=Metadata Provider Name (for display on the Dashboard only) tooltip.metadata-provider-type=Metadata Provider Type tooltip.xml-id=Identifier for logging, identification for command line reload, etc. -tooltip.metadata-url=Identifier for logging, identification for command line reload, etc. +tooltip.metadata-url=The URL that the metadata is served from. tooltip.metadata-file=The absolute path to the local metadata file to be loaded. tooltip.init-from-backup=Flag indicating whether initialization should first attempt to load metadata from the backup file. If true, foreground initialization will be performed by loading the backing file, and then a refresh from the remote HTTP server will be scheduled to execute in a background thread, after a configured delay. This can improve IdP startup times when the remote HTTP file is large in size. tooltip.backing-file=Specifies where the backing file is located. If the remote server is unavailable at startup, the backing file is loaded instead. @@ -718,4 +722,6 @@ tooltip.group-name=Group Name tooltip.group-description=Group Description tooltip.role-name=Role Name -tooltip.role-description=Role Description \ No newline at end of file +tooltip.role-description=Role Description + +tooltip.contact-information=Contact Information \ No newline at end of file diff --git a/backend/src/main/resources/i18n/messages_en.properties b/backend/src/main/resources/i18n/messages_en.properties index 2fa33ffa9..f9f64d4d2 100644 --- a/backend/src/main/resources/i18n/messages_en.properties +++ b/backend/src/main/resources/i18n/messages_en.properties @@ -513,7 +513,7 @@ tooltip.max-cache-entry-size=The maximum response body size that may be cached, tooltip.metadata-provider-name=Metadata Provider Name (for display on the Dashboard only) tooltip.metadata-provider-type=Metadata Provider Type tooltip.xml-id=Identifier for logging, identification for command line reload, etc. -tooltip.metadata-url=Identifier for logging, identification for command line reload, etc. +tooltip.metadata-url=The URL that the metadata is served from. tooltip.metadata-file=The absolute path to the local metadata file to be loaded. tooltip.init-from-backup=Flag indicating whether initialization should first attempt to load metadata from the backup file. If true, foreground initialization will be performed by loading the backing file, and then a refresh from the remote HTTP server will be scheduled to execute in a background thread, after a configured delay. This can improve IdP startup times when the remote HTTP file is large in size. tooltip.backing-file=Specifies where the backing file is located. If the remote server is unavailable at startup, the backing file is loaded instead. diff --git a/backend/src/main/resources/local-dynamic-metadata-provider.schema.json b/backend/src/main/resources/local-dynamic-metadata-provider.schema.json index 1b1951dac..6e81a0a90 100644 --- a/backend/src/main/resources/local-dynamic-metadata-provider.schema.json +++ b/backend/src/main/resources/local-dynamic-metadata-provider.schema.json @@ -9,7 +9,7 @@ "properties": { "name": { "title": "label.metadata-provider-name-dashboard-display-only", - "description": "tooltip.metadata-provider-name-dashboard-display-only", + "description": "tooltip.metadata-provider-name", "type": "string", "widget": { "id": "string", diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/BaseDataJpaTestConfiguration.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/BaseDataJpaTestConfiguration.groovy index fe62a5770..2c246889a 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/BaseDataJpaTestConfiguration.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/BaseDataJpaTestConfiguration.groovy @@ -74,7 +74,7 @@ class BaseDataJpaTestConfiguration { @Bean ObjectMapper objectMapper() { JavaTimeModule module = new JavaTimeModule() - LocalDateTimeDeserializer localDateTimeDeserializer = new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSSSSSSS")) + LocalDateTimeDeserializer localDateTimeDeserializer = new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSSSS")) module.addDeserializer(LocalDateTime.class, localDateTimeDeserializer) ObjectMapper mapper = Jackson2ObjectMapperBuilder.json().modules(module).featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS).build() mapper.enable(SerializationFeature.INDENT_OUTPUT) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerTests.groovy index 5f14adf1c..8861d1613 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerTests.groovy @@ -596,12 +596,14 @@ class EntityDescriptorControllerTests extends AbstractBaseDataJpaTest { @WithMockAdmin def "PUT /EntityDescriptor updates entity descriptors properly as admin"() { given: - def entityDescriptorTwo = new EntityDescriptor(resourceId: 'uuid-2', entityID: 'eid2', serviceProviderName: 'sp2', serviceEnabled: false, idOfOwner: Group.ADMIN_GROUP.getOwnerId()) + def entityDescriptorToSave = new EntityDescriptor(resourceId: 'uuid-2', entityID: 'eid2', serviceProviderName: 'sp2', serviceEnabled: false, idOfOwner: Group.ADMIN_GROUP.getOwnerId()) - entityDescriptorTwo = entityDescriptorRepository.save(entityDescriptorTwo) + entityDescriptorRepository.save(entityDescriptorToSave) entityManager.flush() entityManager.clear() + def entityDescriptorTwo = entityDescriptorRepository.findByResourceId('uuid-2') + def updatedEntityDescriptorRepresentation = jpaEntityDescriptorService.createRepresentationFromDescriptor(entityDescriptorTwo) updatedEntityDescriptorRepresentation.setServiceProviderName("newName") def postedJsonBody = mapper.writeValueAsString(updatedEntityDescriptorRepresentation) @@ -689,4 +691,4 @@ class EntityDescriptorControllerTests extends AbstractBaseDataJpaTest { e instanceof ConcurrentModificationException } } -} \ No newline at end of file +} diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorVersionControllerTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorVersionControllerTests.groovy index f5714441d..0dbb40471 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorVersionControllerTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorVersionControllerTests.groovy @@ -115,6 +115,7 @@ class EntityDescriptorVersionControllerTests extends AbstractBaseDataJpaTest { }) entityDescriptorRepository.saveAndFlush(ed) testEntityManager.getEntityManager().getTransaction().commit() // get envers to write version + testEntityManager.getEntityManager().clear() } /** @@ -165,4 +166,4 @@ class EntityDescriptorVersionControllerTests extends AbstractBaseDataJpaTest { return new EnversVersionServiceSupport(entityManager) } } -} \ No newline at end of file +} diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/EntityDescriptorRepositoryTest.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/EntityDescriptorRepositoryTest.groovy index f3e36f7dc..1635ed35f 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/EntityDescriptorRepositoryTest.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/EntityDescriptorRepositoryTest.groovy @@ -36,13 +36,16 @@ class EntityDescriptorRepositoryTest extends AbstractBaseDataJpaTest { when: def input = openSamlObjects.unmarshalFromXml(this.class.getResource('/metadata/SHIBUI-553.2.xml').bytes) as EntityDescriptor entityDescriptorRepository.save(input) + entityManager.flush() + entityManager.clear() + + def hashCode1 = entityDescriptorRepository.findByResourceId(input.resourceId).hashCode() - def item1 = entityDescriptorRepository.findByResourceId(input.resourceId) entityManager.clear() - def item2 = entityDescriptorRepository.findByResourceId(input.resourceId) + def hashCode2 = entityDescriptorRepository.findByResourceId(input.resourceId).hashCode() then: - item1.hashCode() == item2.hashCode() + hashCode1 == hashCode2 } def "SHIBUI-950"() { @@ -125,4 +128,4 @@ class EntityDescriptorRepositoryTest extends AbstractBaseDataJpaTest { } } } -} \ No newline at end of file +} diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/MetadataResolverRepositoryTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/MetadataResolverRepositoryTests.groovy index 2030a25d6..612577aa4 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/MetadataResolverRepositoryTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/MetadataResolverRepositoryTests.groovy @@ -42,13 +42,15 @@ class MetadataResolverRepositoryTests extends AbstractBaseDataJpaTest { when: def mdr = create { new MetadataResolver() } metadataResolverRepository.save(mdr) + entityManager.flush() + entityManager.clear() - def item1 = metadataResolverRepository.findByName('testme') + def hashCode1 = metadataResolverRepository.findByName('testme').hashCode() entityManager.clear() - def item2 = metadataResolverRepository.findByName('testme') + def hashCode2 = metadataResolverRepository.findByName('testme').hashCode() then: - item1.hashCode() == item2.hashCode() + hashCode1 == hashCode2 } def "persisting and performing transformation into transient representation for EntityAttributesFilter correctly"() { @@ -230,4 +232,4 @@ class MetadataResolverRepositoryTests extends AbstractBaseDataJpaTest { } resolver } -} \ No newline at end of file +} diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy index a44b4beed..378995e99 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy @@ -38,7 +38,7 @@ class IncommonJPAMetadataResolverServiceImplTests extends AbstractBaseDataJpaTes def 'simple test generation of metadata-providers.xml'() { when: def mr = metadataResolverRepository.findAll().iterator().next() - mr.metadataFilters << new SignatureValidationFilter(requireSignedRoot: true, certificateFile: '%{idp.home}/credentials/inc-md-cert.pem') + mr.metadataFilters << new SignatureValidationFilter(enabled: true, requireSignedRoot: true, certificateFile: '%{idp.home}/credentials/inc-md-cert.pem') mr.metadataFilters << requiredValidUntilFilterForXmlGenerationTests() mr.metadataFilters << entityRoleWhiteListFilterForXmlGenerationTests() metadataResolverRepository.save(mr) @@ -52,9 +52,10 @@ class IncommonJPAMetadataResolverServiceImplTests extends AbstractBaseDataJpaTes when: //TODO: this might break later def mr = metadataResolverRepository.findAll().iterator().next() - mr.metadataFilters << new SignatureValidationFilter(requireSignedRoot: true, certificateFile: '%{idp.home}/credentials/inc-md-cert.pem') + mr.metadataFilters << new SignatureValidationFilter(enabled: true, requireSignedRoot: true, certificateFile: '%{idp.home}/credentials/inc-md-cert.pem') mr.metadataFilters << requiredValidUntilFilterForXmlGenerationTests() mr.metadataFilters.add(new EntityAttributesFilter().with { + it.enabled = true it.entityAttributesFilterTarget = new EntityAttributesFilterTarget().with { it.entityAttributesFilterTargetType = EntityAttributesFilterTarget.EntityAttributesFilterTargetType.ENTITY it.value = ['https://sp1.example.org'] @@ -81,6 +82,7 @@ class IncommonJPAMetadataResolverServiceImplTests extends AbstractBaseDataJpaTes EntityRoleWhiteListFilter entityRoleWhiteListFilterForXmlGenerationTests() { new EntityRoleWhiteListFilter().with { it.retainedRoles = ['md:SPSSODescriptor'] + it.enabled = true it } } @@ -88,6 +90,7 @@ class IncommonJPAMetadataResolverServiceImplTests extends AbstractBaseDataJpaTes RequiredValidUntilFilter requiredValidUntilFilterForXmlGenerationTests() { new RequiredValidUntilFilter().with { it.maxValidityInterval = 'P14D' + it.enabled = true it } } diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy index 28ba48d30..703e44f7a 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy @@ -149,6 +149,20 @@ class JPAMetadataResolverServiceImplTests extends AbstractBaseDataJpaTest { generatedXmlIsTheSameAsExpectedXml('/conf/661.xml', domBuilder.parseText(writer.toString())) } + def 'test generating xml when filter is disabled'() { + given: + def filter = testObjectGenerator.entityAttributesFilterWithConditionScript() + filter.setEnabled(Boolean.FALSE) + + when: + genXmlSnippet(markupBuilder) { + JPAMetadataResolverServiceImpl.cast(metadataResolverService).constructXmlNodeForFilter(filter, it) + } + + then: + generatedXmlIsTheSameAsExpectedXml('/conf/661.3.xml', domBuilder.parseText(writer.toString())) + } + def 'test generating EntityAttributesFilter xml snippet with regex'() { given: def filter = testObjectGenerator.entityAttributesFilterWithRegex() @@ -177,6 +191,7 @@ class JPAMetadataResolverServiceImplTests extends AbstractBaseDataJpaTest { def 'test generating RequiredValidUntilFilter xml snippet'() { given: def filter = new RequiredValidUntilFilter().with { + it.enabled = true it.maxValidityInterval = 'P14D' it } diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy index 7ed0709df..bf17b107e 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy @@ -193,6 +193,7 @@ class TestObjectGenerator { it.dynamicTrustedNamesStrategyRef = generator.randomString(10) it.trustEngineRef = generator.randomString(10) it.publicKey = generator.randomString(50) + it.enabled = true; it } } @@ -202,6 +203,7 @@ class TestObjectGenerator { it.name = 'EntityRoleWhiteList' it.retainedRoles = ['role1', 'role2'] it.removeRolelessEntityDescriptors = true + it.enabled = true; it } } @@ -212,6 +214,7 @@ class TestObjectGenerator { it.setEntityAttributesFilterTarget(buildEntityAttributesFilterTarget()) it.setAttributes(buildAttributesList()) it.intoTransientRepresentation() + it.enabled = true; it } } @@ -221,6 +224,7 @@ class TestObjectGenerator { it.name = 'EntityAttributes' it.setEntityAttributesFilterTarget(buildEntityAttributesFilterTargetWithConditionScript()) it.intoTransientRepresentation() + it.enabled = true; it } } @@ -230,6 +234,7 @@ class TestObjectGenerator { it.name = 'EntityAttributes' it.setEntityAttributesFilterTarget(buildEntityAttributesFilterTargetWithRegex()) it.intoTransientRepresentation() + it.enabled = true; it } } @@ -237,6 +242,7 @@ class TestObjectGenerator { RequiredValidUntilFilter requiredValidUntilFilter() { return new RequiredValidUntilFilter().with { it.maxValidityInterval = 'P14D' + it.enabled = true; it } } @@ -246,6 +252,7 @@ class TestObjectGenerator { it.name = "NameIDFormat" it.formats = ['urn:oasis:names:tc:SAML:2.0:nameid-format:persistent'] it.setNameIdFormatFilterTarget(new NameIdFormatFilterTarget(nameIdFormatFilterTargetType: ENTITY, singleValue: 'https://sp1.example.org')) + it.enabled = true; it } } @@ -255,6 +262,7 @@ class TestObjectGenerator { it.name = requiredValidUntilFilter.name it.resourceId = requiredValidUntilFilter.resourceId it.maxValidityInterval = requiredValidUntilFilter.maxValidityInterval + it.enabled = true; it } } @@ -270,6 +278,7 @@ class TestObjectGenerator { it.requireSignedRoot = signatureValidationFilter.requireSignedRoot it.certificateFile = signatureValidationFilter.certificateFile it.defaultCriteriaRef = signatureValidationFilter.defaultCriteriaRef + it.enabled = true; it } } diff --git a/backend/src/test/resources/conf/661.3.xml b/backend/src/test/resources/conf/661.3.xml new file mode 100644 index 000000000..39eabfe8e --- /dev/null +++ b/backend/src/test/resources/conf/661.3.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 9c9e650af..fc4ddff30 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ name=shibui group=edu.internet2.tier.shibboleth.admin.ui -version=1.10.0-SNAPSHOT +version=1.10.1-SNAPSHOT shibboleth.version=3.4.4 opensaml.version=3.4.3 diff --git a/ui/src/app/admin/container/MetadataActions.js b/ui/src/app/admin/container/MetadataActions.js index 4af521db5..4ed567d23 100644 --- a/ui/src/app/admin/container/MetadataActions.js +++ b/ui/src/app/admin/container/MetadataActions.js @@ -2,7 +2,7 @@ import React from 'react'; import { DeleteConfirmation } from '../../core/components/DeleteConfirmation'; import { useMetadataActivator, useMetadataEntity } from '../../metadata/hooks/api'; -import { NotificationContext, createNotificationAction } from '../../notifications/hoc/Notifications'; +import { NotificationContext, createNotificationAction, NotificationTypes } from '../../notifications/hoc/Notifications'; export function MetadataActions ({type, children}) { @@ -21,6 +21,12 @@ export function MetadataActions ({type, children}) { `Metadata ${type} has been ${enabled ? 'enabled' : 'disabled'}.` )); cb(); + } else { + const { errorCode, errorMessage, cause } = activator?.response?.data; + dispatch(createNotificationAction( + `${errorCode}: ${errorMessage} ${cause ? `-${cause}` : ''}`, + NotificationTypes.ERROR + )); } } @@ -31,6 +37,12 @@ export function MetadataActions ({type, children}) { `Metadata ${type} has been deleted.` )); cb(); + } else { + const { errorCode, errorMessage, cause } = activator?.response?.data; + dispatch(createNotificationAction( + `${errorCode}: ${errorMessage} ${cause ? `-${cause}` : ''}`, + NotificationTypes.ERROR + )); } } diff --git a/ui/src/app/core/components/Header.js b/ui/src/app/core/components/Header.js index 7bb693b1e..ee7be969b 100644 --- a/ui/src/app/core/components/Header.js +++ b/ui/src/app/core/components/Header.js @@ -13,7 +13,7 @@ import Translate from '../../i18n/components/translate'; import { useTranslator } from '../../i18n/hooks'; import { brand } from '../../app.brand'; -import { useCurrentUser, useCurrentUserLoading, useIsAdmin } from '../user/UserContext'; +import { useCurrentUser, useCurrentUserLoading, useIsAdmin, useUserGroupNames } from '../user/UserContext'; import { BASE_PATH } from '../../App.constant'; export function Header () { @@ -22,16 +22,17 @@ export function Header () { const isAdmin = useIsAdmin(); - const { username, groupId } = useCurrentUser(); + const { username } = useCurrentUser(); + const name = useUserGroupNames(); const loading = useCurrentUserLoading(); return ( - + {brand.logo.alt} - + {loading ?
@@ -97,7 +98,7 @@ export function Header () { Groups - {groupId} + {name}
diff --git a/ui/src/app/core/components/Header.test.js b/ui/src/app/core/components/Header.test.js index 70d186d91..59866943f 100644 --- a/ui/src/app/core/components/Header.test.js +++ b/ui/src/app/core/components/Header.test.js @@ -17,11 +17,13 @@ jest.mock('../../i18n/hooks', () => ({ const mockIsAdmin = jest.fn(); const mockCurrentUser = jest.fn(); const mockCurrentUserLoading = jest.fn(); +const mockUseUserGroupNames = jest.fn(); jest.mock('../user/UserContext', () => ({ useIsAdmin: () => mockIsAdmin(), useCurrentUser: () => mockCurrentUser(), - useCurrentUserLoading: () => mockCurrentUserLoading() + useCurrentUserLoading: () => mockCurrentUserLoading(), + useUserGroupNames: () => mockUseUserGroupNames() })); describe('header for admins', () => { @@ -29,6 +31,7 @@ describe('header for admins', () => { mockIsAdmin.mockReturnValue(true); mockCurrentUser.mockReturnValue({ username: 'foo', groupId: 'bar' }); mockCurrentUserLoading.mockReturnValue(false); + mockUseUserGroupNames.mockReturnValue('Foo'); }); it('should display logo and navigation', () => { diff --git a/ui/src/app/core/user/UserContext.js b/ui/src/app/core/user/UserContext.js index 14666abe8..f2438a9ef 100644 --- a/ui/src/app/core/user/UserContext.js +++ b/ui/src/app/core/user/UserContext.js @@ -72,7 +72,17 @@ function useCanEnable() { function useUserGroup() { const user = useCurrentUser(); - return user?.userGroups[0]; + return (user?.userGroups && user.userGroups.length > 0) ? user.userGroups[0] : null; +} + +function useUserGroups() { + const user = useCurrentUser(); + return (user?.userGroups && Array.isArray(user.userGroups)) ? user.userGroups : []; +} + +function useUserGroupNames() { + const groups = useUserGroups(); + return groups.map(g => g.name).join(', '); } function useUserGroupRegexValidator () { @@ -91,5 +101,6 @@ export { useCanEnable, useCurrentUserLoading, useUserGroupRegexValidator, - useUserGroup + useUserGroup, + useUserGroupNames }; diff --git a/ui/src/app/dashboard/view/SourcesTab.js b/ui/src/app/dashboard/view/SourcesTab.js index 36cdc1bdf..b564a3872 100644 --- a/ui/src/app/dashboard/view/SourcesTab.js +++ b/ui/src/app/dashboard/view/SourcesTab.js @@ -6,7 +6,7 @@ import SourceList from '../../metadata/domain/source/component/SourceList'; import { useMetadataEntities, useMetadataEntity } from '../../metadata/hooks/api'; import { Search } from '../component/Search'; -import { NotificationContext, createNotificationAction } from '../../notifications/hoc/Notifications'; +import { NotificationContext, createNotificationAction, NotificationTypes } from '../../notifications/hoc/Notifications'; const searchProps = ['serviceProviderName', 'entityId', 'createdBy']; @@ -42,6 +42,12 @@ export function SourcesTab () { if (updater.response.ok) { dispatch(createNotificationAction(`Updated group successfully.`)); loadSources(); + } else { + const { errorCode, errorMessage, cause } = updater?.response?.data; + dispatch(createNotificationAction( + `${errorCode}: ${errorMessage} ${cause ? `-${cause}` : ''}`, + NotificationTypes.ERROR + )); } } diff --git a/ui/src/app/form/component/IconButton.js b/ui/src/app/form/component/IconButton.js index 5cac9c37d..489345676 100644 --- a/ui/src/app/form/component/IconButton.js +++ b/ui/src/app/form/component/IconButton.js @@ -11,11 +11,12 @@ const mappings = { "arrow-down": , }; -const IconButton = (props) => { +const IconButton = ({children, ...props}) => { const { icon, ...otherProps } = props; return ( ); }; diff --git a/ui/src/app/form/component/InfoIcon.js b/ui/src/app/form/component/InfoIcon.js index 989428435..d813fe777 100644 --- a/ui/src/app/form/component/InfoIcon.js +++ b/ui/src/app/form/component/InfoIcon.js @@ -17,6 +17,7 @@ export function InfoIcon ({ value, placement='left', ...props }) { )} aria-label={translate('tooltip.instruction')}> diff --git a/ui/src/app/form/component/fields/FilterTargetField.js b/ui/src/app/form/component/fields/FilterTargetField.js index b9d44c725..49f3663e2 100644 --- a/ui/src/app/form/component/fields/FilterTargetField.js +++ b/ui/src/app/form/component/fields/FilterTargetField.js @@ -162,7 +162,7 @@ const FilterTargetField = ({ - +
diff --git a/ui/src/app/form/component/templates/ArrayFieldTemplate.js b/ui/src/app/form/component/templates/ArrayFieldTemplate.js index e138c10a0..637e7f7ea 100644 --- a/ui/src/app/form/component/templates/ArrayFieldTemplate.js +++ b/ui/src/app/form/component/templates/ArrayFieldTemplate.js @@ -86,7 +86,7 @@ const ObjectArrayItem = ({type, ...props}) => { props.disabled || props.readonly || !props.hasMoveUp } onClick={props.onReorderClick(props.index, props.index - 1)} - /> + >Move Up
)} @@ -100,7 +100,7 @@ const ObjectArrayItem = ({type, ...props}) => { props.disabled || props.readonly || !props.hasMoveDown } onClick={props.onReorderClick(props.index, props.index + 1)} - /> + >Move Down
)} @@ -114,7 +114,7 @@ const ObjectArrayItem = ({type, ...props}) => { style={btnStyle} disabled={props.disabled || props.readonly} onClick={props.onDropIndexClick(props.index)} - /> + >Delete )} @@ -156,7 +156,7 @@ const DefaultArrayItem = (props) => { props.disabled || props.readonly || !props.hasMoveUp } onClick={props.onReorderClick(props.index, props.index - 1)} - /> + >Move Up )} @@ -170,7 +170,7 @@ const DefaultArrayItem = (props) => { props.disabled || props.readonly || !props.hasMoveDown } onClick={props.onReorderClick(props.index, props.index + 1)} - /> + >Move Down )} @@ -184,7 +184,7 @@ const DefaultArrayItem = (props) => { style={btnStyle} disabled={props.disabled || props.readonly} onClick={props.onDropIndexClick(props.index)} - /> + >Delete )} @@ -210,7 +210,7 @@ const DefaultFixedArrayFieldTemplate = (props) => { className="array-item-add" onClick={props.onAddClick} disabled={props.disabled || props.readonly} - /> + >Add )} @@ -254,7 +254,7 @@ const DefaultNormalArrayFieldTemplate = (props) => { className="array-item-add mx-2" onClick={props.onAddClick} disabled={props.disabled || props.readonly} - /> + >Add )} {(props.uiSchema["ui:description"] || props.schema.description) && ( console.log(bundle), [bundle]); - const onMouseOver = (opt) => setBundle(opt); const onMouseOut = () => setBundle(null); diff --git a/ui/src/app/form/component/widgets/OptionWidget.js b/ui/src/app/form/component/widgets/OptionWidget.js index b1b43fee5..728e66c87 100644 --- a/ui/src/app/form/component/widgets/OptionWidget.js +++ b/ui/src/app/form/component/widgets/OptionWidget.js @@ -12,7 +12,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { faAsterisk, faCaretDown, faCaretUp } from "@fortawesome/free-solid-svg-icons"; import { useTranslator } from "../../../i18n/hooks"; -const ToggleButton = ({ isOpen, onClick, disabled }) => ( +const ToggleButton = ({ isOpen, onClick, disabled, children }) => ( ); @@ -91,15 +92,16 @@ const OptionWidget = ({ return ( - 0) ? "text-danger" : ""}`}> + 0) ? "text-danger" : ""}`} htmlFor={`option-selector-${id}`}> - {(label || schema.title) && required ? : null} + {(label || schema.title) && required ? : Item {id + 1}} {schema.description && } {({ isMenuShown, toggleMenu }) => ( - toggleMenu()} disabled={disabled || readonly} /> + toggleMenu()} disabled={disabled || readonly}> + Options + )} {rawErrors?.length > 0 && touched && ( diff --git a/ui/src/app/form/component/widgets/SelectWidget.js b/ui/src/app/form/component/widgets/SelectWidget.js index 76dc99ec6..4a00dbbf3 100644 --- a/ui/src/app/form/component/widgets/SelectWidget.js +++ b/ui/src/app/form/component/widgets/SelectWidget.js @@ -86,7 +86,7 @@ const SelectWidget = ({ return ( - 0 ? "text-danger" : ""}`}> + 0 ? "text-danger" : ""}`} htmlFor={id}> {(label || schema.title) && required ? : null} @@ -127,7 +127,7 @@ const SelectWidget = ({ )} {(enumOptions).map(({ value, label }, i) => - )} diff --git a/ui/src/app/form/component/widgets/TextWidget.js b/ui/src/app/form/component/widgets/TextWidget.js index 8554be911..c4150e0f2 100644 --- a/ui/src/app/form/component/widgets/TextWidget.js +++ b/ui/src/app/form/component/widgets/TextWidget.js @@ -41,7 +41,7 @@ const TextWidget = ({ // const classNames = [rawErrors?.length > 0 ? "is-invalid" : "", type === 'file' ? 'custom-file-label': ""] return ( - 0 && touched ? "text-danger" : ""}`}> + 0 && touched ? "text-danger" : ""}`} htmlFor={id}> {(label || schema.title) && required ? diff --git a/ui/src/app/metadata/Metadata.js b/ui/src/app/metadata/Metadata.js index 81cd1e35a..20fec9021 100644 --- a/ui/src/app/metadata/Metadata.js +++ b/ui/src/app/metadata/Metadata.js @@ -49,7 +49,7 @@ export function Metadata () { } /> - + } /> diff --git a/ui/src/app/metadata/copy/CopySource.js b/ui/src/app/metadata/copy/CopySource.js index 65e90a5e5..83a8591e8 100644 --- a/ui/src/app/metadata/copy/CopySource.js +++ b/ui/src/app/metadata/copy/CopySource.js @@ -1,13 +1,14 @@ import React from 'react'; import { useForm } from 'react-hook-form'; -import Check from 'react-bootstrap/FormCheck'; import Button from 'react-bootstrap/Button'; +import Form from 'react-bootstrap/Form'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { faArrowCircleRight, faAsterisk, faCheck, faTimes } from '@fortawesome/free-solid-svg-icons'; import { Translate } from '../../i18n/components/translate'; import { EntityTypeahead } from './EntityTypeahead'; import kebabCase from 'lodash/kebabCase'; +import { useMetadataSources } from '../hooks/api'; const sections = [ { i18nKey: 'organizationInformation', property: 'organization' }, @@ -23,6 +24,8 @@ const sections = [ export function CopySource({ copy, onNext }) { + const { data = [] } = useMetadataSources({ cachePolicy: 'no-cache' }, []); + const [selected, setSelected] = React.useState(copy.properties); const onSelect = (item, checked) => { let s = [...selected]; @@ -59,6 +62,8 @@ export function CopySource({ copy, onNext }) { setValue('properties', selected); }, [selected, setValue]); + const sourceIds = data.map(p => p.entityId); + return ( <>
@@ -94,54 +99,52 @@ export function CopySource({ copy, onNext }) {
-
- - - {errors?.target?.type === 'required' && - + + + Entity ID to copy is Required - - } -
-
- - + - {errors?.serviceProviderName?.type === 'required' && Service Resolver Name is required - } -
-
- - + - {errors?.entityId && - - {errors.entityId.type === 'required' && - Entity ID is required - } - {errors.entityId.type === 'unique' && - Entity ID must be unique + {...register('entityId', { + required: true, validate: { + unique: v => !(sourceIds.indexOf(v) > -1) } - - } -
+ })} /> + + {errors?.entityId?.type === 'required' && + Entity ID is required + } + {errors?.entityId?.type === 'unique' && + Entity ID must be unique + } + +
@@ -156,14 +159,15 @@ export function CopySource({ copy, onNext }) { {sections.map((item, i) => - + - onSelect(item, checked)} checked={selected.indexOf(item.property) > -1} + aria-labelledby={`property-checkbox-${i}`} /> diff --git a/ui/src/app/metadata/copy/EntityTypeahead.js b/ui/src/app/metadata/copy/EntityTypeahead.js index be74fd1b3..ed8b9a14e 100644 --- a/ui/src/app/metadata/copy/EntityTypeahead.js +++ b/ui/src/app/metadata/copy/EntityTypeahead.js @@ -3,7 +3,7 @@ import { Typeahead } from 'react-bootstrap-typeahead'; import { useController } from 'react-hook-form'; import { useMetadataSources } from '../hooks/api'; -export function EntityTypeahead ({control, name}) { +export function EntityTypeahead ({id, control, name}) { const { data = [] } = useMetadataSources({}, []); const entities = React.useMemo(() => data.map(d => d.entityId), [data]); @@ -12,7 +12,9 @@ export function EntityTypeahead ({control, name}) { } = useController({ name, control, - rules: { required: true }, + rules: { + required: true + }, defaultValue: "", }); @@ -22,7 +24,8 @@ export function EntityTypeahead ({control, name}) { onChange={(selected) => onChange(selected ? data.find(e => e.entityId === selected[0]) : '')} defaultInputValue={value ? value.entityId : ''} options={entities} - id="copySourceTypeahead" + required={true} + id={id} /> ) } \ No newline at end of file diff --git a/ui/src/app/metadata/copy/SaveCopy.js b/ui/src/app/metadata/copy/SaveCopy.js index 0c48515e4..9381d662a 100644 --- a/ui/src/app/metadata/copy/SaveCopy.js +++ b/ui/src/app/metadata/copy/SaveCopy.js @@ -1,5 +1,4 @@ import React from 'react'; -import Check from 'react-bootstrap/FormCheck'; import Button from 'react-bootstrap/Button'; import { faArrowCircleLeft, faCheck, faSave, faSpinner } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; @@ -12,9 +11,6 @@ import { removeNull } from '../../core/utility/remove_null'; import { MetadataConfiguration } from '../component/MetadataConfiguration'; import Translate from '../../i18n/components/translate'; -import { InfoIcon } from '../../form/component/InfoIcon'; - - export function useCopiedModel (copy) { const { properties, target, serviceProviderName, entityId } = copy; const copied = removeNull(properties.reduce((c, section) => ({ ...c, ...{ [section]: target[section] } }), {})); @@ -37,7 +33,7 @@ export function SaveCopy ({ copy, saving, onSave, onBack }) { const model = useCopiedModel(copy); const configuration = useCopiedConfiguration(model, schema, definition); - const { register, handleSubmit } = useForm({ + const { handleSubmit } = useForm({ mode: 'onChange', reValidateMode: 'onBlur', defaultValues: { @@ -59,61 +55,42 @@ export function SaveCopy ({ copy, saving, onSave, onBack }) { return ( <> -
-
-
    -
  • - -
    • -
  • -

    - - - - Finished! -

    -
    • -
  • - -
    • -
-
+
+
+
    +
  • + +
    • +
  • +

    + + + + Finished! +

    +
    • +
  • + +
    • +
-
-
-
-
-
- - - -
-
-
-
-
- +
); diff --git a/ui/src/app/metadata/domain/filter/definition/BaseFilterDefinition.js b/ui/src/app/metadata/domain/filter/definition/BaseFilterDefinition.js index 8bdf9bfab..daed4cadc 100644 --- a/ui/src/app/metadata/domain/filter/definition/BaseFilterDefinition.js +++ b/ui/src/app/metadata/domain/filter/definition/BaseFilterDefinition.js @@ -11,7 +11,7 @@ export const BaseFilterDefinition = { return (formData, errors) => { if (names.indexOf(formData.name) > -1) { - errors.name.addError('message.name-unique'); + errors.name.addError('message.name-must-be-unique'); } if (formData.hasOwnProperty(targetProp)) { @@ -38,7 +38,10 @@ export const BaseFilterDefinition = { '@type': { 'ui:widget': 'hidden' }, - 'resourceId': { + resourceId: { + 'ui:widget': 'hidden' + }, + filterEnabled: { 'ui:widget': 'hidden' } } diff --git a/ui/src/app/metadata/domain/filter/definition/EntityAttributesFilterDefinition.js b/ui/src/app/metadata/domain/filter/definition/EntityAttributesFilterDefinition.js index 7ef0e08a9..b12d476e9 100644 --- a/ui/src/app/metadata/domain/filter/definition/EntityAttributesFilterDefinition.js +++ b/ui/src/app/metadata/domain/filter/definition/EntityAttributesFilterDefinition.js @@ -75,7 +75,8 @@ export const EntityAttributesFilterEditor= { 'name', '@type', 'resourceId', - 'entityAttributesFilterTarget' + 'entityAttributesFilterTarget', + 'filterEnabled' ] }, { diff --git a/ui/src/app/metadata/domain/filter/definition/NameIdFilterDefinition.js b/ui/src/app/metadata/domain/filter/definition/NameIdFilterDefinition.js index 358b51b34..d7f1492b9 100644 --- a/ui/src/app/metadata/domain/filter/definition/NameIdFilterDefinition.js +++ b/ui/src/app/metadata/domain/filter/definition/NameIdFilterDefinition.js @@ -42,7 +42,8 @@ export const NameIDFilterEditor = { 'name', '@type', 'resourceId', - 'nameIdFormatFilterTarget' + 'nameIdFormatFilterTarget', + 'filterEnabled' ] }, { diff --git a/ui/src/app/metadata/domain/provider/definition/BaseProviderDefinition.js b/ui/src/app/metadata/domain/provider/definition/BaseProviderDefinition.js index 207eb0a2e..a411f5e89 100644 --- a/ui/src/app/metadata/domain/provider/definition/BaseProviderDefinition.js +++ b/ui/src/app/metadata/domain/provider/definition/BaseProviderDefinition.js @@ -30,7 +30,6 @@ export const BaseProviderDefinition = { ...changes, metadataFilters: [ ...changes.metadataFilters.filter((filter, filterName) => { - if (filter['@type'] === 'RequiredValidUntil') { if (!filter.maxValidityInterval || filter.maxValidityInterval === "") { return false; @@ -77,9 +76,13 @@ export const BaseProviderDefinition = { } }; }, + overrideSchema: (schema) => schema, uiSchema: { name: { 'ui:help': 'message.must-be-unique' + }, + enabled: { + 'ui:widget': 'hidden' } }, steps: [ diff --git a/ui/src/app/metadata/domain/provider/definition/DynamicHttpMetadataProviderDefinition.js b/ui/src/app/metadata/domain/provider/definition/DynamicHttpMetadataProviderDefinition.js index 84b694e9a..a7d110f0c 100644 --- a/ui/src/app/metadata/domain/provider/definition/DynamicHttpMetadataProviderDefinition.js +++ b/ui/src/app/metadata/domain/provider/definition/DynamicHttpMetadataProviderDefinition.js @@ -1,14 +1,57 @@ import { BaseProviderDefinition, HttpMetadataResolverAttributesSchema, MetadataFilterPluginsSchema } from './BaseProviderDefinition'; import API_BASE_PATH from '../../../../App.constant'; import defaultsDeep from 'lodash/defaultsDeep'; +import isNil from 'lodash/isNil'; import { DurationOptions } from '../../data'; import { isValidRegex } from '../../../../core/utility/is_valid_regex'; +function findById(o, id) { + //Early return + if (o.$id === id) { + return o; + } + var result, p; + for (p in o) { + if (o.hasOwnProperty(p) && typeof o[p] === 'object') { + result = findById(o[p], id); + if (result) { + return result; + } + } + } + return result; +} + + export const DynamicHttpMetadataProviderWizard = { ...BaseProviderDefinition, label: 'DynamicHttpMetadataProvider', type: 'DynamicHttpMetadataResolver', schema: `${API_BASE_PATH}/ui/MetadataResolver/DynamicHttpMetadataResolver`, + overrideSchema: (schema, models) => { + + const includeMatch = models.some(m => !isNil(m?.metadataRequestURLConstructionScheme?.match)); + + console.log(models) + + if (includeMatch) { + return ({ + ...schema, + properties: { + ...schema.properties, + metadataRequestURLConstructionScheme: { + ...schema.properties.metadataRequestURLConstructionScheme, + properties: { + ...schema.properties.metadataRequestURLConstructionScheme.properties, + match: findById(schema.properties.metadataRequestURLConstructionScheme.dependencies, 'match') + } + } + } + }); + } + + return schema; + }, validator: (data = [], current = { resourceId: null }, group, translator) => { const base = BaseProviderDefinition.validator(data, current, group); @@ -199,7 +242,8 @@ export const DynamicHttpMetadataProviderEditor = { 'xmlId', 'metadataRequestURLConstructionScheme', 'requireValidMetadata', - 'failFastInitialization' + 'failFastInitialization', + 'enabled' ] }, { diff --git a/ui/src/app/metadata/domain/provider/definition/FileBackedHttpMetadataProviderDefinition.js b/ui/src/app/metadata/domain/provider/definition/FileBackedHttpMetadataProviderDefinition.js index 5001895ce..106edfa55 100644 --- a/ui/src/app/metadata/domain/provider/definition/FileBackedHttpMetadataProviderDefinition.js +++ b/ui/src/app/metadata/domain/provider/definition/FileBackedHttpMetadataProviderDefinition.js @@ -198,7 +198,8 @@ export const FileBackedHttpMetadataProviderEditor = { 'requireValidMetadata', 'failFastInitialization', 'useDefaultPredicateRegistry', - 'satisfyAnyPredicates' + 'satisfyAnyPredicates', + 'enabled' ] }, { diff --git a/ui/src/app/metadata/domain/provider/definition/FileSystemMetadataProviderDefinition.js b/ui/src/app/metadata/domain/provider/definition/FileSystemMetadataProviderDefinition.js index 57d3447af..d97b8e041 100644 --- a/ui/src/app/metadata/domain/provider/definition/FileSystemMetadataProviderDefinition.js +++ b/ui/src/app/metadata/domain/provider/definition/FileSystemMetadataProviderDefinition.js @@ -107,7 +107,8 @@ export const FileSystemMetadataProviderEditor = { 'xmlId', '@type', 'metadataFile', - 'doInitialization' + 'doInitialization', + 'enabled' ], override: { '@type': { diff --git a/ui/src/app/metadata/domain/provider/definition/LocalDynamicMetadataProviderDefinition.js b/ui/src/app/metadata/domain/provider/definition/LocalDynamicMetadataProviderDefinition.js index eea5d3541..66b48d6c4 100644 --- a/ui/src/app/metadata/domain/provider/definition/LocalDynamicMetadataProviderDefinition.js +++ b/ui/src/app/metadata/domain/provider/definition/LocalDynamicMetadataProviderDefinition.js @@ -119,6 +119,7 @@ export const LocalDynamicMetadataProviderEditor = { '@type', 'xmlId', 'sourceDirectory', + 'enabled' ], override: { '@type': { diff --git a/ui/src/app/metadata/domain/source/component/SourceList.js b/ui/src/app/metadata/domain/source/component/SourceList.js index 41ce7f0cd..baf249c9f 100644 --- a/ui/src/app/metadata/domain/source/component/SourceList.js +++ b/ui/src/app/metadata/domain/source/component/SourceList.js @@ -35,7 +35,11 @@ export default function SourceList({ entities, onDelete, onEnable, onChangeGroup Created Date Enabled {isAdmin && onChangeGroup && Group } - {onDelete && isAdmin && } + {onDelete && isAdmin && + + Actions + + } diff --git a/ui/src/app/metadata/domain/source/definition/SourceDefinition.js b/ui/src/app/metadata/domain/source/definition/SourceDefinition.js index 6e2abdee3..70e686ed7 100644 --- a/ui/src/app/metadata/domain/source/definition/SourceDefinition.js +++ b/ui/src/app/metadata/domain/source/definition/SourceDefinition.js @@ -12,7 +12,7 @@ export const SourceBase = { type: '@MetadataProvider', steps: [], schema: `${API_BASE_PATH}/ui/MetadataSources`, - //schema: `/assets/schema/source/metadata-source.json`, + // schema: `/assets/schema/source/metadata-source.json`, parser: (data) => removeNull(data, true), @@ -158,6 +158,9 @@ export const SourceBase = { } ] }, + serviceEnabled: { + 'ui:widget': 'hidden' + }, contacts: { "ui:options": { orderable: false @@ -307,7 +310,8 @@ export const SourceEditor = { 'serviceProviderName', 'entityId', 'organization', - 'contacts' + 'contacts', + 'serviceEnabled' ] }, { diff --git a/ui/src/app/metadata/editor/MetadataEditor.js b/ui/src/app/metadata/editor/MetadataEditor.js index 0c8757d97..2a06e2502 100644 --- a/ui/src/app/metadata/editor/MetadataEditor.js +++ b/ui/src/app/metadata/editor/MetadataEditor.js @@ -21,14 +21,14 @@ import { checkChanges } from '../hooks/utility'; import { createNotificationAction, NotificationTypes, useNotificationDispatcher } from '../../notifications/hoc/Notifications'; import { useUserGroup } from '../../core/user/UserContext'; -export function MetadataEditor ({ current }) { +export function MetadataEditor ({ restore, current, reload }) { const translator = useTranslator(); const group = useUserGroup(); const { type, id, section } = useParams(); - const { update, loading } = useMetadataUpdater(`${ API_BASE_PATH }${getMetadataPath(type)}`, current); + const { update, loading } = useMetadataUpdater(`${ API_BASE_PATH }${getMetadataPath(type)}`, current, reload); const notificationDispatch = useNotificationDispatcher(); @@ -51,9 +51,15 @@ export function MetadataEditor ({ current }) { .then(() => { gotoDetail({ refresh: true }); }) - .catch(err => { - // window.location.reload(); - notificationDispatch(createNotificationAction(`${err.errorCode} - ${translator(err.errorMessage)}`, NotificationTypes.ERROR)) + .catch((err) => { + notificationDispatch( + createNotificationAction(`${err.errorCode > 1 ? `${err.errorCode} - ` : ''} ${translator(err.errorMessage)}`, err.errorCode === 1 ? NotificationTypes.INFO : NotificationTypes.ERROR) + ); + if (err.errorCode === 1) { + setTimeout(() => { + window.location.reload(); + }, 500); + } }); }; @@ -71,10 +77,9 @@ export function MetadataEditor ({ current }) { const resetBlock = blocking; setBlocking(false); setTimeout(() => { - history.push(path); + history.push(restore ? `../${path}/edit` : path); setBlocking(resetBlock); }); - // setBlocking(resetBlock); }; const [blocking, setBlocking] = React.useState(false); @@ -83,7 +88,7 @@ export function MetadataEditor ({ current }) { const warnings = definition.warnings && definition.warnings(metadata); - const canFilter = FilterableProviders.indexOf(definition.type) > -1; + const canFilter = restore ? false : FilterableProviders.indexOf(definition.type) > -1; return (
diff --git a/ui/src/app/metadata/editor/MetadataFilterEditor.js b/ui/src/app/metadata/editor/MetadataFilterEditor.js index 2fe4f9ca9..21c764f41 100644 --- a/ui/src/app/metadata/editor/MetadataFilterEditor.js +++ b/ui/src/app/metadata/editor/MetadataFilterEditor.js @@ -60,7 +60,7 @@ export function MetadataFilterEditor({children, onNavigate, block}) {

} - {errors.length === 0 && warnings && warnings.hasOwnProperty(section) && + {warnings && warnings.hasOwnProperty(section) && {warnings[section].map((w, widx) =>

diff --git a/ui/src/app/metadata/hoc/MetadataSchema.js b/ui/src/app/metadata/hoc/MetadataSchema.js index 6ee801c28..025e7a415 100644 --- a/ui/src/app/metadata/hoc/MetadataSchema.js +++ b/ui/src/app/metadata/hoc/MetadataSchema.js @@ -54,6 +54,4 @@ export function useMetadataDefinitionValidator(data, current, group) { return definition.validator(data, current, group, translator); } -//getConfigurationSections - export default MetadataSchema; \ No newline at end of file diff --git a/ui/src/app/metadata/hooks/api.js b/ui/src/app/metadata/hooks/api.js index 49e11f338..a67f9ef5a 100644 --- a/ui/src/app/metadata/hooks/api.js +++ b/ui/src/app/metadata/hooks/api.js @@ -97,7 +97,7 @@ export function useMetadataFilterTypes () { return MetadataFilterTypes; } -export function useMetadataUpdater (path, current) { +export function useMetadataUpdater (path, current, cancel) { const { request, put, get, error, response, ...props } = useFetch(path, { cachePolicy: 'no-cache' }); @@ -111,8 +111,9 @@ export function useMetadataUpdater (path, current) { return new Promise((resolve, reject) => { dispatch(openContentionModalAction(current, latest, body, async (resolution) => { resolve(await update(p, resolution)); - }, () => { - reject(); + }, (err) => { + cancel && cancel(); + reject({ errorCode: 1, errorMessage: 'Updated data with latest changes - Reloading' }); })); }); } diff --git a/ui/src/app/metadata/hooks/configuration.js b/ui/src/app/metadata/hooks/configuration.js index 0574359a1..0c78cd90f 100644 --- a/ui/src/app/metadata/hooks/configuration.js +++ b/ui/src/app/metadata/hooks/configuration.js @@ -18,5 +18,5 @@ export function useMetadataConfiguration(models, schema, definition, limited = f return {}; } - return getLimitedConfigurationsFn(getConfigurationSections(models, definition, schema), limited); + return getLimitedConfigurationsFn(getConfigurationSections(models, definition, definition.overrideSchema ? definition.overrideSchema(schema, models) : schema), limited); } diff --git a/ui/src/app/metadata/view/MetadataComparison.js b/ui/src/app/metadata/view/MetadataComparison.js index 05bfe6d82..41cc75540 100644 --- a/ui/src/app/metadata/view/MetadataComparison.js +++ b/ui/src/app/metadata/view/MetadataComparison.js @@ -17,6 +17,7 @@ import { useTranslation } from '../../i18n/hooks'; import { MetadataFilterVersionList } from '../domain/filter/component/MetadataFilterVersionList'; import { MetadataFilterVersionContext } from '../domain/filter/component/MetadataFilterVersionContext'; import { useMetadataSchema } from '../hooks/schema'; +import { FilterableProviders } from '../domain/provider'; export function MetadataComparison () { @@ -32,11 +33,13 @@ export function MetadataComparison () { const toggleLimited = useTranslation('action.view-only-changes'); + const canFilter = FilterableProviders.indexOf(definition.type) > -1; + return ( <>

Compare  - Source + Source  Configuration

{versions && @@ -61,7 +64,7 @@ export function MetadataComparison () {
- {type === 'provider' && v && + {type === 'provider' && canFilter && v &&

diff --git a/ui/src/app/metadata/view/MetadataCopy.js b/ui/src/app/metadata/view/MetadataCopy.js index 1584e4897..af4567b59 100644 --- a/ui/src/app/metadata/view/MetadataCopy.js +++ b/ui/src/app/metadata/view/MetadataCopy.js @@ -5,12 +5,15 @@ import { CopySource } from '../copy/CopySource'; import { SaveCopy } from '../copy/SaveCopy'; import { useMetadataEntity } from '../hooks/api'; import { useHistory } from 'react-router'; +import { createNotificationAction, NotificationTypes, useNotificationDispatcher } from '../../notifications/hoc/Notifications'; export function MetadataCopy ({ onShowNav }) { const { post, response, loading } = useMetadataEntity('source'); const history = useHistory(); + const dispatch = useNotificationDispatcher(); + const [copy, setCopy] = React.useState({ target: null, serviceProviderName: null, @@ -34,6 +37,12 @@ export function MetadataCopy ({ onShowNav }) { await post('', data); if (response.ok) { history.push('/'); + } else { + const { errorCode, errorMessage, cause } = response.data; + dispatch(createNotificationAction( + `${errorCode}: ${errorMessage} ${cause ? `-${cause}` : ''}`, + NotificationTypes.ERROR + )); } } diff --git a/ui/src/app/metadata/view/MetadataEdit.js b/ui/src/app/metadata/view/MetadataEdit.js index 45d326312..6fcabd933 100644 --- a/ui/src/app/metadata/view/MetadataEdit.js +++ b/ui/src/app/metadata/view/MetadataEdit.js @@ -3,13 +3,13 @@ import { MetadataForm } from '../hoc/MetadataFormContext'; import { MetadataEditor } from '../editor/MetadataEditor'; import { useMetadataObject } from '../hoc/MetadataSelector'; -export function MetadataEdit() { +export function MetadataEdit({reload}) { const base = useMetadataObject(); return ( - + ); } \ No newline at end of file diff --git a/ui/src/app/metadata/view/MetadataRestore.js b/ui/src/app/metadata/view/MetadataRestore.js index 3dd257d4d..7d009c60f 100644 --- a/ui/src/app/metadata/view/MetadataRestore.js +++ b/ui/src/app/metadata/view/MetadataRestore.js @@ -16,7 +16,7 @@ export function MetadataRestore() { ...metadata, version: latest.version }}> - diff --git a/ui/src/app/metadata/view/MetadataUpload.js b/ui/src/app/metadata/view/MetadataUpload.js index 3c6ce4598..28b953ff4 100644 --- a/ui/src/app/metadata/view/MetadataUpload.js +++ b/ui/src/app/metadata/view/MetadataUpload.js @@ -142,7 +142,7 @@ export function MetadataUpload() { —

- + 0 } type="text" className="form-control"{...register('url')} />
diff --git a/ui/src/app/metadata/view/MetadataWizard.js b/ui/src/app/metadata/view/MetadataWizard.js index 4a4b4b5c7..6ba534ffd 100644 --- a/ui/src/app/metadata/view/MetadataWizard.js +++ b/ui/src/app/metadata/view/MetadataWizard.js @@ -7,10 +7,12 @@ import { Wizard } from '../wizard/Wizard'; import { useMetadataEntity } from '../hooks/api'; import { createNotificationAction, NotificationTypes, useNotificationDispatcher } from '../../notifications/hoc/Notifications'; import { Prompt, useHistory } from 'react-router'; +import { useTranslator } from '../../i18n/hooks'; export function MetadataWizard ({type, data, onCallback}) { const history = useHistory(); + const translator = useTranslator(); const { post, loading, response } = useMetadataEntity(type === 'source' ? 'source' : 'provider'); @@ -19,15 +21,21 @@ export function MetadataWizard ({type, data, onCallback}) { const [blocking, setBlocking] = React.useState(false); async function save(metadata) { - console.log(metadata); await post('', metadata); if (response.ok) { setBlocking(false); history.push(`/dashboard/metadata/manager/${type === 'source' ? 'resolvers' : 'providers'}`); } else { - const { errorCode, errorMessage, cause } = response.data; + let msg; + if (response.status) { + const { errorCode, errorMessage, cause } = response.data; + msg = `${errorCode}: ${errorMessage} ${cause ? `-${cause}` : ''}`; + } else { + msg = translator('message.session-timeout'); + } + notificationDispatch(createNotificationAction( - `${errorCode}: ${errorMessage} ${cause ? `-${cause}` : ''}`, + msg, NotificationTypes.ERROR )); } diff --git a/ui/src/app/metadata/wizard/MetadataProviderTypeSelector.js b/ui/src/app/metadata/wizard/MetadataProviderTypeSelector.js index 5a091b2d2..dc4acd4d4 100644 --- a/ui/src/app/metadata/wizard/MetadataProviderTypeSelector.js +++ b/ui/src/app/metadata/wizard/MetadataProviderTypeSelector.js @@ -44,6 +44,8 @@ export function MetadataProviderTypeSelector({ type, types = [], children}) { const providerNames = data.map(p => p.name); + console.log(errors); + return ( <>{showSelector ? <> @@ -82,7 +84,7 @@ export function MetadataProviderTypeSelector({ type, types = [], children}) { - + !(providerNames.indexOf(v) > -1) }})} /> - {errors?.name?.unique && } - {errors?.name?.required && } + {errors?.name?.type === 'unique' && } + {errors?.name?.type === 'required' && } diff --git a/ui/src/app/metadata/wizard/MetadataSourceWizard.js b/ui/src/app/metadata/wizard/MetadataSourceWizard.js index 364d74421..66e75e32b 100644 --- a/ui/src/app/metadata/wizard/MetadataSourceWizard.js +++ b/ui/src/app/metadata/wizard/MetadataSourceWizard.js @@ -12,16 +12,15 @@ import { useMetadataDefinitionContext, useMetadataSchemaContext, useMetadataDefi import { useMetadataFormDispatcher, setFormDataAction, setFormErrorAction, useMetadataFormData, useMetadataFormErrors } from '../hoc/MetadataFormContext'; import { MetadataConfiguration } from '../component/MetadataConfiguration'; import { Configuration } from '../hoc/Configuration'; -import { useMetadataEntity, useMetadataSources } from '../hooks/api'; +import { useMetadataSources } from '../hooks/api'; import Translate from '../../i18n/components/translate'; import { checkChanges } from '../hooks/utility'; import { useUserGroup } from '../../core/user/UserContext'; -export function MetadataSourceWizard ({ onShowNav, onSave, block }) { +export function MetadataSourceWizard ({ onShowNav, onSave, block, loading }) { - const { loading } = useMetadataEntity('source'); const group = useUserGroup(); const { data } = useMetadataSources({ @@ -61,6 +60,8 @@ export function MetadataSourceWizard ({ onShowNav, onSave, block }) { const validator = useMetadataDefinitionValidator(data, null, group); const warnings = definition.warnings && definition.warnings(metadata); + React.useEffect(() => console.log(loading), [loading]); + return ( <>
diff --git a/ui/src/testing/dynamic-http.schema.js b/ui/src/testing/dynamic-http.schema.js index 29d68da8c..a9318f635 100644 --- a/ui/src/testing/dynamic-http.schema.js +++ b/ui/src/testing/dynamic-http.schema.js @@ -1,3 +1,3 @@ -export const schema = { "type": "object", "required": ["name", "@type", "xmlId", "metadataRequestURLConstructionScheme"], "properties": { "name": { "title": "label.metadata-provider-name-dashboard-display-only", "description": "tooltip.metadata-provider-name-dashboard-display-only", "type": "string" }, "@type": { "title": "label.metadata-provider-type", "description": "tooltip.metadata-provider-type", "type": "string", "default": "DynamicHttpMetadataResolver" }, "enabled": { "title": "label.enable-provider-upon-saving", "description": "tooltip.enable-provider-upon-saving", "type": "boolean", "default": false }, "xmlId": { "title": "label.xml-id", "description": "tooltip.xml-id", "type": "string", "minLength": 1 }, "metadataRequestURLConstructionScheme": { "type": "object", "required": ["@type", "content"], "dependencies": { "@type": { "oneOf": [{ "properties": { "@type": { "enum": ["Regex"] }, "match": { "title": "label.match", "description": "tooltip.match", "type": "string", "widget": { "id": "string", "required": true } } }, "required": ["@type", "content", "match"] }, { "properties": { "@type": { "enum": ["MetadataQueryProtocol"] } }, "required": ["@type", "content"] }] } }, "properties": { "@type": { "title": "label.md-request-type", "description": "tooltip.md-request-type", "type": "string", "widget": { "id": "select" }, "enum": ["MetadataQueryProtocol", "Regex"] }, "content": { "title": "label.md-request-value", "description": "tooltip.md-request-value", "type": "string" } } }, "requireValidMetadata": { "title": "label.require-valid-metadata", "description": "tooltip.require-valid-metadata", "type": "boolean" }, "failFastInitialization": { "title": "label.fail-fast-init", "description": "tooltip.fail-fast-init", "type": "boolean" }, "dynamicMetadataResolverAttributes": { "type": "object", "dependencies": { "initializeFromPersistentCacheInBackground": { "oneOf": [{ "properties": { "initializeFromPersistentCacheInBackground": { "enum": [true] }, "backgroundInitializationFromCacheDelay": { "title": "label.background-init-from-cache-delay", "description": "tooltip.background-init-from-cache-delay", "type": "string", "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" } } }, { "properties": { "initializeFromPersistentCacheInBackground": { "enum": [false] } } }] } }, "properties": { "refreshDelayFactor": { "title": "label.refresh-delay-factor", "description": "tooltip.refresh-delay-factor", "type": "number", "multipleOf": 0.01, "minimum": 0.001, "maximum": 0.999 }, "minCacheDuration": { "title": "label.min-cache-duration", "description": "tooltip.min-cache-duration", "type": "string", "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" }, "maxCacheDuration": { "title": "label.max-cache-duration", "description": "tooltip.max-cache-duration", "type": "string", "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" }, "maxIdleEntityData": { "title": "label.max-idle-entity-data", "description": "tooltip.max-idle-entity-data", "type": "string", "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" }, "removeIdleEntityData": { "title": "label.remove-idle-entity-data", "description": "tooltip.remove-idle-entity-data", "type": "boolean" }, "cleanupTaskInterval": { "title": "label.cleanup-task-interval", "description": "tooltip.cleanup-task-interval", "type": "string", "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" }, "persistentCacheManagerDirectory": { "title": "label.persistent-cache-manager-directory", "description": "tooltip.persistent-cache-manager-directory", "type": "string", "minLength": 1 }, "initializeFromPersistentCacheInBackground": { "title": "label.initialize-from-persistent-cache-in-background", "description": "tooltip.initialize-from-persistent-cache-in-background", "type": "boolean" } } }, "httpMetadataResolverAttributes": { "order": [], "type": "object", "fieldsets": [{ "title": "label.http-security-attributes", "type": "section", "class": "col-12", "fields": ["disregardTLSCertificate"] }, { "title": "label.http-connection-attributes", "type": "section", "fields": ["connectionRequestTimeout", "connectionTimeout", "socketTimeout"] }, { "title": "label.http-proxy-attributes", "type": "section", "class": "col-12", "fields": ["proxyHost", "proxyPort", "proxyUser", "proxyPassword"] }, { "title": "label.http-caching-attributes", "type": "section", "class": "col-12", "fields": ["httpCaching", "httpCacheDirectory", "httpMaxCacheEntries", "httpMaxCacheEntrySize"] }, { "title": "", "type": "hidden", "class": "col-12", "fields": ["tlsTrustEngineRef", "httpClientSecurityParametersRef", "httpClientRef"] }], "properties": { "disregardTLSCertificate": { "type": "boolean", "title": "label.disregard-tls-cert", "description": "tooltip.disregard-tls-cert" }, "httpClientRef": { "type": "string", "title": "", "description": "", "widget": "hidden" }, "connectionRequestTimeout": { "type": "string", "title": "label.connection-request-timeout", "description": "tooltip.connection-request-timeout", "widget": { "id": "datalist", "data": ["PT0S", "PT30S", "PT1M", "PT10M", "PT30M", "PT1H", "PT4H", "PT12H", "PT24H"] }, "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" }, "connectionTimeout": { "type": "string", "title": "label.connection-timeout", "description": "tooltip.connection-timeout", "widget": { "id": "datalist", "data": ["PT0S", "PT30S", "PT1M", "PT10M", "PT30M", "PT1H", "PT4H", "PT12H", "PT24H"] }, "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" }, "socketTimeout": { "type": "string", "title": "label.socket-timeout", "description": "tooltip.socket-timeout", "widget": { "id": "datalist", "data": ["PT0S", "PT30S", "PT1M", "PT10M", "PT30M", "PT1H", "PT4H", "PT12H", "PT24H"] }, "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" }, "tlsTrustEngineRef": { "type": "string", "title": "", "description": "" }, "httpClientSecurityParametersRef": { "type": "string", "title": "", "description": "" }, "proxyHost": { "type": "string", "title": "label.proxy-host", "description": "tooltip.proxy-host" }, "proxyPort": { "type": "integer", "title": "label.proxy-port", "description": "tooltip.proxy-port" }, "proxyUser": { "type": "string", "title": "label.proxy-user", "description": "tooltip.proxy-user" }, "proxyPassword": { "type": "string", "title": "label.proxy-password", "description": "tooltip.proxy-password" }, "httpCaching": { "type": "string", "title": "label.http-caching", "description": "tooltip.http-caching", "widget": { "id": "select" }, "oneOf": [{ "enum": ["none"], "description": "value.none" }, { "enum": ["file"], "description": "value.file" }, { "enum": ["memory"], "description": "value.memory" }] }, "httpCacheDirectory": { "type": "string", "title": "label.http-caching-directory", "description": "tooltip.http-caching-directory" }, "httpMaxCacheEntries": { "type": "integer", "title": "label.http-max-cache-entries", "description": "tooltip.http-max-cache-entries", "minimum": 0 }, "httpMaxCacheEntrySize": { "type": "integer", "title": "label.max-cache-entry-size", "description": "tooltip.max-cache-entry-size", "minimum": 0 } } }, "metadataFilters": { "$id": "metadataFilters", "title": "", "description": "", "type": "array", "items": [{ "$id": "RequiredValidUntil", "title": "label.required-valid-until", "type": "object", "widget": { "id": "fieldset" }, "properties": { "@type": { "type": "string", "default": "RequiredValidUntil" }, "maxValidityInterval": { "title": "label.max-validity-interval", "description": "tooltip.max-validity-interval", "type": "string", "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" } } }, { "$id": "SignatureValidation", "title": "label.signature-validation-filter", "type": "object", "widget": { "id": "fieldset" }, "properties": { "@type": { "type": "string", "default": "SignatureValidation" }, "requireSignedRoot": { "title": "label.require-signed-root", "description": "tooltip.require-signed-root", "type": "boolean" }, "certificateFile": { "title": "label.certificate-file", "description": "tooltip.certificate-file", "type": "string" } }, "dependencies": { "requireSignedRoot": { "oneOf": [{ "properties": { "requireSignedRoot": { "enum": [true] } }, "required": ["certificateFile"] }, { "properties": { "requireSignedRoot": { "enum": [false] } } }] } } }, { "$id": "EntityRoleWhiteList", "title": "label.entity-role-whitelist", "type": "object", "widget": { "id": "fieldset" }, "properties": { "@type": { "type": "string", "default": "EntityRoleWhiteList" }, "retainedRoles": { "title": "label.retained-roles", "description": "tooltip.retained-roles", "type": "array", "items": { "widget": { "id": "select" }, "type": "string", "enum": ["SPSSODescriptor", "AttributeAuthorityDescriptor"], "enumNames": ["value.spdescriptor", "value.attr-auth-descriptor"] } }, "removeRolelessEntityDescriptors": { "title": "label.remove-roleless-entity-descriptors", "description": "tooltip.remove-roleless-entity-descriptors", "type": "boolean" }, "removeEmptyEntitiesDescriptors": { "title": "label.remove-empty-entities-descriptors", "description": "tooltip.remove-empty-entities-descriptors", "type": "boolean" } } }] } } }; +export const schema = { "type": "object", "required": ["name", "@type", "xmlId", "metadataRequestURLConstructionScheme"], "properties": { "name": { "title": "label.metadata-provider-name-dashboard-display-only", "description": "tooltip.metadata-provider-name", "type": "string" }, "@type": { "title": "label.metadata-provider-type", "description": "tooltip.metadata-provider-type", "type": "string", "default": "DynamicHttpMetadataResolver" }, "enabled": { "title": "label.enable-provider-upon-saving", "description": "tooltip.enable-provider-upon-saving", "type": "boolean", "default": false }, "xmlId": { "title": "label.xml-id", "description": "tooltip.xml-id", "type": "string", "minLength": 1 }, "metadataRequestURLConstructionScheme": { "type": "object", "required": ["@type", "content"], "dependencies": { "@type": { "oneOf": [{ "properties": { "@type": { "enum": ["Regex"] }, "match": { "title": "label.match", "description": "tooltip.match", "type": "string", "widget": { "id": "string", "required": true } } }, "required": ["@type", "content", "match"] }, { "properties": { "@type": { "enum": ["MetadataQueryProtocol"] } }, "required": ["@type", "content"] }] } }, "properties": { "@type": { "title": "label.md-request-type", "description": "tooltip.md-request-type", "type": "string", "widget": { "id": "select" }, "enum": ["MetadataQueryProtocol", "Regex"] }, "content": { "title": "label.md-request-value", "description": "tooltip.md-request-value", "type": "string" } } }, "requireValidMetadata": { "title": "label.require-valid-metadata", "description": "tooltip.require-valid-metadata", "type": "boolean" }, "failFastInitialization": { "title": "label.fail-fast-init", "description": "tooltip.fail-fast-init", "type": "boolean" }, "dynamicMetadataResolverAttributes": { "type": "object", "dependencies": { "initializeFromPersistentCacheInBackground": { "oneOf": [{ "properties": { "initializeFromPersistentCacheInBackground": { "enum": [true] }, "backgroundInitializationFromCacheDelay": { "title": "label.background-init-from-cache-delay", "description": "tooltip.background-init-from-cache-delay", "type": "string", "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" } } }, { "properties": { "initializeFromPersistentCacheInBackground": { "enum": [false] } } }] } }, "properties": { "refreshDelayFactor": { "title": "label.refresh-delay-factor", "description": "tooltip.refresh-delay-factor", "type": "number", "multipleOf": 0.01, "minimum": 0.001, "maximum": 0.999 }, "minCacheDuration": { "title": "label.min-cache-duration", "description": "tooltip.min-cache-duration", "type": "string", "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" }, "maxCacheDuration": { "title": "label.max-cache-duration", "description": "tooltip.max-cache-duration", "type": "string", "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" }, "maxIdleEntityData": { "title": "label.max-idle-entity-data", "description": "tooltip.max-idle-entity-data", "type": "string", "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" }, "removeIdleEntityData": { "title": "label.remove-idle-entity-data", "description": "tooltip.remove-idle-entity-data", "type": "boolean" }, "cleanupTaskInterval": { "title": "label.cleanup-task-interval", "description": "tooltip.cleanup-task-interval", "type": "string", "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" }, "persistentCacheManagerDirectory": { "title": "label.persistent-cache-manager-directory", "description": "tooltip.persistent-cache-manager-directory", "type": "string", "minLength": 1 }, "initializeFromPersistentCacheInBackground": { "title": "label.initialize-from-persistent-cache-in-background", "description": "tooltip.initialize-from-persistent-cache-in-background", "type": "boolean" } } }, "httpMetadataResolverAttributes": { "order": [], "type": "object", "fieldsets": [{ "title": "label.http-security-attributes", "type": "section", "class": "col-12", "fields": ["disregardTLSCertificate"] }, { "title": "label.http-connection-attributes", "type": "section", "fields": ["connectionRequestTimeout", "connectionTimeout", "socketTimeout"] }, { "title": "label.http-proxy-attributes", "type": "section", "class": "col-12", "fields": ["proxyHost", "proxyPort", "proxyUser", "proxyPassword"] }, { "title": "label.http-caching-attributes", "type": "section", "class": "col-12", "fields": ["httpCaching", "httpCacheDirectory", "httpMaxCacheEntries", "httpMaxCacheEntrySize"] }, { "title": "", "type": "hidden", "class": "col-12", "fields": ["tlsTrustEngineRef", "httpClientSecurityParametersRef", "httpClientRef"] }], "properties": { "disregardTLSCertificate": { "type": "boolean", "title": "label.disregard-tls-cert", "description": "tooltip.disregard-tls-cert" }, "httpClientRef": { "type": "string", "title": "", "description": "", "widget": "hidden" }, "connectionRequestTimeout": { "type": "string", "title": "label.connection-request-timeout", "description": "tooltip.connection-request-timeout", "widget": { "id": "datalist", "data": ["PT0S", "PT30S", "PT1M", "PT10M", "PT30M", "PT1H", "PT4H", "PT12H", "PT24H"] }, "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" }, "connectionTimeout": { "type": "string", "title": "label.connection-timeout", "description": "tooltip.connection-timeout", "widget": { "id": "datalist", "data": ["PT0S", "PT30S", "PT1M", "PT10M", "PT30M", "PT1H", "PT4H", "PT12H", "PT24H"] }, "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" }, "socketTimeout": { "type": "string", "title": "label.socket-timeout", "description": "tooltip.socket-timeout", "widget": { "id": "datalist", "data": ["PT0S", "PT30S", "PT1M", "PT10M", "PT30M", "PT1H", "PT4H", "PT12H", "PT24H"] }, "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" }, "tlsTrustEngineRef": { "type": "string", "title": "", "description": "" }, "httpClientSecurityParametersRef": { "type": "string", "title": "", "description": "" }, "proxyHost": { "type": "string", "title": "label.proxy-host", "description": "tooltip.proxy-host" }, "proxyPort": { "type": "integer", "title": "label.proxy-port", "description": "tooltip.proxy-port" }, "proxyUser": { "type": "string", "title": "label.proxy-user", "description": "tooltip.proxy-user" }, "proxyPassword": { "type": "string", "title": "label.proxy-password", "description": "tooltip.proxy-password" }, "httpCaching": { "type": "string", "title": "label.http-caching", "description": "tooltip.http-caching", "widget": { "id": "select" }, "oneOf": [{ "enum": ["none"], "description": "value.none" }, { "enum": ["file"], "description": "value.file" }, { "enum": ["memory"], "description": "value.memory" }] }, "httpCacheDirectory": { "type": "string", "title": "label.http-caching-directory", "description": "tooltip.http-caching-directory" }, "httpMaxCacheEntries": { "type": "integer", "title": "label.http-max-cache-entries", "description": "tooltip.http-max-cache-entries", "minimum": 0 }, "httpMaxCacheEntrySize": { "type": "integer", "title": "label.max-cache-entry-size", "description": "tooltip.max-cache-entry-size", "minimum": 0 } } }, "metadataFilters": { "$id": "metadataFilters", "title": "", "description": "", "type": "array", "items": [{ "$id": "RequiredValidUntil", "title": "label.required-valid-until", "type": "object", "widget": { "id": "fieldset" }, "properties": { "@type": { "type": "string", "default": "RequiredValidUntil" }, "maxValidityInterval": { "title": "label.max-validity-interval", "description": "tooltip.max-validity-interval", "type": "string", "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" } } }, { "$id": "SignatureValidation", "title": "label.signature-validation-filter", "type": "object", "widget": { "id": "fieldset" }, "properties": { "@type": { "type": "string", "default": "SignatureValidation" }, "requireSignedRoot": { "title": "label.require-signed-root", "description": "tooltip.require-signed-root", "type": "boolean" }, "certificateFile": { "title": "label.certificate-file", "description": "tooltip.certificate-file", "type": "string" } }, "dependencies": { "requireSignedRoot": { "oneOf": [{ "properties": { "requireSignedRoot": { "enum": [true] } }, "required": ["certificateFile"] }, { "properties": { "requireSignedRoot": { "enum": [false] } } }] } } }, { "$id": "EntityRoleWhiteList", "title": "label.entity-role-whitelist", "type": "object", "widget": { "id": "fieldset" }, "properties": { "@type": { "type": "string", "default": "EntityRoleWhiteList" }, "retainedRoles": { "title": "label.retained-roles", "description": "tooltip.retained-roles", "type": "array", "items": { "widget": { "id": "select" }, "type": "string", "enum": ["SPSSODescriptor", "AttributeAuthorityDescriptor"], "enumNames": ["value.spdescriptor", "value.attr-auth-descriptor"] } }, "removeRolelessEntityDescriptors": { "title": "label.remove-roleless-entity-descriptors", "description": "tooltip.remove-roleless-entity-descriptors", "type": "boolean" }, "removeEmptyEntitiesDescriptors": { "title": "label.remove-empty-entities-descriptors", "description": "tooltip.remove-empty-entities-descriptors", "type": "boolean" } } }] } } }; export default schema; \ No newline at end of file diff --git a/ui/src/testing/uiSchema.js b/ui/src/testing/uiSchema.js index c1af6f4fa..8da257247 100644 --- a/ui/src/testing/uiSchema.js +++ b/ui/src/testing/uiSchema.js @@ -65,6 +65,9 @@ const schema = { ], "ui:widget": "hidden" }, + "serviceEnabled": { + "ui:widget": "hidden" + }, "contacts": { "ui:options": { "orderable": false diff --git a/ui/src/theme/project/buttons.scss b/ui/src/theme/project/buttons.scss index c1e8c5d79..df4a903ac 100644 --- a/ui/src/theme/project/buttons.scss +++ b/ui/src/theme/project/buttons.scss @@ -1,6 +1,10 @@ @import '../variables'; @import '~bootstrap/scss/_mixins'; +.btn { + -webkit-appearance: none; +} + .btn.btn-text { display: inline; padding: 0px; diff --git a/ui/src/theme/project/typography.scss b/ui/src/theme/project/typography.scss index 058e6666d..dbc6b09a0 100644 --- a/ui/src/theme/project/typography.scss +++ b/ui/src/theme/project/typography.scss @@ -18,4 +18,11 @@ line-height: 1.5; border-radius: 0.2rem; display: block; +} + +.navbar-light .navbar-text { + font-size: 1rem; + font-weight: normal; + margin: 0; + color: rgba(0, 0, 0, 0.75); } \ No newline at end of file