Merged in release-1.10.1 (pull request #566)

Release 1.10.1
TIER · Nov 5, 2021 · 9c1ce0e · 9c1ce0e
2 parents 57046c4 + 423e978
commit 9c1ce0e
Show file tree

Hide file tree

Showing 97 changed files with 1,504 additions and 1,193 deletions.
diff --git a/...eth/admin/ui/controller/MetadataResolverControllerVersionEndpointsIntegrationTests.groovy b/...eth/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<String, Object> overrides(int filterIndex) {
         (this.metadataFilters[filterIndex] as EntityAttributesFilter).relyingPartyOverrides
     }
-}
+}
diff --git a/...2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/...2/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/...end/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy b/...end/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'