SHIBUI-2394

Added CRUD test for 2394. Upated other tests affected by changes on this branch.
TIER · Nov 15, 2022 · f8329db · f8329db
1 parent 8bdd167
commit f8329db
Show file tree

Hide file tree

Showing 5 changed files with 842 additions and 108 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
@@ -160,7 +160,8 @@ class SeleniumSIDETest extends Specification {
         'SHIBUI-1674: Verify advanced menu tooltips'                        | '/SHIBUI-1674-3.side'
         'SHIBUI-2270: Verify property set CRUD'                             | '/SHIBUI-2270-1.side'
         'SHIBUI-2270: Verify full property set'                             | '/SHIBUI-2270-2.side'
+        'SHIBUI-2394: Multiple levels of approval'                          | '/SHIBUI-2394.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' // Leave this as the last test in order to keep the suite running without strange errors.
     }
 }
diff --git a/backend/src/integration/resources/SHIBUI-1407-1.side b/backend/src/integration/resources/SHIBUI-1407-1.side
@@ -2461,7 +2461,7 @@
       "id": "4dbf4b6f-7de9-49e1-a23f-ff748f5a986b",
       "comment": "",
       "command": "pause",
-      "target": "7000",
+      "target": "10000",
       "targets": [],
       "value": ""
     }, {

diff --git a/backend/src/integration/resources/SHIBUI-1674-2.side b/backend/src/integration/resources/SHIBUI-1674-2.side
@@ -689,13 +689,6 @@
       "target": "css=div[role=\"tooltip\"]",
       "targets": [],
       "value": "The minimum duration for which metadata will be cached before it is refreshed."
-    }, {
-      "id": "6afe9417-450d-4820-8ed4-300188f38196",
-      "comment": "",
-      "command": "mouseOut",
-      "target": "css=.row:nth-child(2) path",
-      "targets": [],
-      "value": ""
     }, {
       "id": "da0ce3d8-75e6-4b84-b3a7-8b423399044e",
       "comment": "",
@@ -931,43 +924,6 @@
       "target": "css=div[role=\"tooltip\"]",
       "targets": [],
       "value": "The minimum duration for which metadata will be cached before it is refreshed."
-    }, {
-      "id": "687d2359-86f5-45de-bbfd-6557f62fd6d1",
-      "comment": "",
-      "command": "mouseOut",
-      "target": "css=.row:nth-child(2) path",
-      "targets": [],
-      "value": ""
-    }, {
-      "id": "fba778ef-2d9a-4fe9-9e6a-291560e3d807",
-      "comment": "",
-      "command": "click",
-      "target": "css=body",
-      "targets": [],
-      "value": ""
-    }, {
-      "id": "86512870-b695-44b6-a112-ea60375586f4",
-      "comment": "",
-      "command": "pause",
-      "target": "1000",
-      "targets": [],
-      "value": ""
-    }, {
-      "id": "8f77dc16-2b54-46d7-b6bd-bf6fd046e8b6",
-      "comment": "",
-      "command": "mouseOver",
-      "target": "css=.row:nth-child(8) .svg-inline--fa",
-      "targets": [
-        ["css=.row:nth-child(8) .svg-inline--fa", "css:finder"]
-      ],
-      "value": ""
-    }, {
-      "id": "3fd29e97-1178-4bb5-9e76-22e89bca717c",
-      "comment": "",
-      "command": "assertText",
-      "target": "css=div[role=\"tooltip\"]",
-      "targets": [],
-      "value": "Flag indicating whether the system should initialize from the persistent cache in the background. Initializing from the cache in the background will improve IdP startup times."
     }, {
       "id": "d1ee0afc-651b-4da5-bd99-eac47bbceb78",
       "comment": "",
@@ -980,27 +936,6 @@
         ["xpath=//li[2]/button", "xpath:position"]
       ],
       "value": ""
-    }, {
-      "id": "aea0e033-111e-4a5d-8038-ec222786a695",
-      "comment": "",
-      "command": "mouseOver",
-      "target": "css=#root_metadataFilters_2_removeEmptyEntitiesDescriptors-group .info-icon",
-      "targets": [
-        ["css=#root_metadataFilters_2_removeEmptyEntitiesDescriptors-group .info-icon", "css:finder"],
-        ["xpath=(//button[@type='button'])[13]", "xpath:attributes"],
-        ["xpath=//div[@id='root_metadataFilters_2_removeEmptyEntitiesDescriptors-group']/div/div/div/label/span/button", "xpath:idRelative"],
-        ["xpath=//div[4]/div/div/div/div/div/label/span/button", "xpath:position"]
-      ],
-      "value": ""
-    }, {
-      "id": "80e0d456-3951-4858-8423-7e04d6debb96",
-      "comment": "",
-      "command": "assertText",
-      "target": "css=div[role=\"tooltip\"]",
-      "targets": [
-        ["css=#root_metadataFilters_2_removeRolelessEntityDescriptors-group path", "css:finder"]
-      ],
-      "value": "Controls whether to keep entities descriptors that contain no entity descriptors. Note: If this attribute is set to false, the resulting output may not be schema-valid since an <md:EntitiesDescriptor> element must include at least one child element, either an <md:EntityDescriptor> element or an <md:EntitiesDescriptor> element."
     }, {
       "id": "148a84ef-0353-425d-9a63-79ccaa01478d",
       "comment": "",
@@ -1269,22 +1204,6 @@
         ["xpath=//select", "xpath:position"]
       ],
       "value": "label=EntityAttributes"
-    }, {
-      "id": "e2b1a582-a3ce-4adb-b10c-0804f44a56ae",
-      "comment": "",
-      "command": "mouseOver",
-      "target": "css=.justify-content-start > .btn path",
-      "targets": [
-        ["css=.justify-content-start > .btn path", "css:finder"]
-      ],
-      "value": ""
-    }, {
-      "id": "c42fe40a-496c-491b-834e-694181da46d1",
-      "comment": "",
-      "command": "assertText",
-      "target": "css=div[role=\"tooltip\"]",
-      "targets": [],
-      "value": "Indicates the type of search to be performed."
     }, {
       "id": "e4596fdd-7ffc-4636-95d3-870d6bd51f20",
       "comment": "",
@@ -1327,6 +1246,29 @@
         ["xpath=//select", "xpath:position"]
       ],
       "value": "label=NameIDFormat"
+    }, {
+      "id": "47c3d355-4218-456a-9441-2d5d2ffa4d34",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "css=.ms-2 > path",
+      "targets": [],
+      "value": "30000"
+    }, {
+      "id": "a6dcb984-5ad2-4004-8129-931adfc54a87",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.ms-2 > path",
+      "targets": [
+        ["css=.ms-2 > path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "cda8d83d-d242-4def-b4cf-f696864fa806",
+      "comment": "",
+      "command": "mouseOut",
+      "target": "css=.ms-2 > path",
+      "targets": [],
+      "value": ""
     }, {
       "id": "b358a7c0-87a5-4b74-8013-c0ab379278c2",
       "comment": "",

diff --git a/backend/src/integration/resources/SHIBUI-2269.side b/backend/src/integration/resources/SHIBUI-2269.side
@@ -211,6 +211,39 @@
         ["xpath=//li[3]/button", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "836b08a5-1a08-4482-aff2-455fb02f3eb6",
+      "comment": "",
+      "command": "waitForElementEditable",
+      "target": "id=enable-switch-0",
+      "targets": [
+        ["id=enable-switch-0", "id"],
+        ["css=#enable-switch-0", "css:finder"],
+        ["xpath=//input[@id='enable-switch-0']", "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": "30000"
+    }, {
+      "id": "29aa153e-4f7d-4468-bbef-db0b3f9de6eb",
+      "comment": "",
+      "command": "click",
+      "target": "id=enable-switch-0",
+      "targets": [
+        ["id=enable-switch-0", "id"],
+        ["css=#enable-switch-0", "css:finder"],
+        ["xpath=//input[@id='enable-switch-0']", "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": "4753e8d9-eca2-4616-879b-64c6308c2b94",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "css=.alert",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "ab15e915-02b9-4616-9f92-ffcb0386918c",
       "comment": "",
@@ -454,31 +487,6 @@
         ["css=.fa-floppy-disk > path", "css:finder"]
       ],
       "value": ""
-    }, {
-      "id": "802be014-0d04-4bda-93d1-ca7a5d7f802d",
-      "comment": "",
-      "command": "waitForElementVisible",
-      "target": "css=.text:nth-child(2)",
-      "targets": [
-        ["css=.text:nth-child(2)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div/h2/span[2]", "xpath:idRelative"],
-        ["xpath=//h2/span[2]", "xpath:position"],
-        ["xpath=//span[contains(.,'Common Attributes')]", "xpath:innerText"]
-      ],
-      "value": "30000"
-    }, {
-      "id": "7e3e7d65-e0ff-4a2d-a0e9-5080bfefd4df",
-      "comment": "",
-      "command": "click",
-      "target": "css=.btn-outline-secondary",
-      "targets": [
-        ["css=.btn-outline-secondary", "css:finder"],
-        ["xpath=(//button[@type='button'])[5]", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/div/div/div/div/button", "xpath:idRelative"],
-        ["xpath=//div/div/div/div/button", "xpath:position"],
-        ["xpath=//button[contains(.,'Enable')]", "xpath:innerText"]
-      ],
-      "value": ""
     }, {
       "id": "42929ec9-7860-467a-a52b-946df9965de5",
       "comment": "",