diff --git a/awx/ui_next/src/screens/Inventory/InventoryDetail/InventoryDetail.test.jsx b/awx/ui_next/src/screens/Inventory/InventoryDetail/InventoryDetail.test.jsx index 05c9c57988..97e835d996 100644 --- a/awx/ui_next/src/screens/Inventory/InventoryDetail/InventoryDetail.test.jsx +++ b/awx/ui_next/src/screens/Inventory/InventoryDetail/InventoryDetail.test.jsx @@ -1,7 +1,8 @@ import React from 'react'; import { act } from 'react-dom/test-utils'; -import { mountWithContexts } from '@testUtils/enzymeHelpers'; +import { mountWithContexts, waitForElement } from '@testUtils/enzymeHelpers'; import { InventoriesAPI, CredentialTypesAPI } from '@api'; +import { sleep } from '@testUtils/testUtils'; import InventoryDetail from './InventoryDetail'; jest.mock('@api'); @@ -83,6 +84,7 @@ describe('', () => { ); }); + wrapper.update(); expectDetailToMatch(wrapper, 'Name', mockInventory.name); expectDetailToMatch(wrapper, 'Activity', 'Coming soon'); expectDetailToMatch(wrapper, 'Description', mockInventory.description); diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroupDetail/InventoryGroupDetail.test.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroupDetail/InventoryGroupDetail.test.jsx index 99a017ce32..54e660ccc2 100644 --- a/awx/ui_next/src/screens/Inventory/InventoryGroupDetail/InventoryGroupDetail.test.jsx +++ b/awx/ui_next/src/screens/Inventory/InventoryGroupDetail/InventoryGroupDetail.test.jsx @@ -80,7 +80,7 @@ describe('', () => { 'Bar' ); expect(wrapper.find('Detail[label="Created"]').length).toBe(1); - expect(wrapper.find('Detail[label="Modified"]').length).toBe(1); - expect(wrapper.find('VariablesInput').prop('value')).toBe('bizz: buzz'); + expect(wrapper.find('Detail[label="Last Modified"]').length).toBe(1); + expect(wrapper.find('VariablesDetail').prop('value')).toBe('bizz: buzz'); }); }); diff --git a/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.test.jsx b/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.test.jsx index ef62183a9f..d0eb66ca66 100644 --- a/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.test.jsx +++ b/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.test.jsx @@ -98,13 +98,15 @@ describe('', () => { `${mockProject.scm_update_cache_timeout} Seconds` ); assertDetail('Ansible Environment', mockProject.custom_virtualenv); - assertDetail( - 'Created', - `10/10/2019, 1:15:06 AM by ${mockProject.summary_fields.created_by.username}` + const dateDetails = wrapper.find('UserDateDetail'); + expect(dateDetails).toHaveLength(2); + expect(dateDetails.at(0).prop('label')).toEqual('Created'); + expect(dateDetails.at(0).prop('date')).toEqual( + '2019-10-10T01:15:06.780472Z' ); - assertDetail( - 'Last Modified', - `10/10/2019, 1:15:06 AM by ${mockProject.summary_fields.modified_by.username}` + expect(dateDetails.at(1).prop('label')).toEqual('Last Modified'); + expect(dateDetails.at(1).prop('date')).toEqual( + '2019-10-10T01:15:06.780490Z' ); expect( wrapper