SHIBUI-1378

Updated 1311, 1352 SIDEs to use latest radio ids.
TIER · Aug 1, 2019 · 23b9da2 · 23b9da2
1 parent 5a9162d
commit 23b9da2
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 27 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
@@ -106,7 +106,7 @@ class SeleniumSIDETest extends Specification {
 //        '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'
-//        'SHIBUI-1281: Metadata Source Dashboard'            | '/SHIBUI-1281.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'

diff --git a/backend/src/integration/resources/SHIBUI-1311.side b/backend/src/integration/resources/SHIBUI-1311.side
@@ -149,10 +149,11 @@
       "id": "f0459917-b2a1-4e3c-8800-25273965129f",
       "comment": "",
       "command": "click",
-      "target": "css=.form-check:nth-child(4) #\\/initializeFromBackupFile",
+      "target": "id=/initializeFromBackupFile.false",
       "targets": [
-        ["css=.form-check:nth-child(4) #\\/initializeFromBackupFile", "css:finder"],
-        ["xpath=(//input[@id='/initializeFromBackupFile'])[2]", "xpath:attributes"],
+        ["id=/initializeFromBackupFile.false", "id"],
+        ["css=#\\/initializeFromBackupFile\\.false", "css:finder"],
+        ["xpath=//input[@id='/initializeFromBackupFile.false']", "xpath:attributes"],
         ["xpath=//div[2]/label/input", "xpath:position"]
       ],
       "value": ""
@@ -198,44 +199,47 @@
       "id": "bf041d41-5d58-4f69-8fcc-49ec79e5547d",
       "comment": "",
       "command": "click",
-      "target": "css=.form-check:nth-child(4) #\\/requireValidMetadata",
+      "target": "id=/requireValidMetadata.false",
       "targets": [
-        ["css=.form-check:nth-child(4) #\\/requireValidMetadata", "css:finder"],
-        ["xpath=(//input[@id='/requireValidMetadata'])[2]", "xpath:attributes"],
+        ["id=/requireValidMetadata.false", "id"],
+        ["css=#\\/requireValidMetadata\\.false", "css:finder"],
+        ["xpath=//input[@id='/requireValidMetadata.false']", "xpath:attributes"],
         ["xpath=//div[6]/sf-form-element/div/sf-widget-chooser/boolean-radio/div/div[2]/label/input", "xpath:position"]
       ],
       "value": ""
     }, {
       "id": "fba85c75-e218-4deb-b5e1-888ff75b6a4e",
       "comment": "",
       "command": "click",
-      "target": "css=.form-check:nth-child(4) #\\/failFastInitialization",
+      "target": "id=/failFastInitialization.false",
       "targets": [
-        ["css=.form-check:nth-child(4) #\\/failFastInitialization", "css:finder"],
-        ["xpath=(//input[@id='/failFastInitialization'])[2]", "xpath:attributes"],
+        ["id=/failFastInitialization.false", "id"],
+        ["css=#\\/failFastInitialization\\.false", "css:finder"],
+        ["xpath=//input[@id='/failFastInitialization.false']", "xpath:attributes"],
         ["xpath=//div[7]/sf-form-element/div/sf-widget-chooser/boolean-radio/div/div[2]/label/input", "xpath:position"]
       ],
       "value": ""
     }, {
       "id": "375b8d6e-179b-4f14-8f00-d8a8cad29d7e",
       "comment": "",
       "command": "click",
-      "target": "css=.form-check:nth-child(4) #\\/useDefaultPredicateRegistry",
+      "target": "id=/useDefaultPredicateRegistry.false",
       "targets": [
-        ["css=.form-check:nth-child(4) #\\/useDefaultPredicateRegistry", "css:finder"],
-        ["xpath=(//input[@id='/useDefaultPredicateRegistry'])[2]", "xpath:attributes"],
+        ["id=/useDefaultPredicateRegistry.false", "id"],
+        ["css=#\\/useDefaultPredicateRegistry\\.false", "css:finder"],
+        ["xpath=//input[@id='/useDefaultPredicateRegistry.false']", "xpath:attributes"],
         ["xpath=//div[8]/sf-form-element/div/sf-widget-chooser/boolean-radio/div/div[2]/label/input", "xpath:position"]
       ],
       "value": ""
     }, {
       "id": "8b4bf341-62c0-491f-b775-d2faf55477bc",
       "comment": "",
       "command": "click",
-      "target": "id=/satisfyAnyPredicates",
+      "target": "id=/satisfyAnyPredicates.true",
       "targets": [
-        ["id=/satisfyAnyPredicates", "id"],
-        ["css=.form-check:nth-child(3) #\\/satisfyAnyPredicates", "css:finder"],
-        ["xpath=//input[@id='/satisfyAnyPredicates']", "xpath:attributes"],
+        ["id=/satisfyAnyPredicates.true", "id"],
+        ["css=#\\/satisfyAnyPredicates\\.true", "css:finder"],
+        ["xpath=//input[@id='/satisfyAnyPredicates.true']", "xpath:attributes"],
         ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/boolean-radio/div/div/label/input", "xpath:position"]
       ],
       "value": ""
@@ -674,10 +678,11 @@
       "id": "d389f80c-4923-40ad-bdb6-f1142cb95a5e",
       "comment": "",
       "command": "click",
-      "target": "css=.form-check:nth-child(4) #\\/initializeFromBackupFile",
+      "target": "id=/initializeFromBackupFile.false",
       "targets": [
-        ["css=.form-check:nth-child(4) #\\/initializeFromBackupFile", "css:finder"],
-        ["xpath=(//input[@id='/initializeFromBackupFile'])[2]", "xpath:attributes"],
+        ["id=/initializeFromBackupFile.false", "id"],
+        ["css=#\\/initializeFromBackupFile\\.false", "css:finder"],
+        ["xpath=//input[@id='/initializeFromBackupFile.false']", "xpath:attributes"],
         ["xpath=//div[2]/label/input", "xpath:position"]
       ],
       "value": ""

diff --git a/backend/src/integration/resources/SHIBUI-1352-1.side b/backend/src/integration/resources/SHIBUI-1352-1.side
@@ -238,6 +238,18 @@
         ["xpath=//li[contains(.,'PT30S')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "5ac765a9-4850-4a48-b0b4-6ea52003e5a4",
+      "comment": "",
+      "command": "waitForElementEditable",
+      "target": "css=#\\/dynamicMetadataResolverAttributes\\/maxCacheDuration-container .btn",
+      "targets": [
+        ["css=#\\/dynamicMetadataResolverAttributes\\/maxCacheDuration-container .btn", "css:finder"],
+        ["xpath=(//button[@type='button'])[3]", "xpath:attributes"],
+        ["xpath=//div[@id='/dynamicMetadataResolverAttributes/maxCacheDuration-container']/div/div/button", "xpath:idRelative"],
+        ["xpath=//div[3]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"]
+      ],
+      "value": "10000"
     }, {
       "id": "a5274853-084e-438f-8cea-9a74e55fd0b9",
       "comment": "",
@@ -292,10 +304,11 @@
       "id": "1176d384-4b0c-4a67-8e43-6cc3cbbcff73",
       "comment": "",
       "command": "click",
-      "target": "css=.form-check:nth-child(4) #\\/dynamicMetadataResolverAttributes\\/removeIdleEntityData",
+      "target": "id=/dynamicMetadataResolverAttributes/removeIdleEntityData.false",
       "targets": [
-        ["css=.form-check:nth-child(4) #\\/dynamicMetadataResolverAttributes\\/removeIdleEntityData", "css:finder"],
-        ["xpath=(//input[@id='/dynamicMetadataResolverAttributes/removeIdleEntityData'])[2]", "xpath:attributes"],
+        ["id=/dynamicMetadataResolverAttributes/removeIdleEntityData.false", "id"],
+        ["css=#\\/dynamicMetadataResolverAttributes\\/removeIdleEntityData\\.false", "css:finder"],
+        ["xpath=//input[@id='/dynamicMetadataResolverAttributes/removeIdleEntityData.false']", "xpath:attributes"],
         ["xpath=//div[2]/label/input", "xpath:position"]
       ],
       "value": ""

diff --git a/backend/src/integration/resources/SHIBUI-1352-2.side b/backend/src/integration/resources/SHIBUI-1352-2.side
@@ -179,11 +179,12 @@
       "id": "88cf741f-0922-4dfb-aaea-9e4c146ed8e1",
       "comment": "",
       "command": "click",
-      "target": "css=.form-check:nth-child(4) #\\/doInitialization",
+      "target": "id=/doInitialization.false",
       "targets": [
-        ["css=.form-check:nth-child(4) #\\/doInitialization", "css:finder"],
-        ["xpath=(//input[@id='/doInitialization'])[2]", "xpath:attributes"],
-        ["xpath=//div[2]/label/input", "xpath:position"]
+        ["id=/doInitialization.true", "id"],
+        ["css=#\\/doInitialization\\.true", "css:finder"],
+        ["xpath=//input[@id='/doInitialization.true']", "xpath:attributes"],
+        ["xpath=//label/input", "xpath:position"]
       ],
       "value": ""
     }, {