Merge branch 'master' into SHIBUI-1478

TIER · Sep 13, 2019 · 9c71c87 · 9c71c87
2 parents 1f1ec42 + 46fe0b5
commit 9c71c87
Show file tree

Hide file tree

Showing 76 changed files with 1,109 additions and 16,553 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
@@ -69,6 +69,9 @@ class SeleniumSIDETest extends Specification {
             } else {
                 it.baseurl = "http://localhost:${this.randomPort}"
             }
+            if (System.properties.getProperty('webdriver.headless')) {
+                it.addCliArgs('--headless')
+            }
             it
         }
         def runner = new Runner()
@@ -83,29 +86,7 @@ class SeleniumSIDETest extends Specification {
         assert result.level.exitCode == 0
 
         where:
-        //TODO: Update or delete where necessary
-        name                                                | file
-//        'Create Dynamic HTTP Metadata Resolver'             | '/dhmr.side'
-//        'Metadata Source Happy Path Save'                   | '/MetadataSourceHappyPathSAVE.side'
-//        'Metadata Provider Happy Path Save'                 | '/MetadataProviderHappyPathSAVE.side'
-//        'Create Filter Entity ID'                           | '/CreateFilterEntityID.side'
-//        'Create Filter REGEX'                               | '/CreateFilterREGEX.side'
-//        'Create Filter Script'                              | '/CreateFilterScript.side'
-//        'Create Metadata Source From XML'                   | '/CreateMetadataSourceFromXML.side'
-//        'Create Metadata Source From Copy'                  | '/CreateMetadataSourceFromCopy.side' // currently does not populate MDUI before copy (causes 400)
-//        'Create Metadata Source from URL'                   | '/CreateMetadataSourceFromURL.side'
-//        'Delete Entity ID Filter'                           | '/DeleteEntityIDFilter.side'
-//        'Delete REGEX Filter'                               | '/DeleteREGEXFilter.side'
-//        'Delete Incomplete Source'                          | '/DeleteIncompleteSource.side'
-//        'Admin Login'                                       | '/SHIBUI-1031_AdminLogin.side'
-//        'Delegated Admin: SubmitSource'                     | '/SHIBUI-1058_DelegatedAdmin_SubmitSource.side'
-//        'Create Filesystem Metadata Resolver'               | '/CreateFilesystemMetadataResolver.side'
-//        'Create Local Dynamic Metadata Resolver'            | '/CreateLocalDynamicMetadataResolver.side'
-//        'Delete Entity Attributes Script Filter'            | '/DeleteScriptFilter.side'
-//        'Create and Delete Name ID Format Entity ID Filter' | '/CreateAndDeleteNameIDFormatEntityIDFilter.side'
-//        'Create and Delete Name ID Format Regex Filter'     | '/CreateAndDeleteNameIDFormatRegexFilter.side'
-//        'Create and Delete Name ID Format Script Filter'    | '/CreateAndDeleteNameIDFormatScriptFilter.side'
-//        'Create and Modify Filter Order'                    | '/ModifyFilterOrder.side'
+        name                                                                | file
         'SHIBUI-1281: Metadata Source Dashboard'                            | '/SHIBUI-1281.side'
         'SHIBUI-1311: Metadata Provider Dashboard'                          | '/SHIBUI-1311.side'
         'SHIBUI-950: Metadata Source from XML w/ digest'                    | '/SHIBUI-950.side'