SHIBUI-1385

Another small commit to fix a checkbox checking issue. Might need to be applied to multiple tests.
TIER · Sep 11, 2019 · 2ea9221 · 2ea9221
1 parent 0f0a63c
commit 2ea9221
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 19 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
@@ -87,22 +87,22 @@ class SeleniumSIDETest extends Specification {
 
         where:
         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'
-//        'SHIBUI-1352: Create LocalDynamic provider'                         | '/SHIBUI-1352-1.side'
-//        'SHIBUI-1352: Create FileSystem provider'                           | '/SHIBUI-1352-2.side'
-//        'SHIBUI-1333: Verify metadata source configuration'                 | '/SHIBUI-1333.side'
-//        'SHIBUI-1334: Verify metadata source versioning'                    | '/SHIBUI-1334-1.side'
-//        'SHIBUI-1334: Verify metadata provider versioning'                  | '/SHIBUI-1334-2.side'
-//        'SHIBUI-1335: Verify File Backed HTTP Metadata Provider Filters'    | '/SHIBUI-1335-1.side'
-//        'SHIBUI-1335: Verify Filesystem Metadata Provider Filters'          | '/SHIBUI-1335-2.side'
-//        'SHIBUI-1335: Verify Local Dynamic Metadata Provider Filters'       | '/SHIBUI-1335-3.side'
-//        '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-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'
+        'SHIBUI-1352: Create LocalDynamic provider'                         | '/SHIBUI-1352-1.side'
+        'SHIBUI-1352: Create FileSystem provider'                           | '/SHIBUI-1352-2.side'
+        'SHIBUI-1333: Verify metadata source configuration'                 | '/SHIBUI-1333.side'
+        'SHIBUI-1334: Verify metadata source versioning'                    | '/SHIBUI-1334-1.side'
+        'SHIBUI-1334: Verify metadata provider versioning'                  | '/SHIBUI-1334-2.side'
+        'SHIBUI-1335: Verify File Backed HTTP Metadata Provider Filters'    | '/SHIBUI-1335-1.side'
+        'SHIBUI-1335: Verify Filesystem Metadata Provider Filters'          | '/SHIBUI-1335-2.side'
+        'SHIBUI-1335: Verify Local Dynamic Metadata Provider Filters'       | '/SHIBUI-1335-3.side'
+        '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'
+        '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-1311.side b/backend/src/integration/resources/SHIBUI-1311.side
@@ -810,11 +810,12 @@
       "id": "a97290c3-88ce-41d7-9619-f111ecbeb778",
       "comment": "",
       "command": "click",
-      "target": "css=div:nth-child(1) > sf-form-element > .has-success .custom-control-label",
+      "target": "id=/metadataFilters/SignatureValidation/requireSignedRoot",
       "targets": [
-        ["css=div:nth-child(1) > sf-form-element > .has-success .custom-control-label", "css:finder"],
-        ["xpath=//div/div/label", "xpath:position"],
-        ["xpath=//label[contains(.,'Require Signed Root')]", "xpath:innerText"]
+        ["id=/metadataFilters/SignatureValidation/requireSignedRoot.parent", "id"],
+        ["css=#\\/metadataFilters\\/SignatureValidation\\/requireSignedRoot\\.parent", "css:finder"],
+        ["xpath=//div[@id='/metadataFilters/SignatureValidation/requireSignedRoot.parent']", "xpath:attributes"],
+        ["xpath=//checkbox-component/div/div/div", "xpath:position"]
       ],
       "value": ""
     }, {