From 64e21b6b7e3297a5f7f81d48ef5f86d9f48818aa Mon Sep 17 00:00:00 2001
From: Gilbert Cherrie <Gilbert.Cherrie@ibm.com>
Date: Thu, 7 Dec 2023 15:05:02 -0500
Subject: [PATCH] Fix failing specs

---
 ...d-remove-security-groups-form.spec.js.snap |  4 --
 .../ansible-edit-catalog-form.spec.js.snap    |  3 --
 .../button-group-form.spec.js.snap            |  2 -
 .../custom-button-form.spec.js.snap           |  2 -
 .../generic-objects-form.spec.js.snap         | 12 ++---
 .../notification-drawer.spec.js.snap          | 34 ++++++-------
 .../policy-profile-form.spec.js.snap          |  2 -
 .../reconfigure-vm-form.spec.js.snap          |  6 ++-
 .../__snapshots__/schedule-form.spec.js.snap  | 27 ++++-------
 .../settings-time-profile-form.spec.js.snap   |  4 --
 .../__snapshots__/subnet-form.spec.js.snap    |  1 -
 .../dashboard_toolbar.spec.jsx.snap           |  5 +-
 .../__snapshots__/selector.spec.js.snap       |  1 -
 .../__snapshots__/vm-edit-form.spec.js.snap   |  5 --
 .../__snapshots__/widget-wrapper.spec.js.snap | 48 +++++++++----------
 15 files changed, 62 insertions(+), 94 deletions(-)

diff --git a/app/javascript/spec/add-remove-security-groups-form/__snapshots__/add-remove-security-groups-form.spec.js.snap b/app/javascript/spec/add-remove-security-groups-form/__snapshots__/add-remove-security-groups-form.spec.js.snap
index e2cebd9a263b..46e17641b174 100644
--- a/app/javascript/spec/add-remove-security-groups-form/__snapshots__/add-remove-security-groups-form.spec.js.snap
+++ b/app/javascript/spec/add-remove-security-groups-form/__snapshots__/add-remove-security-groups-form.spec.js.snap
@@ -32,7 +32,6 @@ exports[`Add/remove security groups form component should add security group 1`]
     >
       <div
         aria-atomic="true"
-        aria-labelledby="loading-id-3"
         aria-live="assertive"
         className="export-spinner bx--loading bx--loading--small"
       >
@@ -100,7 +99,6 @@ exports[`Add/remove security groups form component should remove security group
     >
       <div
         aria-atomic="true"
-        aria-labelledby="loading-id-4"
         aria-live="assertive"
         className="export-spinner bx--loading bx--loading--small"
       >
@@ -168,7 +166,6 @@ exports[`Add/remove security groups form component should render add security gr
     >
       <div
         aria-atomic="true"
-        aria-labelledby="loading-id-1"
         aria-live="assertive"
         className="export-spinner bx--loading bx--loading--small"
       >
@@ -236,7 +233,6 @@ exports[`Add/remove security groups form component should render remove security
     >
       <div
         aria-atomic="true"
-        aria-labelledby="loading-id-2"
         aria-live="assertive"
         className="export-spinner bx--loading bx--loading--small"
       >
diff --git a/app/javascript/spec/ansible-edit-catalog-form/__snapshots__/ansible-edit-catalog-form.spec.js.snap b/app/javascript/spec/ansible-edit-catalog-form/__snapshots__/ansible-edit-catalog-form.spec.js.snap
index 1e7a19a331e3..818f52710305 100644
--- a/app/javascript/spec/ansible-edit-catalog-form/__snapshots__/ansible-edit-catalog-form.spec.js.snap
+++ b/app/javascript/spec/ansible-edit-catalog-form/__snapshots__/ansible-edit-catalog-form.spec.js.snap
@@ -27155,7 +27155,6 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                                                 data-invalid={null}
                                                               >
                                                                 <textarea
-                                                                  aria-describedby={null}
                                                                   aria-invalid={null}
                                                                   className="bx--text-area"
                                                                   cols={50}
@@ -85528,7 +85527,6 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                                                 data-invalid={null}
                                                               >
                                                                 <textarea
-                                                                  aria-describedby={null}
                                                                   aria-invalid={null}
                                                                   className="bx--text-area"
                                                                   cols={50}
@@ -146799,7 +146797,6 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                                                 data-invalid={null}
                                                               >
                                                                 <textarea
-                                                                  aria-describedby={null}
                                                                   aria-invalid={null}
                                                                   className="bx--text-area"
                                                                   cols={50}
diff --git a/app/javascript/spec/button-group/__snapshots__/button-group-form.spec.js.snap b/app/javascript/spec/button-group/__snapshots__/button-group-form.spec.js.snap
index b3e2f084eb3f..e7d0578563a8 100644
--- a/app/javascript/spec/button-group/__snapshots__/button-group-form.spec.js.snap
+++ b/app/javascript/spec/button-group/__snapshots__/button-group-form.spec.js.snap
@@ -55,7 +55,6 @@ exports[`Button Group form component should render the editing form 1`] = `
     >
       <div
         aria-atomic="true"
-        aria-labelledby="loading-id-1"
         aria-live="assertive"
         className="export-spinner bx--loading bx--loading--small"
       >
@@ -127,7 +126,6 @@ exports[`Button Group form component should render the editing form for generic
     >
       <div
         aria-atomic="true"
-        aria-labelledby="loading-id-2"
         aria-live="assertive"
         className="export-spinner bx--loading bx--loading--small"
       >
diff --git a/app/javascript/spec/custom-buttom-form/__snapshots__/custom-button-form.spec.js.snap b/app/javascript/spec/custom-buttom-form/__snapshots__/custom-button-form.spec.js.snap
index 1a9c20f82cde..b09df08ec829 100644
--- a/app/javascript/spec/custom-buttom-form/__snapshots__/custom-button-form.spec.js.snap
+++ b/app/javascript/spec/custom-buttom-form/__snapshots__/custom-button-form.spec.js.snap
@@ -424,7 +424,6 @@ exports[`Custom Button form component should edit a generic object custom button
     >
       <div
         aria-atomic="true"
-        aria-labelledby="loading-id-4"
         aria-live="assertive"
         className="export-spinner bx--loading bx--loading--small"
       >
@@ -884,7 +883,6 @@ exports[`Custom Button form component should render the editing form for generic
     >
       <div
         aria-atomic="true"
-        aria-labelledby="loading-id-1"
         aria-live="assertive"
         className="export-spinner bx--loading bx--loading--small"
       >
diff --git a/app/javascript/spec/generic-objects-form/__snapshots__/generic-objects-form.spec.js.snap b/app/javascript/spec/generic-objects-form/__snapshots__/generic-objects-form.spec.js.snap
index c70e4cb9f32d..7f96a830fcc6 100644
--- a/app/javascript/spec/generic-objects-form/__snapshots__/generic-objects-form.spec.js.snap
+++ b/app/javascript/spec/generic-objects-form/__snapshots__/generic-objects-form.spec.js.snap
@@ -9244,8 +9244,7 @@ exports[`Generic Object Form Component should render editing a generic object wi
                                                                                     aria-label="Clear selected item"
                                                                                     className="bx--list-box__selection"
                                                                                     onClick={[Function]}
-                                                                                    onKeyDown={[Function]}
-                                                                                    tabIndex={0}
+                                                                                    tabIndex={-1}
                                                                                     title="Clear selected item"
                                                                                     type="button"
                                                                                   >
@@ -9912,8 +9911,7 @@ exports[`Generic Object Form Component should render editing a generic object wi
                                                                                     aria-label="Clear selected item"
                                                                                     className="bx--list-box__selection"
                                                                                     onClick={[Function]}
-                                                                                    onKeyDown={[Function]}
-                                                                                    tabIndex={0}
+                                                                                    tabIndex={-1}
                                                                                     title="Clear selected item"
                                                                                     type="button"
                                                                                   >
@@ -16873,8 +16871,7 @@ exports[`Generic Object Form Component should render editing a generic object wi
                                                                                     aria-label="Clear selected item"
                                                                                     className="bx--list-box__selection"
                                                                                     onClick={[Function]}
-                                                                                    onKeyDown={[Function]}
-                                                                                    tabIndex={0}
+                                                                                    tabIndex={-1}
                                                                                     title="Clear selected item"
                                                                                     type="button"
                                                                                   >
@@ -17541,8 +17538,7 @@ exports[`Generic Object Form Component should render editing a generic object wi
                                                                                     aria-label="Clear selected item"
                                                                                     className="bx--list-box__selection"
                                                                                     onClick={[Function]}
-                                                                                    onKeyDown={[Function]}
-                                                                                    tabIndex={0}
+                                                                                    tabIndex={-1}
                                                                                     title="Clear selected item"
                                                                                     type="button"
                                                                                   >
diff --git a/app/javascript/spec/notification-drawer/__snapshots__/notification-drawer.spec.js.snap b/app/javascript/spec/notification-drawer/__snapshots__/notification-drawer.spec.js.snap
index e69c4a8a705a..2c628ad5bcfe 100644
--- a/app/javascript/spec/notification-drawer/__snapshots__/notification-drawer.spec.js.snap
+++ b/app/javascript/spec/notification-drawer/__snapshots__/notification-drawer.spec.js.snap
@@ -299,7 +299,7 @@ exports[`Notification drawer tests should render correctly 1`] = `
                                     flipped={true}
                                     floatingmenu="true"
                                     focusTrap={true}
-                                    iconDescription="open and close list of options"
+                                    iconDescription="Open and close list of options"
                                     id="10000000003625"
                                     light={false}
                                     menuOffset={[Function]}
@@ -393,7 +393,7 @@ exports[`Notification drawer tests should render correctly 1`] = `
                                       flipped={true}
                                       floatingmenu="true"
                                       focusTrap={true}
-                                      iconDescription="open and close list of options"
+                                      iconDescription="Open and close list of options"
                                       id="10000000003625"
                                       light={false}
                                       menuOffset={[Function]}
@@ -530,7 +530,7 @@ exports[`Notification drawer tests should render correctly 1`] = `
                                             flipped={true}
                                             floatingmenu="true"
                                             focusTrap={true}
-                                            iconDescription="open and close list of options"
+                                            iconDescription="Open and close list of options"
                                             id="10000000003625"
                                             light={false}
                                             menuOffset={[Function]}
@@ -624,7 +624,7 @@ exports[`Notification drawer tests should render correctly 1`] = `
                                               flipped={true}
                                               floatingmenu="true"
                                               focusTrap={true}
-                                              iconDescription="open and close list of options"
+                                              iconDescription="Open and close list of options"
                                               id="10000000003625"
                                               light={false}
                                               menuOffset={[Function]}
@@ -647,6 +647,7 @@ exports[`Notification drawer tests should render correctly 1`] = `
                                                 onClickOutside={[Function]}
                                               >
                                                 <button
+                                                  aria-controls={null}
                                                   aria-expanded={false}
                                                   aria-haspopup={true}
                                                   aria-label="open and close options"
@@ -661,11 +662,11 @@ exports[`Notification drawer tests should render correctly 1`] = `
                                                   type="button"
                                                 >
                                                   <ForwardRef(OverflowMenuVertical16)
-                                                    aria-label="open and close list of options"
+                                                    aria-label="Open and close list of options"
                                                     className="bx--overflow-menu__icon"
                                                   >
                                                     <Icon
-                                                      aria-label="open and close list of options"
+                                                      aria-label="Open and close list of options"
                                                       className="bx--overflow-menu__icon"
                                                       fill="currentColor"
                                                       height={16}
@@ -675,7 +676,7 @@ exports[`Notification drawer tests should render correctly 1`] = `
                                                       xmlns="http://www.w3.org/2000/svg"
                                                     >
                                                       <svg
-                                                        aria-label="open and close list of options"
+                                                        aria-label="Open and close list of options"
                                                         className="bx--overflow-menu__icon"
                                                         fill="currentColor"
                                                         focusable="false"
@@ -702,7 +703,7 @@ exports[`Notification drawer tests should render correctly 1`] = `
                                                           r="2"
                                                         />
                                                         <title>
-                                                          open and close list of options
+                                                          Open and close list of options
                                                         </title>
                                                       </svg>
                                                     </Icon>
@@ -753,7 +754,7 @@ exports[`Notification drawer tests should render correctly 1`] = `
                                     flipped={true}
                                     floatingmenu="true"
                                     focusTrap={true}
-                                    iconDescription="open and close list of options"
+                                    iconDescription="Open and close list of options"
                                     id="10000000003624"
                                     light={false}
                                     menuOffset={[Function]}
@@ -847,7 +848,7 @@ exports[`Notification drawer tests should render correctly 1`] = `
                                       flipped={true}
                                       floatingmenu="true"
                                       focusTrap={true}
-                                      iconDescription="open and close list of options"
+                                      iconDescription="Open and close list of options"
                                       id="10000000003624"
                                       light={false}
                                       menuOffset={[Function]}
@@ -985,7 +986,7 @@ exports[`Notification drawer tests should render correctly 1`] = `
                                             flipped={true}
                                             floatingmenu="true"
                                             focusTrap={true}
-                                            iconDescription="open and close list of options"
+                                            iconDescription="Open and close list of options"
                                             id="10000000003624"
                                             light={false}
                                             menuOffset={[Function]}
@@ -1079,7 +1080,7 @@ exports[`Notification drawer tests should render correctly 1`] = `
                                               flipped={true}
                                               floatingmenu="true"
                                               focusTrap={true}
-                                              iconDescription="open and close list of options"
+                                              iconDescription="Open and close list of options"
                                               id="10000000003624"
                                               light={false}
                                               menuOffset={[Function]}
@@ -1102,6 +1103,7 @@ exports[`Notification drawer tests should render correctly 1`] = `
                                                 onClickOutside={[Function]}
                                               >
                                                 <button
+                                                  aria-controls={null}
                                                   aria-expanded={false}
                                                   aria-haspopup={true}
                                                   aria-label="open and close options"
@@ -1116,11 +1118,11 @@ exports[`Notification drawer tests should render correctly 1`] = `
                                                   type="button"
                                                 >
                                                   <ForwardRef(OverflowMenuVertical16)
-                                                    aria-label="open and close list of options"
+                                                    aria-label="Open and close list of options"
                                                     className="bx--overflow-menu__icon"
                                                   >
                                                     <Icon
-                                                      aria-label="open and close list of options"
+                                                      aria-label="Open and close list of options"
                                                       className="bx--overflow-menu__icon"
                                                       fill="currentColor"
                                                       height={16}
@@ -1130,7 +1132,7 @@ exports[`Notification drawer tests should render correctly 1`] = `
                                                       xmlns="http://www.w3.org/2000/svg"
                                                     >
                                                       <svg
-                                                        aria-label="open and close list of options"
+                                                        aria-label="Open and close list of options"
                                                         className="bx--overflow-menu__icon"
                                                         fill="currentColor"
                                                         focusable="false"
@@ -1157,7 +1159,7 @@ exports[`Notification drawer tests should render correctly 1`] = `
                                                           r="2"
                                                         />
                                                         <title>
-                                                          open and close list of options
+                                                          Open and close list of options
                                                         </title>
                                                       </svg>
                                                     </Icon>
diff --git a/app/javascript/spec/policy-profile-form/__snapshots__/policy-profile-form.spec.js.snap b/app/javascript/spec/policy-profile-form/__snapshots__/policy-profile-form.spec.js.snap
index 6f128cb1f4f0..f33c078d9a8f 100644
--- a/app/javascript/spec/policy-profile-form/__snapshots__/policy-profile-form.spec.js.snap
+++ b/app/javascript/spec/policy-profile-form/__snapshots__/policy-profile-form.spec.js.snap
@@ -40,7 +40,6 @@ exports[`PolicyProfileForm form component should render editing form variant 1`]
     >
       <div
         aria-atomic="true"
-        aria-labelledby="loading-id-2"
         aria-live="assertive"
         className="export-spinner bx--loading bx--loading--small"
       >
@@ -104,7 +103,6 @@ exports[`PolicyProfileForm form component should render new form variant 1`] = `
     >
       <div
         aria-atomic="true"
-        aria-labelledby="loading-id-1"
         aria-live="assertive"
         className="export-spinner bx--loading bx--loading--small"
       >
diff --git a/app/javascript/spec/reconfigure-vm-form/__snapshots__/reconfigure-vm-form.spec.js.snap b/app/javascript/spec/reconfigure-vm-form/__snapshots__/reconfigure-vm-form.spec.js.snap
index e05e4dad93ba..0075e01061ae 100644
--- a/app/javascript/spec/reconfigure-vm-form/__snapshots__/reconfigure-vm-form.spec.js.snap
+++ b/app/javascript/spec/reconfigure-vm-form/__snapshots__/reconfigure-vm-form.spec.js.snap
@@ -23553,6 +23553,7 @@ exports[`Reconfigure VM form component should render reconfigure form and show h
                                                                                 data-invalid={null}
                                                                               >
                                                                                 <select
+                                                                                  aria-describedby="select-helper-text-7"
                                                                                   className="bx--select-input"
                                                                                   id="mem_type"
                                                                                   name="mem_type"
@@ -23630,6 +23631,7 @@ exports[`Reconfigure VM form component should render reconfigure form and show h
                                                                               </div>
                                                                               <div
                                                                                 className="bx--form__helper-text"
+                                                                                id="select-helper-text-7"
                                                                               >
                                                                                 Between 1024MB and 0.009765625GB
                                                                               </div>
@@ -25288,7 +25290,6 @@ exports[`Reconfigure VM form component should render reconfigure form and show h
                                                                   className="bx--number__input-wrapper"
                                                                 >
                                                                   <input
-                                                                    aria-describedby={null}
                                                                     aria-invalid={false}
                                                                     aria-label={null}
                                                                     data-invalid={false}
@@ -42277,6 +42278,7 @@ exports[`Reconfigure VM form component should render reconfigure form without da
                                                                                 data-invalid={null}
                                                                               >
                                                                                 <select
+                                                                                  aria-describedby="select-helper-text-1"
                                                                                   className="bx--select-input"
                                                                                   id="mem_type"
                                                                                   name="mem_type"
@@ -42354,6 +42356,7 @@ exports[`Reconfigure VM form component should render reconfigure form without da
                                                                               </div>
                                                                               <div
                                                                                 className="bx--form__helper-text"
+                                                                                id="select-helper-text-1"
                                                                               >
                                                                                 Between 1024MB and 0.009765625GB
                                                                               </div>
@@ -44012,7 +44015,6 @@ exports[`Reconfigure VM form component should render reconfigure form without da
                                                                   className="bx--number__input-wrapper"
                                                                 >
                                                                   <input
-                                                                    aria-describedby={null}
                                                                     aria-invalid={false}
                                                                     aria-label={null}
                                                                     data-invalid={false}
diff --git a/app/javascript/spec/schedule-form/__snapshots__/schedule-form.spec.js.snap b/app/javascript/spec/schedule-form/__snapshots__/schedule-form.spec.js.snap
index 41239b9f6e17..a352e3c576fb 100644
--- a/app/javascript/spec/schedule-form/__snapshots__/schedule-form.spec.js.snap
+++ b/app/javascript/spec/schedule-form/__snapshots__/schedule-form.spec.js.snap
@@ -9891,8 +9891,7 @@ exports[`Schedule form component should render edit form when filter_type is not
                                                                   aria-label="Clear selected item"
                                                                   className="bx--list-box__selection"
                                                                   onClick={[Function]}
-                                                                  onKeyDown={[Function]}
-                                                                  tabIndex={0}
+                                                                  tabIndex={-1}
                                                                   title="Clear selected item"
                                                                   type="button"
                                                                 >
@@ -10293,8 +10292,7 @@ exports[`Schedule form component should render edit form when filter_type is not
                                                                   aria-label="Clear selected item"
                                                                   className="bx--list-box__selection"
                                                                   onClick={[Function]}
-                                                                  onKeyDown={[Function]}
-                                                                  tabIndex={0}
+                                                                  tabIndex={-1}
                                                                   title="Clear selected item"
                                                                   type="button"
                                                                 >
@@ -12794,8 +12792,7 @@ exports[`Schedule form component should render edit form when filter_type is not
                                                                 aria-label="Clear selected item"
                                                                 className="bx--list-box__selection"
                                                                 onClick={[Function]}
-                                                                onKeyDown={[Function]}
-                                                                tabIndex={0}
+                                                                tabIndex={-1}
                                                                 title="Clear selected item"
                                                                 type="button"
                                                               >
@@ -25992,8 +25989,7 @@ exports[`Schedule form component should render edit form when filter_type is nul
                                                                 aria-label="Clear selected item"
                                                                 className="bx--list-box__selection"
                                                                 onClick={[Function]}
-                                                                onKeyDown={[Function]}
-                                                                tabIndex={0}
+                                                                tabIndex={-1}
                                                                 title="Clear selected item"
                                                                 type="button"
                                                               >
@@ -26593,8 +26589,7 @@ exports[`Schedule form component should render edit form when filter_type is nul
                                                                 aria-label="Clear selected item"
                                                                 className="bx--list-box__selection"
                                                                 onClick={[Function]}
-                                                                onKeyDown={[Function]}
-                                                                tabIndex={0}
+                                                                tabIndex={-1}
                                                                 title="Clear selected item"
                                                                 type="button"
                                                               >
@@ -30927,8 +30922,7 @@ exports[`Schedule form component should render edit form when filter_type is nul
                                                                 aria-label="Clear selected item"
                                                                 className="bx--list-box__selection"
                                                                 onClick={[Function]}
-                                                                onKeyDown={[Function]}
-                                                                tabIndex={0}
+                                                                tabIndex={-1}
                                                                 title="Clear selected item"
                                                                 type="button"
                                                               >
@@ -42120,8 +42114,7 @@ exports[`Schedule form component should render schedule add form 1`] = `
                                                                   aria-label="Clear selected item"
                                                                   className="bx--list-box__selection"
                                                                   onClick={[Function]}
-                                                                  onKeyDown={[Function]}
-                                                                  tabIndex={0}
+                                                                  tabIndex={-1}
                                                                   title="Clear selected item"
                                                                   type="button"
                                                                 >
@@ -42522,8 +42515,7 @@ exports[`Schedule form component should render schedule add form 1`] = `
                                                                   aria-label="Clear selected item"
                                                                   className="bx--list-box__selection"
                                                                   onClick={[Function]}
-                                                                  onKeyDown={[Function]}
-                                                                  tabIndex={0}
+                                                                  tabIndex={-1}
                                                                   title="Clear selected item"
                                                                   type="button"
                                                                 >
@@ -44758,8 +44750,7 @@ exports[`Schedule form component should render schedule add form 1`] = `
                                                                 aria-label="Clear selected item"
                                                                 className="bx--list-box__selection"
                                                                 onClick={[Function]}
-                                                                onKeyDown={[Function]}
-                                                                tabIndex={0}
+                                                                tabIndex={-1}
                                                                 title="Clear selected item"
                                                                 type="button"
                                                               >
diff --git a/app/javascript/spec/settings-time-profile-form/__snapshots__/settings-time-profile-form.spec.js.snap b/app/javascript/spec/settings-time-profile-form/__snapshots__/settings-time-profile-form.spec.js.snap
index 4464ecf9a8d7..81b9b0ee52ff 100644
--- a/app/javascript/spec/settings-time-profile-form/__snapshots__/settings-time-profile-form.spec.js.snap
+++ b/app/javascript/spec/settings-time-profile-form/__snapshots__/settings-time-profile-form.spec.js.snap
@@ -14617,7 +14617,6 @@ exports[`VM common form component should render copying form variant new name on
     >
       <div
         aria-atomic="true"
-        aria-labelledby="loading-id-3"
         aria-live="assertive"
         className="export-spinner bx--loading bx--loading--small"
       >
@@ -14686,7 +14685,6 @@ exports[`VM common form component should render copying form variant with new va
     >
       <div
         aria-atomic="true"
-        aria-labelledby="loading-id-4"
         aria-live="assertive"
         className="export-spinner bx--loading bx--loading--small"
       >
@@ -14755,7 +14753,6 @@ exports[`VM common form component should render editing form variant all new val
     >
       <div
         aria-atomic="true"
-        aria-labelledby="loading-id-1"
         aria-live="assertive"
         className="export-spinner bx--loading bx--loading--small"
       >
@@ -14824,7 +14821,6 @@ exports[`VM common form component should render editing form variant some new va
     >
       <div
         aria-atomic="true"
-        aria-labelledby="loading-id-2"
         aria-live="assertive"
         className="export-spinner bx--loading bx--loading--small"
       >
diff --git a/app/javascript/spec/subnet-form/__snapshots__/subnet-form.spec.js.snap b/app/javascript/spec/subnet-form/__snapshots__/subnet-form.spec.js.snap
index 4810a638d4f3..489337972008 100644
--- a/app/javascript/spec/subnet-form/__snapshots__/subnet-form.spec.js.snap
+++ b/app/javascript/spec/subnet-form/__snapshots__/subnet-form.spec.js.snap
@@ -66,7 +66,6 @@ exports[`Subnet form component renders the editing form variant 1`] = `
     >
       <div
         aria-atomic="true"
-        aria-labelledby="loading-id-1"
         aria-live="assertive"
         className="export-spinner bx--loading bx--loading--small"
       >
diff --git a/app/javascript/spec/toolbar/__snapshots__/dashboard_toolbar.spec.jsx.snap b/app/javascript/spec/toolbar/__snapshots__/dashboard_toolbar.spec.jsx.snap
index 1dc55b90a5ae..603564444e38 100644
--- a/app/javascript/spec/toolbar/__snapshots__/dashboard_toolbar.spec.jsx.snap
+++ b/app/javascript/spec/toolbar/__snapshots__/dashboard_toolbar.spec.jsx.snap
@@ -30,7 +30,7 @@ exports[`<DashboardToolbar /> renders ok 1`] = `
         flipped={false}
         floatingmenu="true"
         focusTrap={true}
-        iconDescription="open and close list of options"
+        iconDescription="Open and close list of options"
         id="dropdown-custom-2"
         light={false}
         menuOffset={[Function]}
@@ -49,6 +49,7 @@ exports[`<DashboardToolbar /> renders ok 1`] = `
           onClickOutside={[Function]}
         >
           <button
+            aria-controls={null}
             aria-expanded={false}
             aria-haspopup={true}
             aria-label="Add widget"
@@ -64,7 +65,7 @@ exports[`<DashboardToolbar /> renders ok 1`] = `
             type="button"
           >
             <renderIcon
-              aria-label="open and close list of options"
+              aria-label="Open and close list of options"
               className="bx--overflow-menu__icon"
             >
               <div
diff --git a/app/javascript/spec/tree-view/__snapshots__/selector.spec.js.snap b/app/javascript/spec/tree-view/__snapshots__/selector.spec.js.snap
index 7dd673308a4f..509300910eb8 100644
--- a/app/javascript/spec/tree-view/__snapshots__/selector.spec.js.snap
+++ b/app/javascript/spec/tree-view/__snapshots__/selector.spec.js.snap
@@ -321,7 +321,6 @@ exports[`TreeSelector component should render correctly 1`] = `
               </button>
             </div>
             <div
-              aria-labelledby="bx--modal-header__heading--modal-1"
               className="bx--modal-content"
               id="bx--modal-body--modal-1"
             >
diff --git a/app/javascript/spec/vm-edit-form/__snapshots__/vm-edit-form.spec.js.snap b/app/javascript/spec/vm-edit-form/__snapshots__/vm-edit-form.spec.js.snap
index f5fbaf722628..13203e196b3b 100644
--- a/app/javascript/spec/vm-edit-form/__snapshots__/vm-edit-form.spec.js.snap
+++ b/app/javascript/spec/vm-edit-form/__snapshots__/vm-edit-form.spec.js.snap
@@ -33,7 +33,6 @@ exports[`VM Edit form component should edit template with a parent and children
     >
       <div
         aria-atomic="true"
-        aria-labelledby="loading-id-4"
         aria-live="assertive"
         className="export-spinner bx--loading bx--loading--small"
       >
@@ -102,7 +101,6 @@ exports[`VM Edit form component should edit template with no parent and children
     >
       <div
         aria-atomic="true"
-        aria-labelledby="loading-id-5"
         aria-live="assertive"
         className="export-spinner bx--loading bx--loading--small"
       >
@@ -171,7 +169,6 @@ exports[`VM Edit form component should edit vm with a parent and children 1`] =
     >
       <div
         aria-atomic="true"
-        aria-labelledby="loading-id-2"
         aria-live="assertive"
         className="export-spinner bx--loading bx--loading--small"
       >
@@ -240,7 +237,6 @@ exports[`VM Edit form component should edit vm with no parent or children 1`] =
     >
       <div
         aria-atomic="true"
-        aria-labelledby="loading-id-3"
         aria-live="assertive"
         className="export-spinner bx--loading bx--loading--small"
       >
@@ -309,7 +305,6 @@ exports[`VM Edit form component should render vm edit form 1`] = `
     >
       <div
         aria-atomic="true"
-        aria-labelledby="loading-id-1"
         aria-live="assertive"
         className="export-spinner bx--loading bx--loading--small"
       >
diff --git a/app/javascript/spec/widget-wrapper/__snapshots__/widget-wrapper.spec.js.snap b/app/javascript/spec/widget-wrapper/__snapshots__/widget-wrapper.spec.js.snap
index b530c6dcc524..c851734f7ad4 100644
--- a/app/javascript/spec/widget-wrapper/__snapshots__/widget-wrapper.spec.js.snap
+++ b/app/javascript/spec/widget-wrapper/__snapshots__/widget-wrapper.spec.js.snap
@@ -36,12 +36,12 @@ exports[`Widget wrapper component should render a widget wrapper with a chart 1`
           className="card-pf-heading-kebab"
         >
           <OverflowMenu
-            ariaLabel="open and close list of options"
+            ariaLabel="Open and close list of options"
             className="widget-overflow-menu"
             direction="bottom"
             flipped={true}
             focusTrap={true}
-            iconDescription="open and close list of options"
+            iconDescription="Open and close list of options"
             id="1-menu"
             light={false}
             menuOffset={[Function]}
@@ -63,9 +63,10 @@ exports[`Widget wrapper component should render a widget wrapper with a chart 1`
               onClickOutside={[Function]}
             >
               <button
+                aria-controls={null}
                 aria-expanded={false}
                 aria-haspopup={true}
-                aria-label="open and close list of options"
+                aria-label="Open and close list of options"
                 className="widget-overflow-menu bx--overflow-menu bx--overflow-menu--md"
                 id="1-menu"
                 onClick={[Function]}
@@ -75,11 +76,11 @@ exports[`Widget wrapper component should render a widget wrapper with a chart 1`
                 type="button"
               >
                 <ForwardRef(OverflowMenuVertical16)
-                  aria-label="open and close list of options"
+                  aria-label="Open and close list of options"
                   className="bx--overflow-menu__icon"
                 >
                   <Icon
-                    aria-label="open and close list of options"
+                    aria-label="Open and close list of options"
                     className="bx--overflow-menu__icon"
                     fill="currentColor"
                     height={16}
@@ -89,7 +90,7 @@ exports[`Widget wrapper component should render a widget wrapper with a chart 1`
                     xmlns="http://www.w3.org/2000/svg"
                   >
                     <svg
-                      aria-label="open and close list of options"
+                      aria-label="Open and close list of options"
                       className="bx--overflow-menu__icon"
                       fill="currentColor"
                       focusable="false"
@@ -116,7 +117,7 @@ exports[`Widget wrapper component should render a widget wrapper with a chart 1`
                         r="2"
                       />
                       <title>
-                        open and close list of options
+                        Open and close list of options
                       </title>
                     </svg>
                   </Icon>
@@ -151,7 +152,6 @@ exports[`Widget wrapper component should render a widget wrapper with a chart 1`
           >
             <div
               aria-atomic="true"
-              aria-labelledby="loading-id-3"
               aria-live="assertive"
               className="export-spinner bx--loading bx--loading--small"
             >
@@ -226,12 +226,12 @@ exports[`Widget wrapper component should render a widget wrapper with a menu 1`]
           className="card-pf-heading-kebab"
         >
           <OverflowMenu
-            ariaLabel="open and close list of options"
+            ariaLabel="Open and close list of options"
             className="widget-overflow-menu"
             direction="bottom"
             flipped={true}
             focusTrap={true}
-            iconDescription="open and close list of options"
+            iconDescription="Open and close list of options"
             id="83-menu"
             light={false}
             menuOffset={[Function]}
@@ -253,9 +253,10 @@ exports[`Widget wrapper component should render a widget wrapper with a menu 1`]
               onClickOutside={[Function]}
             >
               <button
+                aria-controls={null}
                 aria-expanded={false}
                 aria-haspopup={true}
-                aria-label="open and close list of options"
+                aria-label="Open and close list of options"
                 className="widget-overflow-menu bx--overflow-menu bx--overflow-menu--md"
                 id="83-menu"
                 onClick={[Function]}
@@ -265,11 +266,11 @@ exports[`Widget wrapper component should render a widget wrapper with a menu 1`]
                 type="button"
               >
                 <ForwardRef(OverflowMenuVertical16)
-                  aria-label="open and close list of options"
+                  aria-label="Open and close list of options"
                   className="bx--overflow-menu__icon"
                 >
                   <Icon
-                    aria-label="open and close list of options"
+                    aria-label="Open and close list of options"
                     className="bx--overflow-menu__icon"
                     fill="currentColor"
                     height={16}
@@ -279,7 +280,7 @@ exports[`Widget wrapper component should render a widget wrapper with a menu 1`]
                     xmlns="http://www.w3.org/2000/svg"
                   >
                     <svg
-                      aria-label="open and close list of options"
+                      aria-label="Open and close list of options"
                       className="bx--overflow-menu__icon"
                       fill="currentColor"
                       focusable="false"
@@ -306,7 +307,7 @@ exports[`Widget wrapper component should render a widget wrapper with a menu 1`]
                         r="2"
                       />
                       <title>
-                        open and close list of options
+                        Open and close list of options
                       </title>
                     </svg>
                   </Icon>
@@ -341,7 +342,6 @@ exports[`Widget wrapper component should render a widget wrapper with a menu 1`]
           >
             <div
               aria-atomic="true"
-              aria-labelledby="loading-id-2"
               aria-live="assertive"
               className="export-spinner bx--loading bx--loading--small"
             >
@@ -416,12 +416,12 @@ exports[`Widget wrapper component should render a widget wrapper with a report 1
           className="card-pf-heading-kebab"
         >
           <OverflowMenu
-            ariaLabel="open and close list of options"
+            ariaLabel="Open and close list of options"
             className="widget-overflow-menu"
             direction="bottom"
             flipped={true}
             focusTrap={true}
-            iconDescription="open and close list of options"
+            iconDescription="Open and close list of options"
             id="19-menu"
             light={false}
             menuOffset={[Function]}
@@ -443,9 +443,10 @@ exports[`Widget wrapper component should render a widget wrapper with a report 1
               onClickOutside={[Function]}
             >
               <button
+                aria-controls={null}
                 aria-expanded={false}
                 aria-haspopup={true}
-                aria-label="open and close list of options"
+                aria-label="Open and close list of options"
                 className="widget-overflow-menu bx--overflow-menu bx--overflow-menu--md"
                 id="19-menu"
                 onClick={[Function]}
@@ -455,11 +456,11 @@ exports[`Widget wrapper component should render a widget wrapper with a report 1
                 type="button"
               >
                 <ForwardRef(OverflowMenuVertical16)
-                  aria-label="open and close list of options"
+                  aria-label="Open and close list of options"
                   className="bx--overflow-menu__icon"
                 >
                   <Icon
-                    aria-label="open and close list of options"
+                    aria-label="Open and close list of options"
                     className="bx--overflow-menu__icon"
                     fill="currentColor"
                     height={16}
@@ -469,7 +470,7 @@ exports[`Widget wrapper component should render a widget wrapper with a report 1
                     xmlns="http://www.w3.org/2000/svg"
                   >
                     <svg
-                      aria-label="open and close list of options"
+                      aria-label="Open and close list of options"
                       className="bx--overflow-menu__icon"
                       fill="currentColor"
                       focusable="false"
@@ -496,7 +497,7 @@ exports[`Widget wrapper component should render a widget wrapper with a report 1
                         r="2"
                       />
                       <title>
-                        open and close list of options
+                        Open and close list of options
                       </title>
                     </svg>
                   </Icon>
@@ -531,7 +532,6 @@ exports[`Widget wrapper component should render a widget wrapper with a report 1
           >
             <div
               aria-atomic="true"
-              aria-labelledby="loading-id-1"
               aria-live="assertive"
               className="export-spinner bx--loading bx--loading--small"
             >