Merge branch 'master' into SHIBUI-1478

TIER · Sep 18, 2019 · 83ab6b0 · 83ab6b0
2 parents 47a10e7 + 3a1f71b
commit 83ab6b0
Show file tree

Hide file tree

Showing 20 changed files with 5,184 additions and 402 deletions.
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
@@ -101,6 +101,8 @@ class SeleniumSIDETest extends Specification {
         'SHIBUI-1335: Verify Dynamic HTTP Metadata Provider Filters'        | '/SHIBUI-1335-4.side'
         'SHIBUI-1392: Verify provider with script filter is persistable'    | '/SHIBUI-1392.side'
         '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'
     }
 }
 
diff --git a/backend/src/integration/resources/SHIBUI-1062.side b/backend/src/integration/resources/SHIBUI-1062.side