Merge branch 'master' into SHIBUI-1478

TIER · Sep 25, 2019 · b119883 · b119883
2 parents 471e88d + 2712629
commit b119883
Show file tree

Hide file tree

Showing 7 changed files with 3,530 additions and 13 deletions.
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
@@ -104,6 +104,8 @@ class SeleniumSIDETest extends Specification {
         '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": "",

diff --git a/backend/src/integration/resources/SHIBUI-1391.side b/backend/src/integration/resources/SHIBUI-1391.side
@@ -254,11 +254,48 @@
       "id": "44e705a1-f284-4303-a0b6-c4bc9896c78d",
       "comment": "",
       "command": "pause",
-      "target": "1000",
+      "target": "500",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "347b93b2-2fc6-43fb-b674-f3ef40d0adab",
+      "comment": "",
+      "command": "click",
+      "target": "css=#\\/reloadableMetadataResolverAttributes\\/minRefreshDelay-container .btn",
+      "targets": [
+        ["css=#\\/reloadableMetadataResolverAttributes\\/minRefreshDelay-container .btn", "css:finder"],
+        ["xpath=(//button[@type='button'])[2]", "xpath:attributes"],
+        ["xpath=//div[@id='/reloadableMetadataResolverAttributes/minRefreshDelay-container']/div/div/button", "xpath:idRelative"],
+        ["xpath=//div/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "f78882a2-fd36-444f-b502-045b5ffb26e1",
+      "comment": "",
+      "command": "pause",
+      "target": "500",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "07b46683-5914-4795-9f2a-b8f5316858d7",
+      "comment": "",
+      "command": "click",
+      "target": "css=.section-body",
+      "targets": [
+        ["css=.section-body", "css:finder"],
+        ["xpath=//section/div[2]", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "ab04d081-59ad-4dab-8af4-ff313def82c0",
+      "comment": "",
+      "command": "pause",
+      "target": "500",
       "targets": [],
       "value": ""
     }, {
-      "id": "824b4515-ae14-436e-a56f-d631ea9e1edc",
+      "id": "239b5688-ecdd-4530-ba5c-379ea7490f04",
       "comment": "",
       "command": "click",
       "target": "css=#\\/reloadableMetadataResolverAttributes\\/minRefreshDelay-container .btn",
@@ -271,7 +308,14 @@
       ],
       "value": ""
     }, {
-      "id": "9ee7065a-823e-4b4a-b212-0582eeaf7a00",
+      "id": "0997ef36-5d8d-45e7-b2a8-86b4c884e847",
+      "comment": "",
+      "command": "pause",
+      "target": "500",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "d5bc189f-eb4f-4378-9507-c82d98d8ecb4",
       "comment": "",
       "command": "click",
       "target": "id=/reloadableMetadataResolverAttributes/minRefreshDelay__option--0",
@@ -284,6 +328,13 @@
         ["xpath=//li[contains(.,'PT0S')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "207eaafc-845d-456d-b4b8-9182312a109e",
+      "comment": "",
+      "command": "pause",
+      "target": "500",
+      "targets": [],
+      "value": ""
     }, {
       "id": "618cc5f1-417b-4bc6-9388-3238f2304904",
       "comment": "",
@@ -296,6 +347,13 @@
         ["xpath=//div[2]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "b7b4b979-81d9-4df9-84d7-1c7cab785bcf",
+      "comment": "",
+      "command": "pause",
+      "target": "500",
+      "targets": [],
+      "value": ""
     }, {
       "id": "a89f1b4d-10bd-48f7-9b97-865710cfe01f",
       "comment": "",