Merge branch 'feature/SHIBUI-1505' into SHIBUI-1478

TIER · Sep 20, 2019 · 920d611 · 920d611
2 parents 83ab6b0 + 18b01ec
commit 920d611
Show file tree

Hide file tree

Showing 7 changed files with 762 additions and 20 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -17,24 +17,6 @@ pipeline {
       }
     }
 
-    stage('Run Selenium tests') {
-      when {
-        expression {
-          return (GIT_BRANCH.startsWith('PR') || GIT_BRANCH.endsWith('-QA'))
-        }
-      }
-      steps {
-        sh '''
-        ./gradlew integrationTest -Dselenium.host=jenkins
-        '''
-      }
-      post {
-        always {
-          junit 'backend/build/test-results/integrationTest/**/*.xml'
-        }
-      }
-    }
-
     stage('Build Docker images') {
       when {
         expression {

diff --git a/...eth/admin/ui/controller/MetadataResolverControllerVersionEndpointsIntegrationTests.groovy b/...eth/admin/ui/controller/MetadataResolverControllerVersionEndpointsIntegrationTests.groovy
@@ -2,6 +2,7 @@ package edu.internet2.tier.shibboleth.admin.ui.controller
 
 import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilter
 import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilterTarget
+import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityRoleWhiteListFilter
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicHttpMetadataResolver
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.FileBackedHttpMetadataResolver
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.FilesystemMetadataResolver
@@ -136,6 +137,23 @@ class MetadataResolverControllerVersionEndpointsIntegrationTests extends Specifi
         noExceptionThrown()
     }
 
+    def "SHIBUI-1500"() {
+        MetadataResolver mr = new FileBackedHttpMetadataResolver(name: 'shibui-1500')
+        mr = repository.save(mr)
+
+        when: 'add a filter'
+        def filter = new EntityRoleWhiteListFilter(name: 'shibui-1500', retainedRoles: ['role1'])
+        mr.addFilter(filter)
+        mr = repository.save(mr)
+
+        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.getBody() as MetadataResolver).modifiedDate < (mrv2.getBody() as MetadataResolver).modifiedDate
+    }
+
     private getAllMetadataResolverVersions(String resourceId, responseType) {
         this.restTemplate.getForEntity(resourceUriFor(ALL_VERSIONS_URI, resourceId), responseType)
     }

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
@@ -103,6 +103,7 @@ class SeleniumSIDETest extends Specification {
         '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'
     }
 }