From 3056b6ef71df0cbd5d626a885376b0e0f6a4c94c Mon Sep 17 00:00:00 2001 From: Arona Jones Date: Mon, 25 Jan 2021 16:02:14 +0000 Subject: [PATCH] Fix audit time check in asset audit test --- assets/tests/test_assets.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/assets/tests/test_assets.py b/assets/tests/test_assets.py index 59031cf3..24246efb 100644 --- a/assets/tests/test_assets.py +++ b/assets/tests/test_assets.py @@ -300,14 +300,13 @@ class TestAssetAudit(AutoLoginTest): mdl.remove_all_required() mdl.description = "" mdl.submit() - # self.wait.until(EC.visibility_of_element_located((By.ID, 'modal'))) self.wait.until(animation_is_finished()) - # self.assertTrue(self.driver.find_element_by_id('modal').is_displayed()) self.assertIn("This field is required.", mdl.errors["Description"]) # Now do it properly new_desc = "A BIG hammer" mdl.description = new_desc mdl.submit() + submit_time = timezone.now() self.wait.until(EC.invisibility_of_element_located((By.ID, 'modal'))) self.assertFalse(self.driver.find_element_by_id('modal').is_displayed()) @@ -316,9 +315,7 @@ class TestAssetAudit(AutoLoginTest): self.assertEqual(audited.description, new_desc) # Make sure audit 'log' was filled out self.assertEqual(self.profile.initials, audited.last_audited_by.initials) - self.assertEqual(timezone.now().date(), audited.last_audited_at.date()) - self.assertEqual(timezone.now().hour, audited.last_audited_at.hour) - self.assertEqual(timezone.now().minute, audited.last_audited_at.minute) + self.assertEqual(submit_time.replace(microsecond=0), audited.last_audited_at.replace(microsecond=0)) # Check we've removed it from the 'needing audit' list self.assertNotIn(asset_id, self.page.assets)