Merge branch 'feature/shibui-2380' of bitbucket.org:unicon/shib-idp-u…

…i into feature/shibui-2380
TIER · Oct 17, 2022 · 93f3d7d · 93f3d7d
2 parents 97cc723 + 535fd5c
commit 93f3d7d
Show file tree

Hide file tree

Showing 11 changed files with 716 additions and 543 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
@@ -107,12 +107,12 @@ class SeleniumSIDETest extends Specification {
 
         where:
         name                                                                | file
-/*        'SHIBUI-1364: Compare FBHTTPMP with filters'                        | '/SHIBUI-1364-1.side'
+        'SHIBUI-1364: Compare FBHTTPMP with filters'                        | '/SHIBUI-1364-1.side'
         'SHIBUI-1364: Compare FSMP'                                         | '/SHIBUI-1364-2.side'
         'SHIBUI-1364: Compare LDMP'                                         | '/SHIBUI-1364-3.side'
-        'SHIBUI-1364: Compare DHTTPMP with filters'                         | '/SHIBUI-1364-4.side'*/
+        'SHIBUI-1364: Compare DHTTPMP with filters'                         | '/SHIBUI-1364-4.side'
         'SHIBUI-1281: Metadata Source Dashboard'                            | '/SHIBUI-1281.side'
-/*        'SHIBUI-1311: Metadata Provider Dashboard'                          | '/SHIBUI-1311.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'
@@ -161,6 +161,6 @@ class SeleniumSIDETest extends Specification {
         'SHIBUI-2270: Verify property set CRUD'                             | '/SHIBUI-2270-1.side'
         'SHIBUI-2270: Verify full property set'                             | '/SHIBUI-2270-2.side'
         'SHIBUI-2268: Verify Algorithm Filter'                              | '/SHIBUI-2268.side'
-        'SHIBUI-2269: Verify XML generation of external filters'            | '/SHIBUI-2269.side'*/
+        'SHIBUI-2269: Verify XML generation of external filters'            | '/SHIBUI-2269.side'
     }
 }
diff --git a/backend/src/integration/resources/SHIBUI-1281.side b/backend/src/integration/resources/SHIBUI-1281.side
@@ -1808,6 +1808,13 @@
         ["xpath=//div[4]/div/div/div/div/div/div[2]/div[4]/div/div/div/div/div/div/div/input", "xpath:position"]
       ],
       "value": "otherThings"
+    }, {
+      "id": "c01aaef5-b886-41aa-be33-2e30f988d2f7",
+      "comment": "",
+      "command": "sendKeys",
+      "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_3",
+      "targets": [],
+      "value": "${KEY_ENTER}"
     }, {
       "id": "7c85fe59-dc95-4328-a010-33d1a06a5ce5",
       "comment": "",
@@ -1859,11 +1866,11 @@
       "id": "3baa7bd3-55c0-4d10-8aa3-c0daa63ec4d4",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(2) > div:nth-child(2) > .border-bottom > .text-truncate",
+      "target": "css=div:nth-child(2) > div:nth-child(3) > .border-bottom > .text-truncate",
       "targets": [
-        ["css=div:nth-child(2) > div:nth-child(2) > .border-bottom > .text-truncate", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section/div/div[2]/div[2]/div[2]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//div[2]/div/span[2]", "xpath:position"],
+        ["css=div:nth-child(2) > div:nth-child(3) > .border-bottom > .text-truncate", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section/div/div[2]/div[2]/div[3]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//div[3]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'test-1234')]", "xpath:innerText"]
       ],
       "value": "test-1234"
@@ -1922,7 +1929,7 @@
         ["xpath=//section/div/div/span", "xpath:position"],
         ["xpath=//span[contains(.,'Current Metadata Sources')]", "xpath:innerText"]
       ],
-      "value": "10000"
+      "value": "30000"
     }, {
       "id": "ba9fb8e8-d332-45bd-accd-703284744136",
       "comment": "",
@@ -1949,7 +1956,7 @@
       ],
       "value": "test-1234"
     }, {
-      "id": "b2d9f789-fb94-459f-9947-5364cebc43d1",
+      "id": "86ceae7b-49f1-4830-b965-b58a11e06445",
       "comment": "",
       "command": "assertText",
       "target": "css=td:nth-child(3)",
@@ -1958,6 +1965,17 @@
         ["xpath=//td[3]", "xpath:position"],
         ["xpath=//td[contains(.,'root')]", "xpath:innerText"]
       ],
+      "value": "SAML"
+    }, {
+      "id": "b2d9f789-fb94-459f-9947-5364cebc43d1",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=td:nth-child(4)",
+      "targets": [
+        ["css=td:nth-child(3)", "css:finder"],
+        ["xpath=//td[3]", "xpath:position"],
+        ["xpath=//td[contains(.,'root')]", "xpath:innerText"]
+      ],
       "value": "admin"
     }, {
       "id": "87281e0a-322f-4d3a-9703-3e6966f26759",