SHIBUI-2380

Various selenium test fixes to reflect changes in the UI.
TIER · Oct 17, 2022 · 765dd32 · 765dd32
1 parent cd75731
commit 765dd32
Show file tree

Hide file tree

Showing 7 changed files with 379 additions and 275 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,7 +107,7 @@ 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'
@@ -116,9 +116,9 @@ class SeleniumSIDETest extends Specification {
         '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-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-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'                  | '/SHIBUI-1335-2.side'
         'SHIBUI-1335: Verify Local Dynamic Metadata Provider'               | '/SHIBUI-1335-3.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-1385-1.side b/backend/src/integration/resources/SHIBUI-1385-1.side
diff --git a/backend/src/integration/resources/SHIBUI-1407-1.side b/backend/src/integration/resources/SHIBUI-1407-1.side
diff --git a/backend/src/integration/resources/SHIBUI-1503-1.side b/backend/src/integration/resources/SHIBUI-1503-1.side
@@ -488,8 +488,14 @@
       "id": "9be511e0-ed11-4707-8490-6fa248e4138e",
       "comment": "",
       "command": "assertNotChecked",
-      "target": "xpath=//table/tbody/tr/td[5]/span/div/input",
-      "targets": [],
+      "target": "xpath=//span/div/input",
+      "targets": [
+        ["id=enable-switch-43a10ef8-09e0-4e86-b3bc-404c4e9293b2", "id"],
+        ["css=#enable-switch-43a10ef8-09e0-4e86-b3bc-404c4e9293b2", "css:finder"],
+        ["xpath=//input[@id='enable-switch-43a10ef8-09e0-4e86-b3bc-404c4e9293b2']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[6]/span/div/input", "xpath:idRelative"],
+        ["xpath=//span/div/input", "xpath:position"]
+      ],
       "value": ""
     }, {
       "id": "157e70d6-fa1c-4118-bce4-ab52000b6c16",
@@ -539,22 +545,25 @@
       "id": "6ba5a2fb-8c68-4743-99d6-1fa44644f399",
       "comment": "",
       "command": "assertText",
-      "target": "css=td:nth-child(3)",
+      "target": "css=td:nth-child(4)",
       "targets": [
-        ["css=td:nth-child(3)", "css:finder"],
-        ["xpath=//td[3]", "xpath:position"],
+        ["css=.align-middle:nth-child(4)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[4]", "xpath:idRelative"],
+        ["xpath=//td[4]", "xpath:position"],
         ["xpath=//td[contains(.,'nonadmin')]", "xpath:innerText"]
       ],
       "value": "nonadmin"
     }, {
       "id": "eb63aa9f-4ac5-4852-8941-740b9f49a769",
       "comment": "",
       "command": "click",
-      "target": "xpath=//table/tbody/tr/td[5]/span/div/input",
+      "target": "xpath=//input",
       "targets": [
-        ["css=.custom-control-label", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[5]/span/div/label", "xpath:idRelative"],
-        ["xpath=//label", "xpath:position"]
+        ["id=enable-switch-43a10ef8-09e0-4e86-b3bc-404c4e9293b2", "id"],
+        ["css=#enable-switch-43a10ef8-09e0-4e86-b3bc-404c4e9293b2", "css:finder"],
+        ["xpath=//input[@id='enable-switch-43a10ef8-09e0-4e86-b3bc-404c4e9293b2']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[6]/span/div/input", "xpath:idRelative"],
+        ["xpath=//input", "xpath:position"]
       ],
       "value": ""
     }, {
@@ -600,9 +609,29 @@
       "id": "f76a12a3-2054-4be2-a6a6-2221afd493fb",
       "comment": "",
       "command": "assertChecked",
-      "target": "xpath=//table/tbody/tr/td[5]/span/div/input",
-      "targets": [],
+      "target": "xpath=//span/div/input",
+      "targets": [
+        ["id=enable-switch-43a10ef8-09e0-4e86-b3bc-404c4e9293b2", "id"],
+        ["css=#enable-switch-43a10ef8-09e0-4e86-b3bc-404c4e9293b2", "css:finder"],
+        ["xpath=//input[@id='enable-switch-43a10ef8-09e0-4e86-b3bc-404c4e9293b2']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[6]/span/div/input", "xpath:idRelative"],
+        ["xpath=//span/div/input", "xpath:position"]
+      ],
       "value": "Enabled"
+    }, {
+      "id": "6288b2e8-6cec-4fa9-9f34-a9a39c79bbb0",
+      "comment": "",
+      "command": "open",
+      "target": "/api/heheheheheheheWipeout",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "bedd3f8c-501e-4d66-acf3-95ded657db44",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=body",
+      "targets": [],
+      "value": "yes, you did it"
     }]
   }],
   "suites": [{

diff --git a/backend/src/integration/resources/SHIBUI-1674-1.side b/backend/src/integration/resources/SHIBUI-1674-1.side
@@ -119,16 +119,16 @@
       "id": "93d20204-7dfa-44c0-8e61-6741e73594f5",
       "comment": "",
       "command": "waitForElementPresent",
-      "target": "css=.mb-3:nth-child(2) .btn path",
+      "target": "css=.mb-3:nth-child(3) .info-icon path",
       "targets": [],
       "value": "30000"
     }, {
       "id": "a7b2b925-2274-4dcc-a4e3-3b727c9a047a",
       "comment": "",
       "command": "mouseOver",
-      "target": "css=.mb-3:nth-child(2) .btn path",
+      "target": "css=.mb-3:nth-child(3) .info-icon path",
       "targets": [
-        ["css=.mb-3:nth-child(2) .btn path", "css:finder"]
+        ["css=.mb-3:nth-child(3) .info-icon path", "css:finder"]
       ],
       "value": ""
     }, {
@@ -385,11 +385,9 @@
       "id": "54a74399-69aa-4412-85c2-a5bbb543d8be",
       "comment": "",
       "command": "mouseOver",
-      "target": "css=.row:nth-child(8) path:nth-child(1)",
+      "target": "css=.row:nth-child(9) path:nth-child(1)",
       "targets": [
-        ["css=.app-root", "css:finder"],
-        ["xpath=//div[@id='root']/div", "xpath:idRelative"],
-        ["xpath=//div[3]/div", "xpath:position"]
+        ["css=.row:nth-child(9) path:nth-child(1)", "css:finder"]
       ],
       "value": ""
     }, {
@@ -721,9 +719,9 @@
       "id": "2928ba27-b934-499e-8dda-8441dbbb463d",
       "comment": "",
       "command": "mouseOver",
-      "target": "css=.row:nth-child(7) path:nth-child(1)",
+      "target": "css=.row:nth-child(8) path:nth-child(1)",
       "targets": [
-        ["css=.row:nth-child(7) path:nth-child(1)", "css:finder"]
+        ["css=.row:nth-child(8) path:nth-child(1)", "css:finder"]
       ],
       "value": ""
     }, {

diff --git a/backend/src/integration/resources/SHIBUI-1742-1.side b/backend/src/integration/resources/SHIBUI-1742-1.side
@@ -119,8 +119,8 @@
     }, {
       "id": "21ab7479-9782-4b44-a169-732c957c6d01",
       "comment": "",
-      "command": "waitForElementNotVisible",
-      "target": "xpath=//div[@role=\"alert\"]",
+      "command": "assertElementPresent",
+      "target": "css=.alert",
       "targets": [],
       "value": "30000"
     }, {
@@ -510,11 +510,13 @@
       "id": "9585df73-48e3-4ca3-b13c-74ecdee11461",
       "comment": "",
       "command": "click",
-      "target": "xpath=//table/tbody/tr/td[5]/span/div/input",
+      "target": "xpath=//span/div/input",
       "targets": [
-        ["css=.justify-content-center", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[5]/span", "xpath:idRelative"],
-        ["xpath=//td[5]/span", "xpath:position"]
+        ["id=enable-switch-758810ff-8c20-4145-ab70-05e981f78027", "id"],
+        ["css=#enable-switch-758810ff-8c20-4145-ab70-05e981f78027", "css:finder"],
+        ["xpath=//input[@id='enable-switch-758810ff-8c20-4145-ab70-05e981f78027']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[6]/span/div/input", "xpath:idRelative"],
+        ["xpath=//span/div/input", "xpath:position"]
       ],
       "value": ""
     }, {
@@ -591,35 +593,41 @@
       "id": "4bdddea6-4e3d-4947-a1cc-b05a795d56c5",
       "comment": "",
       "command": "waitForElementVisible",
-      "target": "xpath=//table/tbody/tr/td[5]/span/div/input",
-      "targets": [],
+      "target": "xpath=//span/div/input",
+      "targets": [
+        ["id=enable-switch-758810ff-8c20-4145-ab70-05e981f78027", "id"],
+        ["css=#enable-switch-758810ff-8c20-4145-ab70-05e981f78027", "css:finder"],
+        ["xpath=//input[@id='enable-switch-758810ff-8c20-4145-ab70-05e981f78027']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[6]/span/div/input", "xpath:idRelative"],
+        ["xpath=//span/div/input", "xpath:position"]
+      ],
       "value": "3000"
     }, {
       "id": "79423a30-b82b-443f-b0ea-80370a6d397b",
       "comment": "",
       "command": "assertChecked",
-      "target": "xpath=//table/tbody/tr/td[5]/span/div/input",
+      "target": "xpath=//span/div/input",
       "targets": [
         ["css=.custom-control-label", "css:finder"],
         ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[5]/span/div/label", "xpath:idRelative"],
         ["xpath=//span/div/label", "xpath:position"]
       ],
       "value": ""
-    },{
-            "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
-            "comment": "",
-            "command": "open",
-            "target": "/api/heheheheheheheWipeout",
-            "targets": [],
-            "value": ""
-          }, {
-            "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
-            "comment": "",
-            "command": "assertText",
-            "target": "css=body",
-            "targets": [],
-            "value": "yes, you did it"
-          }]
+    }, {
+      "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
+      "comment": "",
+      "command": "open",
+      "target": "/api/heheheheheheheWipeout",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=body",
+      "targets": [],
+      "value": "yes, you did it"
+    }]
   }],
   "suites": [{
     "id": "8a97286b-5660-452c-9f23-4c5f5bf8de3b",

diff --git a/backend/src/integration/resources/SHIBUI-2267.side b/backend/src/integration/resources/SHIBUI-2267.side
@@ -310,7 +310,7 @@
       ],
       "value": "test-1234"
     }, {
-      "id": "b2d9f789-fb94-459f-9947-5364cebc43d1",
+      "id": "83491735-f305-45f9-922c-697ac167c4e6",
       "comment": "",
       "command": "assertText",
       "target": "css=td:nth-child(3)",
@@ -319,6 +319,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": "549253bc-b6e0-4968-8058-f52700e9e3b2",