Merge branch 'master' into feature/SHIBUI-1364

TIER · Sep 23, 2019 · 6427bca · 6427bca
2 parents 40e74e4 + 2712629
commit 6427bca
Show file tree

Hide file tree

Showing 8 changed files with 4,240 additions and 28 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
@@ -3,6 +3,8 @@ 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.filters.NameIdFormatFilter
+import edu.internet2.tier.shibboleth.admin.ui.domain.filters.NameIdFormatFilterTarget
 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
@@ -15,6 +17,8 @@ import org.springframework.boot.test.web.client.TestRestTemplate
 import org.springframework.test.context.ActiveProfiles
 import spock.lang.Specification
 
+import static edu.internet2.tier.shibboleth.admin.ui.domain.filters.NameIdFormatFilterTarget.NameIdFormatFilterTargetType.ENTITY
+
 /**
  * @author Dmitriy Kopylenko
  */
@@ -154,6 +158,30 @@ class MetadataResolverControllerVersionEndpointsIntegrationTests extends Specifi
         (mrv1.getBody() as MetadataResolver).modifiedDate < (mrv2.getBody() as MetadataResolver).modifiedDate
     }
 
+    def "SHIBUI-1499"() {
+        MetadataResolver mr = new FileBackedHttpMetadataResolver(name: 'shibui-1499')
+        mr = repository.save(mr)
+
+        when: 'add a name id filter'
+        def filter = new NameIdFormatFilter(name: 'nameIDFilter').with {
+            it.nameIdFormatFilterTarget = new NameIdFormatFilterTarget().with {
+                it.nameIdFormatFilterTargetType = ENTITY
+                it.value = ['https://testme/sp']
+                it
+            }
+            it
+        }
+        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:
+        noExceptionThrown()
+    }
+
     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,9 @@ 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'
+        'SHIBUI-1407: Metadata source comparison highlights'                | '/SHIBUI-1407-1.side'
+        'SHIBUI-1407: Metadata provider comparison highlights'              | '/SHIBUI-1407-2.side'
     }
 }
 
diff --git a/backend/src/integration/resources/SHIBUI-1334-1.side b/backend/src/integration/resources/SHIBUI-1334-1.side
@@ -2155,16 +2155,10 @@
     }, {
       "id": "762e5039-7e5b-4a90-9db5-887b4ee8b625",
       "comment": "",
-      "command": "waitForElementEditable",
-      "target": "id=/serviceProviderName",
-      "targets": [
-        ["id=/serviceProviderName", "id"],
-        ["name=field93", "name"],
-        ["css=#\\/serviceProviderName", "css:finder"],
-        ["xpath=//input[@id='/serviceProviderName']", "xpath:attributes"],
-        ["xpath=//input", "xpath:position"]
-      ],
-      "value": "10000"
+      "command": "pause",
+      "target": "5000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "99731068-2016-4a7f-8a38-febfb711d027",
       "comment": "",