fix tests

Author: LFDanLu

packages/@react-spectrum/menu/test/SubMenuTrigger.test.tsx

@@ -822,14 +822,16 @@ describe('SubMenu', function () {
       expect(subMenu1).toHaveAttribute('aria-label', subMenuTrigger1.textContent);
       buttons = within(tray).getAllByRole('button');
       expect(buttons).toHaveLength(3);
+      let menuHeader = within(tray).getAllByText(subMenuTrigger1.textContent)[0];
+      expect(menuHeader).toBeVisible();
+      expect(menuHeader.tagName).toBe('SPAN');
       for (let button of buttons) {
         if (button.getAttribute('aria-label') !== 'Dismiss') {
-          expect(button).toHaveAttribute('aria-label', `Return to ${subMenuTrigger1.textContent}`);
+          expect(button).toHaveAttribute('aria-label', 'Return to ');
+          expect(button).toHaveAttribute('aria-labelledby', `${button.id} ${menuHeader.id}`)
         }
       }
-      let menuHeader = within(tray).getAllByText(subMenuTrigger1.textContent)[0];
-      expect(menuHeader).toBeVisible();
-      expect(menuHeader.tagName).toBe('SPAN');
+
       let subMenu1Items = within(subMenu1).getAllByRole('menuitem');
       let subMenuTrigger2 = subMenu1Items[2];
       triggerTouch(subMenuTrigger2);
@@ -844,14 +846,16 @@ describe('SubMenu', function () {
       expect(subMenu2).toHaveAttribute('aria-label', subMenuTrigger2.textContent);
       buttons = within(tray).getAllByRole('button');
       expect(buttons).toHaveLength(3);
+      menuHeader = within(tray).getAllByText(subMenuTrigger2.textContent)[0];
+      expect(menuHeader).toBeVisible();
+      expect(menuHeader.tagName).toBe('SPAN');
+
       for (let button of buttons) {
         if (button.getAttribute('aria-label') !== 'Dismiss') {
-          expect(button).toHaveAttribute('aria-label', `Return to ${subMenuTrigger2.textContent}`);
+          expect(button).toHaveAttribute('aria-label', 'Return to ');
+          expect(button).toHaveAttribute('aria-labelledby', `${button.id} ${menuHeader.id}`);
         }
       }
-      menuHeader = within(tray).getAllByText(subMenuTrigger2.textContent)[0];
-      expect(menuHeader).toBeVisible();
-      expect(menuHeader.tagName).toBe('SPAN');
     });
 
     it('should provide a back button to close the submenu', async function () {
@@ -882,7 +886,7 @@ describe('SubMenu', function () {
       expect(menuItems[0]).toHaveTextContent('Lvl 3');
       let buttons = within(tray).getAllByRole('button');
       expect(buttons).toHaveLength(3);
-      expect(buttons[1]).toHaveAttribute('aria-label', `Return to ${subMenuTrigger2.textContent}`);
+      expect(buttons[1]).toHaveAttribute('aria-label', 'Return to ');
       triggerTouch(buttons[1]);
       act(() => {jest.runAllTimers();});
 
@@ -893,7 +897,7 @@ describe('SubMenu', function () {
       expect(document.activeElement).toBe(subMenuTrigger2);
       buttons = within(tray).getAllByRole('button');
       expect(buttons).toHaveLength(3);
-      expect(buttons[1]).toHaveAttribute('aria-label', `Return to ${subMenuTrigger1.textContent}`);
+      expect(buttons[1]).toHaveAttribute('aria-label', 'Return to ');
       triggerTouch(buttons[1]);
       act(() => {jest.runAllTimers();});
 
@@ -983,7 +987,7 @@ describe('SubMenu', function () {
         expect(document.activeElement).toBe(menuItems[0]);
 
         await user.tab({shift: true});
-        expect(document.activeElement).toHaveAttribute('aria-label', `Return to ${subMenuTrigger1.textContent}`);
+        expect(document.activeElement).toHaveAttribute('aria-label', 'Return to ');
         await user.keyboard('[Enter]');
         act(() => {jest.runAllTimers();});