From 3c50c6999d250ca0b9d9da2aa7b9bb2976025ebf Mon Sep 17 00:00:00 2001
From: Bill Smith <wsmith@unicon.net>
Date: Mon, 27 Sep 2021 14:42:39 -0700
Subject: [PATCH] 2052

Updated tests to support execution using Firefox / geckodriver.
---
 .../integration/resources/SHIBUI-1281.side    | 14 ++++++-------
 .../integration/resources/SHIBUI-1311.side    | 14 ++++++-------
 .../integration/resources/SHIBUI-1333.side    | 14 ++++++-------
 .../integration/resources/SHIBUI-1334-1.side  | 14 ++++++-------
 .../integration/resources/SHIBUI-1334-2.side  | 14 ++++++-------
 .../integration/resources/SHIBUI-1335-1.side  | 14 ++++++-------
 .../integration/resources/SHIBUI-1335-2.side  | 14 ++++++-------
 .../integration/resources/SHIBUI-1335-3.side  | 14 ++++++-------
 .../integration/resources/SHIBUI-1335-4.side  | 14 ++++++-------
 .../integration/resources/SHIBUI-1352-1.side  | 14 ++++++-------
 .../integration/resources/SHIBUI-1352-2.side  | 14 ++++++-------
 .../integration/resources/SHIBUI-1361.side    | 14 ++++++-------
 .../integration/resources/SHIBUI-1364-1.side  | 14 ++++++-------
 .../integration/resources/SHIBUI-1364-2.side  |  7 -------
 .../integration/resources/SHIBUI-1364-3.side  |  7 -------
 .../integration/resources/SHIBUI-1364-4.side  |  7 -------
 .../integration/resources/SHIBUI-1385-1.side  | 21 ++++++++++++-------
 .../integration/resources/SHIBUI-1385-2.side  | 14 ++++++-------
 .../integration/resources/SHIBUI-1391.side    | 14 ++++++-------
 .../integration/resources/SHIBUI-1392.side    | 14 ++++++-------
 .../integration/resources/SHIBUI-1407-1.side  | 14 ++++++-------
 .../integration/resources/SHIBUI-1407-2.side  | 14 ++++++-------
 .../integration/resources/SHIBUI-1503-1.side  |  7 -------
 .../integration/resources/SHIBUI-1503-2.side  | 19 ++++++++++-------
 .../integration/resources/SHIBUI-1503-3.side  | 14 ++++++-------
 .../integration/resources/SHIBUI-1740-1.side  |  7 +++++++
 .../integration/resources/SHIBUI-1740-3.side  |  7 +++++++
 .../integration/resources/SHIBUI-1740-4.side  |  7 +++++++
 .../integration/resources/SHIBUI-1742-1.side  | 14 +++++++++++++
 .../integration/resources/SHIBUI-1742-2.side  | 10 ++++-----
 .../integration/resources/SHIBUI-1744-1.side  |  7 +++++++
 .../integration/resources/SHIBUI-1744-2.side  |  7 +++++++
 .../integration/resources/SHIBUI-1744-3.side  |  7 +++++++
 .../integration/resources/SHIBUI-2052.side    | 14 +++++++++++++
 .../src/integration/resources/SHIBUI-950.side | 14 ++++++-------
 35 files changed, 241 insertions(+), 187 deletions(-)

diff --git a/backend/src/integration/resources/SHIBUI-1281.side b/backend/src/integration/resources/SHIBUI-1281.side
index 2f5ff3c4d..b15ab88fd 100644
--- a/backend/src/integration/resources/SHIBUI-1281.side
+++ b/backend/src/integration/resources/SHIBUI-1281.side
@@ -49,6 +49,13 @@
         ["xpath=//tr[2]/td[2]/input", "xpath:position"]
       ],
       "value": "${KEY_ENTER}"
+    }, {
+      "id": "4059cae7-b9f9-49d0-a213-343bcaba66d1",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "f03af8d5-5875-4a2c-b93a-c3ddcbd4b16a",
       "comment": "",
@@ -2081,13 +2088,6 @@
       "target": "css=td:nth-child(2)",
       "targets": [],
       "value": ""
-    }, {
-      "id": "3e7de570-9ff8-4dfe-9eaa-3417f3172d49",
-      "comment": "",
-      "command": "close",
-      "target": "",
-      "targets": [],
-      "value": ""
     }]
   }],
   "suites": [{
diff --git a/backend/src/integration/resources/SHIBUI-1311.side b/backend/src/integration/resources/SHIBUI-1311.side
index ebdee6f30..a63c3af30 100644
--- a/backend/src/integration/resources/SHIBUI-1311.side
+++ b/backend/src/integration/resources/SHIBUI-1311.side
@@ -49,6 +49,13 @@
         ["xpath=//tr[2]/td[2]/input", "xpath:position"]
       ],
       "value": "${KEY_ENTER}"
+    }, {
+      "id": "b44b94d5-0659-4682-94ac-19bccf497f79",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "8034dcdc-3fa2-4144-b707-c470db8c7c38",
       "comment": "",
@@ -1072,13 +1079,6 @@
         ["xpath=//td[contains(.,'Disabled')]", "xpath:innerText"]
       ],
       "value": ""
-    }, {
-      "id": "57d0e204-6c28-4be5-9888-28f8d7738508",
-      "comment": "",
-      "command": "close",
-      "target": "",
-      "targets": [],
-      "value": ""
     }]
   }],
   "suites": [{
diff --git a/backend/src/integration/resources/SHIBUI-1333.side b/backend/src/integration/resources/SHIBUI-1333.side
index de947f664..fc3873982 100644
--- a/backend/src/integration/resources/SHIBUI-1333.side
+++ b/backend/src/integration/resources/SHIBUI-1333.side
@@ -49,6 +49,13 @@
         ["xpath=//tr[2]/td[2]/input", "xpath:position"]
       ],
       "value": "${KEY_ENTER}"
+    }, {
+      "id": "551d63f4-0f46-4064-ba4a-176ae576f62f",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "1462b26b-ff44-43bb-a3c1-48758d90c91c",
       "comment": "",
@@ -2247,13 +2254,6 @@
         ["xpath=//section[8]/div/div[2]/object-property/array-property/div/div/div[3]/div/span", "xpath:position"]
       ],
       "value": "True"
-    }, {
-      "id": "8872eadd-b15a-48d3-8334-a54a3fa14e6d",
-      "comment": "",
-      "command": "close",
-      "target": "",
-      "targets": [],
-      "value": ""
     }]
   }],
   "suites": [{
diff --git a/backend/src/integration/resources/SHIBUI-1334-1.side b/backend/src/integration/resources/SHIBUI-1334-1.side
index 1a773bd8e..5c90b00a6 100644
--- a/backend/src/integration/resources/SHIBUI-1334-1.side
+++ b/backend/src/integration/resources/SHIBUI-1334-1.side
@@ -49,6 +49,13 @@
         ["xpath=//tr[2]/td[2]/input", "xpath:position"]
       ],
       "value": "${KEY_ENTER}"
+    }, {
+      "id": "483585b7-c553-4ddb-bfd8-024bd81aecc3",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "c4f3b8ff-5c73-4975-8a76-08c3a5d9ec4c",
       "comment": "",
@@ -2630,13 +2637,6 @@
         ["xpath=//section[2]/div/div[2]/div[2]/div/div/div/span[3]", "xpath:position"]
       ],
       "value": "Display Name"
-    }, {
-      "id": "c88d3154-c810-47cd-b8d8-48e705bad0f4",
-      "comment": "",
-      "command": "close",
-      "target": "",
-      "targets": [],
-      "value": ""
     }]
   }],
   "suites": [{
diff --git a/backend/src/integration/resources/SHIBUI-1334-2.side b/backend/src/integration/resources/SHIBUI-1334-2.side
index 6902eab35..84d2fa73a 100644
--- a/backend/src/integration/resources/SHIBUI-1334-2.side
+++ b/backend/src/integration/resources/SHIBUI-1334-2.side
@@ -49,6 +49,13 @@
         ["xpath=//tr[2]/td[2]/input", "xpath:position"]
       ],
       "value": "${KEY_ENTER}"
+    }, {
+      "id": "7ddaa6d6-98ac-49d2-bd83-e657077a60ef",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "692ca72a-41c0-4ef7-8ed2-a9d4bde7e05c",
       "comment": "",
@@ -1202,13 +1209,6 @@
         ["xpath=//div[2]/div[2]/div/div[5]/div/span[2]", "xpath:position"]
       ],
       "value": "PT10M"
-    }, {
-      "id": "a77b2cf6-c88d-458b-9421-2745634180a7",
-      "comment": "",
-      "command": "close",
-      "target": "",
-      "targets": [],
-      "value": ""
     }]
   }],
   "suites": [{
diff --git a/backend/src/integration/resources/SHIBUI-1335-1.side b/backend/src/integration/resources/SHIBUI-1335-1.side
index 276d22328..844323040 100644
--- a/backend/src/integration/resources/SHIBUI-1335-1.side
+++ b/backend/src/integration/resources/SHIBUI-1335-1.side
@@ -49,6 +49,13 @@
         ["xpath=//button[contains(.,'Sign in')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "4d8cf40e-3ac8-4a58-8f9a-ae65778f68f0",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "8ce1cc76-3392-4b5f-8a9f-658f08f19ed1",
       "comment": "",
@@ -1787,13 +1794,6 @@
         ["xpath=//button[contains(.,'Entity Attributes Filter')]", "xpath:innerText"]
       ],
       "value": "Entity Attributes Filter"
-    }, {
-      "id": "13133548-1a88-4cc0-a861-7481794c65e0",
-      "comment": "",
-      "command": "close",
-      "target": "",
-      "targets": [],
-      "value": ""
     }]
   }],
   "suites": [{
diff --git a/backend/src/integration/resources/SHIBUI-1335-2.side b/backend/src/integration/resources/SHIBUI-1335-2.side
index cc2f4afc7..80009fd84 100644
--- a/backend/src/integration/resources/SHIBUI-1335-2.side
+++ b/backend/src/integration/resources/SHIBUI-1335-2.side
@@ -49,6 +49,13 @@
         ["xpath=//button[contains(.,'Sign in')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "2cd3569b-d26c-4d57-bb95-f5e8bd1034c4",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "67772da3-94dd-419e-b05c-7ed12927805e",
       "comment": "",
@@ -407,13 +414,6 @@
         ["xpath=//span[contains(.,'FilesystemMetadataResolver')]", "xpath:innerText"]
       ],
       "value": "FilesystemMetadataResolver"
-    }, {
-      "id": "d4c36d2c-c90e-45e6-ae49-a46b3c64a629",
-      "comment": "",
-      "command": "close",
-      "target": "",
-      "targets": [],
-      "value": ""
     }]
   }],
   "suites": [{
diff --git a/backend/src/integration/resources/SHIBUI-1335-3.side b/backend/src/integration/resources/SHIBUI-1335-3.side
index cad63d81f..7454cc6b9 100644
--- a/backend/src/integration/resources/SHIBUI-1335-3.side
+++ b/backend/src/integration/resources/SHIBUI-1335-3.side
@@ -49,6 +49,13 @@
         ["xpath=//button[contains(.,'Sign in')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "2b160585-ee18-4852-9c8f-b39656a03736",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "e64cf7d1-36eb-483b-b577-0f9daf9793c1",
       "comment": "",
@@ -478,13 +485,6 @@
         ["xpath=//span[contains(.,'LocalDynamicMetadataResolver')]", "xpath:innerText"]
       ],
       "value": "LocalDynamicMetadataResolver"
-    }, {
-      "id": "3c9a53c4-b56a-4a4b-9fef-12951d198754",
-      "comment": "",
-      "command": "close",
-      "target": "",
-      "targets": [],
-      "value": ""
     }]
   }],
   "suites": [{
diff --git a/backend/src/integration/resources/SHIBUI-1335-4.side b/backend/src/integration/resources/SHIBUI-1335-4.side
index b5b4ff85b..cc66f27c4 100644
--- a/backend/src/integration/resources/SHIBUI-1335-4.side
+++ b/backend/src/integration/resources/SHIBUI-1335-4.side
@@ -49,6 +49,13 @@
         ["xpath=//button[contains(.,'Sign in')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "7a51362b-4455-4790-b9ef-d8f90c7f1417",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "650dbd56-1f7b-4ec9-9400-b32691018e65",
       "comment": "",
@@ -1196,13 +1203,6 @@
         ["xpath=//td[contains(.,'EntityAttributes')]", "xpath:innerText"]
       ],
       "value": "EntityAttributes"
-    }, {
-      "id": "f81a35eb-de1b-49ac-a9bb-b528393e9f9e",
-      "comment": "",
-      "command": "close",
-      "target": "",
-      "targets": [],
-      "value": ""
     }]
   }],
   "suites": [{
diff --git a/backend/src/integration/resources/SHIBUI-1352-1.side b/backend/src/integration/resources/SHIBUI-1352-1.side
index a5b661335..ce0a0b85f 100644
--- a/backend/src/integration/resources/SHIBUI-1352-1.side
+++ b/backend/src/integration/resources/SHIBUI-1352-1.side
@@ -49,6 +49,13 @@
         ["xpath=//tr[2]/td[2]/input", "xpath:position"]
       ],
       "value": "${KEY_ENTER}"
+    }, {
+      "id": "aca3ed42-716a-47c6-ad6b-b193be24d5d9",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "5fe93ce7-64eb-4b3f-b01f-260b88b09f26",
       "comment": "",
@@ -488,13 +495,6 @@
         ["xpath=//td[contains(.,'LocalDynamicMetadataResolver')]", "xpath:innerText"]
       ],
       "value": "LocalDynamicMetadataResolver"
-    }, {
-      "id": "0da0b69c-a807-4961-ad8d-ef5eb1ba667e",
-      "comment": "",
-      "command": "close",
-      "target": "",
-      "targets": [],
-      "value": ""
     }]
   }],
   "suites": [{
diff --git a/backend/src/integration/resources/SHIBUI-1352-2.side b/backend/src/integration/resources/SHIBUI-1352-2.side
index 6ec4ac969..611da7aa9 100644
--- a/backend/src/integration/resources/SHIBUI-1352-2.side
+++ b/backend/src/integration/resources/SHIBUI-1352-2.side
@@ -49,6 +49,13 @@
         ["xpath=//tr[2]/td[2]/input", "xpath:position"]
       ],
       "value": "${KEY_ENTER}"
+    }, {
+      "id": "56429611-d4c2-4486-bcc1-99c177764717",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "e3eeb3b6-c6de-466f-9609-9683bc71ac71",
       "comment": "",
@@ -407,13 +414,6 @@
         ["xpath=//td[contains(.,'FilesystemMetadataResolver')]", "xpath:innerText"]
       ],
       "value": "FilesystemMetadataResolver"
-    }, {
-      "id": "4ff97235-563b-4d71-80b7-a8b263aeb90b",
-      "comment": "",
-      "command": "close",
-      "target": "",
-      "targets": [],
-      "value": ""
     }]
   }],
   "suites": [{
diff --git a/backend/src/integration/resources/SHIBUI-1361.side b/backend/src/integration/resources/SHIBUI-1361.side
index 49252fd76..ebb82a22a 100644
--- a/backend/src/integration/resources/SHIBUI-1361.side
+++ b/backend/src/integration/resources/SHIBUI-1361.side
@@ -63,6 +63,13 @@
         ["xpath=//tr[2]/td[2]/input", "xpath:position"]
       ],
       "value": "${KEY_ENTER}"
+    }, {
+      "id": "e944d34b-22dc-491a-bafc-f2561b0c8767",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "554d601e-0128-4f3f-94db-9d8e2b5e5e92",
       "comment": "",
@@ -1403,13 +1410,6 @@
       "target": "rightDateIsDate",
       "targets": [],
       "value": "true"
-    }, {
-      "id": "bc352f8a-9212-4985-80b8-19a3814b5bfd",
-      "comment": "",
-      "command": "close",
-      "target": "",
-      "targets": [],
-      "value": ""
     }]
   }],
   "suites": [{
diff --git a/backend/src/integration/resources/SHIBUI-1364-1.side b/backend/src/integration/resources/SHIBUI-1364-1.side
index 77da3e3d2..1b2d59271 100644
--- a/backend/src/integration/resources/SHIBUI-1364-1.side
+++ b/backend/src/integration/resources/SHIBUI-1364-1.side
@@ -2056,6 +2056,13 @@
         ["xpath=//input", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "8854eb15-681c-4d2b-a3e2-b324c745b2fa",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "css=div:nth-child(2) > div:nth-child(1) > .d-flex > .d-block:nth-child(2)",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "cfebf080-7825-4412-8a2d-924af79d4b26",
       "comment": "",
@@ -2375,13 +2382,6 @@
         ["xpath=//section[5]/div/div[2]/div[2]/div/div/span[3]", "xpath:position"]
       ],
       "value": "Entity Attributes Filter"
-    }, {
-      "id": "2c05cbfc-f828-426d-be90-eae484624ac0",
-      "comment": "",
-      "command": "close",
-      "target": "",
-      "targets": [],
-      "value": ""
     }]
   }],
   "suites": [{
diff --git a/backend/src/integration/resources/SHIBUI-1364-2.side b/backend/src/integration/resources/SHIBUI-1364-2.side
index f4e38e3ce..4b731fdc4 100644
--- a/backend/src/integration/resources/SHIBUI-1364-2.side
+++ b/backend/src/integration/resources/SHIBUI-1364-2.side
@@ -681,13 +681,6 @@
         ["xpath=//div[2]/div/span[3]", "xpath:position"]
       ],
       "value": "12345"
-    }, {
-      "id": "5a4e74b2-fe33-462a-9739-37b2ffb099f0",
-      "comment": "",
-      "command": "close",
-      "target": "",
-      "targets": [],
-      "value": ""
     }]
   }],
   "suites": [{
diff --git a/backend/src/integration/resources/SHIBUI-1364-3.side b/backend/src/integration/resources/SHIBUI-1364-3.side
index f27ff1dda..a0e7435a9 100644
--- a/backend/src/integration/resources/SHIBUI-1364-3.side
+++ b/backend/src/integration/resources/SHIBUI-1364-3.side
@@ -694,13 +694,6 @@
         ["xpath=//div[3]/div/span[3]", "xpath:position"]
       ],
       "value": "12345"
-    }, {
-      "id": "5bf7126d-9dfb-4b97-8685-fd00778423eb",
-      "comment": "",
-      "command": "close",
-      "target": "",
-      "targets": [],
-      "value": ""
     }]
   }],
   "suites": [{
diff --git a/backend/src/integration/resources/SHIBUI-1364-4.side b/backend/src/integration/resources/SHIBUI-1364-4.side
index 47d036703..387405cbd 100644
--- a/backend/src/integration/resources/SHIBUI-1364-4.side
+++ b/backend/src/integration/resources/SHIBUI-1364-4.side
@@ -1572,13 +1572,6 @@
         ["xpath=//div[3]/div/div/p", "xpath:position"]
       ],
       "value": "Entity Attributes Filter"
-    }, {
-      "id": "3f618724-2825-4ebe-97d5-038a67a23e9b",
-      "comment": "",
-      "command": "close",
-      "target": "",
-      "targets": [],
-      "value": ""
     }]
   }],
   "suites": [{
diff --git a/backend/src/integration/resources/SHIBUI-1385-1.side b/backend/src/integration/resources/SHIBUI-1385-1.side
index db4a3d78d..05225b3f6 100644
--- a/backend/src/integration/resources/SHIBUI-1385-1.side
+++ b/backend/src/integration/resources/SHIBUI-1385-1.side
@@ -49,6 +49,20 @@
         ["xpath=//tr[2]/td[2]/input", "xpath:position"]
       ],
       "value": "${KEY_ENTER}"
+    }, {
+      "id": "7de08941-38d0-4432-aa7c-e445bf52f29d",
+      "comment": "",
+      "command": "click",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [
+        ["id=metadata-nav-dropdown-toggle", "id"],
+        ["css=#metadata-nav-dropdown-toggle", "css:finder"],
+        ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"],
+        ["xpath=//div[2]/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"]
+      ],
+      "value": ""
     }, {
       "id": "f3bb93b7-b6ff-41e3-9057-029250b3cc38",
       "comment": "",
@@ -2864,13 +2878,6 @@
         ["xpath=//section[2]/div/div[2]/div[2]/div/div/div/span[3]", "xpath:position"]
       ],
       "value": "Display Name"
-    }, {
-      "id": "dd9d3cb6-e895-4fcb-ae5e-c6da258a65a5",
-      "comment": "",
-      "command": "close",
-      "target": "",
-      "targets": [],
-      "value": ""
     }]
   }],
   "suites": [{
diff --git a/backend/src/integration/resources/SHIBUI-1385-2.side b/backend/src/integration/resources/SHIBUI-1385-2.side
index c6ff334eb..ec627f3c6 100644
--- a/backend/src/integration/resources/SHIBUI-1385-2.side
+++ b/backend/src/integration/resources/SHIBUI-1385-2.side
@@ -49,6 +49,13 @@
         ["xpath=//tr[2]/td[2]/input", "xpath:position"]
       ],
       "value": "${KEY_ENTER}"
+    }, {
+      "id": "c0a35781-0dbd-4905-8c25-61d7d497f968",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "a81efadb-6076-4a3e-b7ab-0cc097fb0820",
       "comment": "",
@@ -1473,13 +1480,6 @@
         ["xpath=//span[3]", "xpath:position"]
       ],
       "value": "Test Metadata Provider"
-    }, {
-      "id": "03d7493c-75c4-4923-8330-686b12ff7a5b",
-      "comment": "",
-      "command": "close",
-      "target": "",
-      "targets": [],
-      "value": ""
     }]
   }],
   "suites": [{
diff --git a/backend/src/integration/resources/SHIBUI-1391.side b/backend/src/integration/resources/SHIBUI-1391.side
index 8a24dc630..d2c80fcac 100644
--- a/backend/src/integration/resources/SHIBUI-1391.side
+++ b/backend/src/integration/resources/SHIBUI-1391.side
@@ -49,6 +49,13 @@
         ["xpath=//button[contains(.,'Sign in')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "af27eb53-8a60-4d31-a7af-7d56e310c528",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "4e6e0e31-5b73-4ff3-95fd-db29ee329512",
       "comment": "",
@@ -736,13 +743,6 @@
         ["xpath=//div[2]/div/div/input", "xpath:position"]
       ],
       "value": ".*"
-    }, {
-      "id": "f9d3ccc6-65d1-46dd-9d05-2d1bd74cc89e",
-      "comment": "",
-      "command": "close",
-      "target": "",
-      "targets": [],
-      "value": ""
     }]
   }],
   "suites": [{
diff --git a/backend/src/integration/resources/SHIBUI-1392.side b/backend/src/integration/resources/SHIBUI-1392.side
index e5bc32d1f..70e057548 100644
--- a/backend/src/integration/resources/SHIBUI-1392.side
+++ b/backend/src/integration/resources/SHIBUI-1392.side
@@ -49,6 +49,13 @@
         ["xpath=//button[contains(.,'Sign in')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "f92dd030-f326-4050-9234-97981211161f",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "a16aa726-a8d3-488b-b1ce-7a3d33d4cfa5",
       "comment": "",
@@ -500,13 +507,6 @@
         ["xpath=//p[contains(.,'eval(true)')]", "xpath:innerText"]
       ],
       "value": "eval(true);"
-    }, {
-      "id": "29f454bc-2f1d-44b4-b9f9-fb390b2eddb2",
-      "comment": "",
-      "command": "close",
-      "target": "",
-      "targets": [],
-      "value": ""
     }]
   }],
   "suites": [{
diff --git a/backend/src/integration/resources/SHIBUI-1407-1.side b/backend/src/integration/resources/SHIBUI-1407-1.side
index 15d2e93d2..8a6f6aaab 100644
--- a/backend/src/integration/resources/SHIBUI-1407-1.side
+++ b/backend/src/integration/resources/SHIBUI-1407-1.side
@@ -49,6 +49,13 @@
         ["xpath=//tr[2]/td[2]/input", "xpath:position"]
       ],
       "value": "${KEY_ENTER}"
+    }, {
+      "id": "cc9035b6-1e28-4b04-9a50-9ef0a77c1adf",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "835bd37c-5d46-42e4-9dbb-ee00d29ccd6c",
       "comment": "",
@@ -2598,13 +2605,6 @@
       "target": "isPresent",
       "targets": [],
       "value": "true"
-    }, {
-      "id": "e901a20e-75e9-4f0d-abfc-f1fe8cf453b8",
-      "comment": "",
-      "command": "close",
-      "target": "",
-      "targets": [],
-      "value": ""
     }]
   }],
   "suites": [{
diff --git a/backend/src/integration/resources/SHIBUI-1407-2.side b/backend/src/integration/resources/SHIBUI-1407-2.side
index 85421f69b..798c1e1a3 100644
--- a/backend/src/integration/resources/SHIBUI-1407-2.side
+++ b/backend/src/integration/resources/SHIBUI-1407-2.side
@@ -49,6 +49,13 @@
         ["xpath=//tr[2]/td[2]/input", "xpath:position"]
       ],
       "value": "${KEY_ENTER}"
+    }, {
+      "id": "b837b89b-db9e-4cda-adda-476c8a28f31c",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "51703e66-6615-4e51-97a3-2e791d3f8f8e",
       "comment": "",
@@ -1025,13 +1032,6 @@
       "target": "isDiff",
       "targets": [],
       "value": "true"
-    }, {
-      "id": "a0305827-1856-48c6-b02c-96c43da6241f",
-      "comment": "",
-      "command": "close",
-      "target": "",
-      "targets": [],
-      "value": ""
     }]
   }],
   "suites": [{
diff --git a/backend/src/integration/resources/SHIBUI-1503-1.side b/backend/src/integration/resources/SHIBUI-1503-1.side
index 83105740a..e70c277bf 100644
--- a/backend/src/integration/resources/SHIBUI-1503-1.side
+++ b/backend/src/integration/resources/SHIBUI-1503-1.side
@@ -598,13 +598,6 @@
       "target": "xpath=//table/tbody/tr/td[5]/span/div/input",
       "targets": [],
       "value": "Enabled"
-    }, {
-      "id": "6b4905b8-2ae3-4682-ae52-0149c58eb7f4",
-      "comment": "",
-      "command": "close",
-      "target": "",
-      "targets": [],
-      "value": ""
     }]
   }],
   "suites": [{
diff --git a/backend/src/integration/resources/SHIBUI-1503-2.side b/backend/src/integration/resources/SHIBUI-1503-2.side
index 8f7050f58..65ccf98a9 100644
--- a/backend/src/integration/resources/SHIBUI-1503-2.side
+++ b/backend/src/integration/resources/SHIBUI-1503-2.side
@@ -49,6 +49,18 @@
         ["xpath=//button[contains(.,'Sign in')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "6410b0e4-ac64-42da-abd5-5f39364589ff",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "css=.nav-item > .d-flex",
+      "targets": [
+        ["css=.nav-item > .d-flex", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/div/div[4]/a", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/dashboard/admin/actions')]", "xpath:href"],
+        ["xpath=//div[4]/a", "xpath:position"]
+      ],
+      "value": "30000"
     }, {
       "id": "ba3c21fe-bd14-45c9-a77c-47db7f261e89",
       "comment": "",
@@ -277,13 +289,6 @@
         ["xpath=//form/div", "xpath:position"]
       ],
       "value": "Bad credentials"
-    }, {
-      "id": "5b421e75-d5db-44ff-ac57-2fd8f91c2478",
-      "comment": "",
-      "command": "close",
-      "target": "",
-      "targets": [],
-      "value": ""
     }]
   }],
   "suites": [{
diff --git a/backend/src/integration/resources/SHIBUI-1503-3.side b/backend/src/integration/resources/SHIBUI-1503-3.side
index 129e1e340..25a91828f 100644
--- a/backend/src/integration/resources/SHIBUI-1503-3.side
+++ b/backend/src/integration/resources/SHIBUI-1503-3.side
@@ -49,6 +49,13 @@
         ["xpath=//tr[3]/td/input", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "b774855b-f353-43ac-9114-3e1595ee49f8",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "linkText=Admin",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "b257e9f6-cf71-4d3c-a198-2f64a0f9dfe7",
       "comment": "",
@@ -207,13 +214,6 @@
         ["xpath=//a[contains(.,'Metadata Sources')]", "xpath:innerText"]
       ],
       "value": "Metadata Sources"
-    }, {
-      "id": "5b9612bd-d0ea-439b-895f-3dc372023578",
-      "comment": "",
-      "command": "close",
-      "target": "",
-      "targets": [],
-      "value": ""
     }]
   }],
   "suites": [{
diff --git a/backend/src/integration/resources/SHIBUI-1740-1.side b/backend/src/integration/resources/SHIBUI-1740-1.side
index 53ae936e6..c3cc756ff 100644
--- a/backend/src/integration/resources/SHIBUI-1740-1.side
+++ b/backend/src/integration/resources/SHIBUI-1740-1.side
@@ -52,6 +52,13 @@
         ["xpath=//p[2]/input", "xpath:position"]
       ],
       "value": "${KEY_ENTER}"
+    }, {
+      "id": "a95f9c87-d3fd-4114-b1e0-4164071c4381",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=advanced-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "0bdcd2aa-3e9e-41be-96d2-abf567538990",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1740-3.side b/backend/src/integration/resources/SHIBUI-1740-3.side
index 5ed3595ee..9c53b80e5 100644
--- a/backend/src/integration/resources/SHIBUI-1740-3.side
+++ b/backend/src/integration/resources/SHIBUI-1740-3.side
@@ -52,6 +52,13 @@
         ["xpath=//p[2]/input", "xpath:position"]
       ],
       "value": "${KEY_ENTER}"
+    }, {
+      "id": "81262307-71de-4a6a-9087-6d5aeb1efb6c",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "b64a0533-2175-4578-baeb-7ca4e97e0e23",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1740-4.side b/backend/src/integration/resources/SHIBUI-1740-4.side
index d6ead6f87..1eb3c7722 100644
--- a/backend/src/integration/resources/SHIBUI-1740-4.side
+++ b/backend/src/integration/resources/SHIBUI-1740-4.side
@@ -52,6 +52,13 @@
         ["xpath=//p[2]/input", "xpath:position"]
       ],
       "value": "${KEY_ENTER}"
+    }, {
+      "id": "db17b393-73ca-473d-b3bf-c3d75cc82a13",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=user-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "76210fb2-ebed-430b-bc73-7c114fef2c34",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1742-1.side b/backend/src/integration/resources/SHIBUI-1742-1.side
index f3c2bc8e3..4130b1254 100644
--- a/backend/src/integration/resources/SHIBUI-1742-1.side
+++ b/backend/src/integration/resources/SHIBUI-1742-1.side
@@ -52,6 +52,13 @@
         ["xpath=//p[2]/input", "xpath:position"]
       ],
       "value": "${KEY_ENTER}"
+    }, {
+      "id": "706b5765-d246-458f-9a72-be2a5dc59fbb",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "linkText=Admin",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "9572c7f3-5365-4864-a335-a0ed4c87ec7f",
       "comment": "",
@@ -573,6 +580,13 @@
         ["xpath=//p[2]/input", "xpath:position"]
       ],
       "value": "${KEY_ENTER}"
+    }, {
+      "id": "4bdddea6-4e3d-4947-a1cc-b05a795d56c5",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "xpath=//table/tbody/tr/td[5]/span/div/input",
+      "targets": [],
+      "value": "3000"
     }, {
       "id": "79423a30-b82b-443f-b0ea-80370a6d397b",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1742-2.side b/backend/src/integration/resources/SHIBUI-1742-2.side
index 73a29342f..ba40df4c0 100644
--- a/backend/src/integration/resources/SHIBUI-1742-2.side
+++ b/backend/src/integration/resources/SHIBUI-1742-2.side
@@ -53,19 +53,19 @@
       ],
       "value": "${KEY_ENTER}"
     }, {
-      "id": "53ffb74f-8635-453b-8b3e-22c0a11e0902",
+      "id": "eae646fb-6b90-42a0-92e0-bf44f1ee0a80",
       "comment": "",
-      "command": "pause",
-      "target": "5000",
+      "command": "waitForElementVisible",
+      "target": "xpath=//button[text()='Advanced']",
       "targets": [],
-      "value": ""
+      "value": "30000"
     }, {
       "id": "c820e378-569c-44ba-834a-c7d6203d3e12",
       "comment": "",
       "command": "click",
       "target": "xpath=//button[text()='Advanced']",
       "targets": [],
-      "value": "30000"
+      "value": ""
     }, {
       "id": "8f1af018-7f7f-441c-bb59-9591469cc0da",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1744-1.side b/backend/src/integration/resources/SHIBUI-1744-1.side
index faaacee02..bbf69eeab 100644
--- a/backend/src/integration/resources/SHIBUI-1744-1.side
+++ b/backend/src/integration/resources/SHIBUI-1744-1.side
@@ -51,6 +51,13 @@
         ["xpath=//button[contains(.,'Sign in')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "dd7a4d65-bc3c-4f00-9995-984b5e67cbc3",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=advanced-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "b88f58fc-bd07-4b76-9a8a-08e7a13030e8",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1744-2.side b/backend/src/integration/resources/SHIBUI-1744-2.side
index 9524fb82d..36ec5d6ee 100644
--- a/backend/src/integration/resources/SHIBUI-1744-2.side
+++ b/backend/src/integration/resources/SHIBUI-1744-2.side
@@ -51,6 +51,13 @@
         ["xpath=//button[contains(.,'Sign in')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "e62af22d-1d27-45e1-85f5-0cb467e71df4",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=advanced-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "8096864b-f997-4d71-a579-d5170f27fdea",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1744-3.side b/backend/src/integration/resources/SHIBUI-1744-3.side
index 1ecfdfff5..bbdbf1a84 100644
--- a/backend/src/integration/resources/SHIBUI-1744-3.side
+++ b/backend/src/integration/resources/SHIBUI-1744-3.side
@@ -51,6 +51,13 @@
         ["xpath=//button[contains(.,'Sign in')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "03e142bc-5e17-4af1-b2a2-694fd1f71604",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=advanced-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "8096864b-f997-4d71-a579-d5170f27fdea",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-2052.side b/backend/src/integration/resources/SHIBUI-2052.side
index 679c58114..4ddd7ba06 100644
--- a/backend/src/integration/resources/SHIBUI-2052.side
+++ b/backend/src/integration/resources/SHIBUI-2052.side
@@ -52,6 +52,13 @@
         ["xpath=//p[2]/input", "xpath:position"]
       ],
       "value": "${KEY_ENTER}"
+    }, {
+      "id": "7024f1d8-e9d9-4acf-bd23-5733950fc95a",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=user-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "f5e43d25-4f27-42a6-9a63-711e25e21ead",
       "comment": "",
@@ -150,6 +157,13 @@
         ["xpath=//p[2]/input", "xpath:position"]
       ],
       "value": "${KEY_ENTER}"
+    }, {
+      "id": "fb7ef6b5-0c19-45a5-ba11-8c4bd13126e2",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=user-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "1f83e7af-4ad2-43b1-ac8f-47d388ecc976",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-950.side b/backend/src/integration/resources/SHIBUI-950.side
index 0862db2f2..afe6b423e 100644
--- a/backend/src/integration/resources/SHIBUI-950.side
+++ b/backend/src/integration/resources/SHIBUI-950.side
@@ -49,6 +49,13 @@
         ["xpath=//tr[2]/td[2]/input", "xpath:position"]
       ],
       "value": "${KEY_ENTER}"
+    }, {
+      "id": "6e9a1bd7-c8b4-40a5-b9e0-7e516dd77375",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "6cfc4462-7d98-42ad-9503-1420238af405",
       "comment": "",
@@ -213,13 +220,6 @@
         ["xpath=//td[contains(.,'https://wiki.shibboleth.net/shibboleth')]", "xpath:innerText"]
       ],
       "value": "https://wiki.shibboleth.net/shibboleth"
-    }, {
-      "id": "c5bfb51f-fd8e-4518-880d-2735077baebb",
-      "comment": "",
-      "command": "close",
-      "target": "",
-      "targets": [],
-      "value": ""
     }]
   }],
   "suites": [{