From f807b76044e54871243e35a388b69f3d9d0e7561 Mon Sep 17 00:00:00 2001 From: "Keith J. Grant" Date: Mon, 12 Apr 2021 15:36:33 -0700 Subject: [PATCH] revert RoutedTabs to buttons pending PF fix --- awx/ui_next/src/components/RoutedTabs/RoutedTabs.jsx | 2 +- awx/ui_next/src/components/Schedule/Schedule.test.jsx | 4 ++-- .../Inventory/InventoryGroup/InventoryGroup.test.jsx | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/awx/ui_next/src/components/RoutedTabs/RoutedTabs.jsx b/awx/ui_next/src/components/RoutedTabs/RoutedTabs.jsx index 11744603aa..b29f0b9896 100644 --- a/awx/ui_next/src/components/RoutedTabs/RoutedTabs.jsx +++ b/awx/ui_next/src/components/RoutedTabs/RoutedTabs.jsx @@ -35,7 +35,7 @@ function RoutedTabs({ tabsArray }) { aria-label={typeof tab.name === 'string' ? tab.name : null} eventKey={tab.id} key={tab.id} - href={tab.link} + link={tab.link} title={{tab.name}} aria-controls="" /> diff --git a/awx/ui_next/src/components/Schedule/Schedule.test.jsx b/awx/ui_next/src/components/Schedule/Schedule.test.jsx index 6082df1a95..280c6af6bb 100644 --- a/awx/ui_next/src/components/Schedule/Schedule.test.jsx +++ b/awx/ui_next/src/components/Schedule/Schedule.test.jsx @@ -121,8 +121,8 @@ describe('', () => { }); test('expect all tabs to exist, including Back to Schedules', async () => { expect( - wrapper.find('a[href="/templates/job_template/1/schedules"]').length + wrapper.find('button[link="/templates/job_template/1/schedules"]').length ).toBe(1); - expect(wrapper.find('a[aria-label="Details"]').length).toBe(1); + expect(wrapper.find('button[aria-label="Details"]').length).toBe(1); }); }); diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroup/InventoryGroup.test.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroup/InventoryGroup.test.jsx index 670f651d85..6087abd9ac 100644 --- a/awx/ui_next/src/screens/Inventory/InventoryGroup/InventoryGroup.test.jsx +++ b/awx/ui_next/src/screens/Inventory/InventoryGroup/InventoryGroup.test.jsx @@ -65,11 +65,11 @@ describe('', () => { test('expect all tabs to exist, including Back to Groups', async () => { expect( - wrapper.find('a[href="/inventories/inventory/1/groups"]').length + wrapper.find('button[link="/inventories/inventory/1/groups"]').length ).toBe(1); - expect(wrapper.find('a[aria-label="Details"]').length).toBe(1); - expect(wrapper.find('a[aria-label="Related Groups"]').length).toBe(1); - expect(wrapper.find('a[aria-label="Hosts"]').length).toBe(1); + expect(wrapper.find('button[aria-label="Details"]').length).toBe(1); + expect(wrapper.find('button[aria-label="Related Groups"]').length).toBe(1); + expect(wrapper.find('button[aria-label="Hosts"]').length).toBe(1); }); test('should show content error when user attempts to navigate to erroneous route', async () => {