From 8d9f6f38fe732694763dd7c53cf93c0fc4585719 Mon Sep 17 00:00:00 2001
From: Bill Smith <wsmith@unicon.net>
Date: Tue, 28 Sep 2021 12:32:18 -0700
Subject: [PATCH] 1743

Fixed a couple tests for Firefox.
---
 .../integration/resources/SHIBUI-1743-1.side  |  7 ++
 .../integration/resources/SHIBUI-1743-2.side  | 71 ++++++++++++++-----
 2 files changed, 62 insertions(+), 16 deletions(-)

diff --git a/backend/src/integration/resources/SHIBUI-1743-1.side b/backend/src/integration/resources/SHIBUI-1743-1.side
index 98fad4c41..76a1a3a75 100644
--- a/backend/src/integration/resources/SHIBUI-1743-1.side
+++ b/backend/src/integration/resources/SHIBUI-1743-1.side
@@ -52,6 +52,13 @@
         ["xpath=//p[2]/input", "xpath:position"]
       ],
       "value": "${KEY_ENTER}"
+    }, {
+      "id": "938e82d0-6e75-428a-9415-d2aa38003793",
+      "comment": "",
+      "command": "waitForElementEditable",
+      "target": "xpath=//button[contains(.,'Advanced')]",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "b2cef5a2-f0e1-4ca6-9ce5-e4a26314b4cd",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1743-2.side b/backend/src/integration/resources/SHIBUI-1743-2.side
index 43e1fb902..3908e652d 100644
--- a/backend/src/integration/resources/SHIBUI-1743-2.side
+++ b/backend/src/integration/resources/SHIBUI-1743-2.side
@@ -52,6 +52,20 @@
         ["xpath=//p[2]/input", "xpath:position"]
       ],
       "value": "${KEY_ENTER}"
+    }, {
+      "id": "168a6d36-5eda-41a5-8b6e-59567648dd2c",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=advanced-nav-dropdown-toggle",
+      "targets": [
+        ["id=advanced-nav-dropdown-toggle", "id"],
+        ["css=#advanced-nav-dropdown-toggle", "css:finder"],
+        ["xpath=//button[@id='advanced-nav-dropdown-toggle']", "xpath:attributes"],
+        ["xpath=//div[@id='advanced-nav-dropdown']/button", "xpath:idRelative"],
+        ["xpath=//div[3]/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Advanced')]", "xpath:innerText"]
+      ],
+      "value": "30000"
     }, {
       "id": "803e22d7-949f-4fd0-97e6-d2a6b0be988b",
       "comment": "",
@@ -70,14 +84,21 @@
       "id": "c3f11028-c8de-4742-ab4d-121b72b51abe",
       "comment": "",
       "command": "open",
-      "target": "/dashboard",
+      "target": "/",
       "targets": [],
       "value": ""
+    }, {
+      "id": "fefc39c6-9484-4e28-b0ba-2cddbdab5c3d",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=advanced-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "acc47c80-37a0-493d-9ee7-4461999c2462",
       "comment": "",
       "command": "click",
-      "target": "id=dropdown-basic",
+      "target": "id=advanced-nav-dropdown-toggle",
       "targets": [
         ["id=dropdown-basic", "id"],
         ["xpath=//button[@id='dropdown-basic']", "xpath:attributes"],
@@ -136,18 +157,34 @@
         ["xpath=//button[contains(.,' Save')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "3e012b4f-0c0f-4f58-89ff-f32b8d78f163",
+      "comment": "",
+      "command": "click",
+      "target": "id=user-nav-dropdown-toggle",
+      "targets": [
+        ["id=user-nav-dropdown-toggle", "id"],
+        ["css=#user-nav-dropdown-toggle", "css:finder"],
+        ["xpath=//button[@id='user-nav-dropdown-toggle']", "xpath:attributes"],
+        ["xpath=//div[@id='user-nav-dropdown']/button", "xpath:idRelative"],
+        ["xpath=//div[4]/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Logged in as admin')]", "xpath:innerText"]
+      ],
+      "value": ""
     }, {
       "id": "e2cc961b-051e-4ae5-b075-8215dfbefc1b",
       "comment": "",
       "command": "click",
-      "target": "linkText=Logout",
+      "target": "id=user-nav-dropdown-logout",
       "targets": [
+        ["id=user-nav-dropdown-logout", "id"],
         ["linkText=Logout", "linkText"],
-        ["css=.nav-link:nth-child(4)", "css:finder"],
+        ["css=#user-nav-dropdown-logout", "css:finder"],
         ["xpath=//a[contains(text(),'Logout')]", "xpath:link"],
-        ["xpath=//div[@id='basic-navbar-nav']/div/a[2]", "xpath:idRelative"],
+        ["xpath=//a[@id='user-nav-dropdown-logout']", "xpath:attributes"],
+        ["xpath=//div[@id='user-nav-dropdown']/div/a", "xpath:idRelative"],
         ["xpath=//a[contains(@href, '/logout')]", "xpath:href"],
-        ["xpath=//nav/div/div/a[2]", "xpath:position"],
+        ["xpath=//div[4]/div/a", "xpath:position"],
         ["xpath=//a[contains(.,'Logout')]", "xpath:innerText"]
       ],
       "value": ""
@@ -193,13 +230,13 @@
       "id": "cdfa1d56-26e2-4cfe-8985-ccd1b8af1ffe",
       "comment": "",
       "command": "click",
-      "target": "id=dropdown-basic",
+      "target": "id=metadata-nav-dropdown-toggle",
       "targets": [
-        ["id=dropdown-basic", "id"],
-        ["css=#dropdown-basic", "css:finder"],
-        ["xpath=//button[@id='dropdown-basic']", "xpath:attributes"],
-        ["xpath=//div[@id='basic-nav-dropdown']/button", "xpath:idRelative"],
-        ["xpath=//div/button", "xpath:position"],
+        ["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": ""
@@ -207,14 +244,16 @@
       "id": "61a52996-637f-4a17-bd83-1391da2a1582",
       "comment": "",
       "command": "click",
-      "target": "linkText=Add a new metadata source",
+      "target": "id=metadata-nav-dropdown-source",
       "targets": [
+        ["id=metadata-nav-dropdown-source", "id"],
         ["linkText=Add a new metadata source", "linkText"],
-        ["css=.text-primary", "css:finder"],
+        ["css=#metadata-nav-dropdown-source", "css:finder"],
         ["xpath=//a[contains(text(),'Add a new metadata source')]", "xpath:link"],
-        ["xpath=//div[@id='basic-nav-dropdown']/div/a", "xpath:idRelative"],
+        ["xpath=//a[@id='metadata-nav-dropdown-source']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/div/a", "xpath:idRelative"],
         ["xpath=//a[contains(@href, '/metadata/source/new')]", "xpath:href"],
-        ["xpath=//div/a", "xpath:position"],
+        ["xpath=//div[2]/div/a", "xpath:position"],
         ["xpath=//a[contains(.,'Add a new metadata source')]", "xpath:innerText"]
       ],
       "value": ""