arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-29 19:32:14 +00:00
Code Issues Projects Releases Wiki Activity

Fix audit time check in asset audit test

Browse Source
This commit is contained in:
FreneticScribbler
2021-01-25 16:02:14 +00:00
parent 548c960996
commit 3056b6ef71
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
assets/tests/test_assets.py
View File

@@ -300,14 +300,13 @@ class TestAssetAudit(AutoLoginTest):
mdl.remove_all_required() mdl.remove_all_required()
mdl.description = "" mdl.description = ""
mdl.submit() mdl.submit()
# self.wait.until(EC.visibility_of_element_located((By.ID, 'modal')))
self.wait.until(animation_is_finished()) 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"]) self.assertIn("This field is required.", mdl.errors["Description"])
# Now do it properly # Now do it properly
new_desc = "A BIG hammer" new_desc = "A BIG hammer"
mdl.description = new_desc mdl.description = new_desc
mdl.submit() mdl.submit()
submit_time = timezone.now()
self.wait.until(EC.invisibility_of_element_located((By.ID, 'modal'))) self.wait.until(EC.invisibility_of_element_located((By.ID, 'modal')))
self.assertFalse(self.driver.find_element_by_id('modal').is_displayed()) self.assertFalse(self.driver.find_element_by_id('modal').is_displayed())
@@ -316,9 +315,7 @@ class TestAssetAudit(AutoLoginTest):
self.assertEqual(audited.description, new_desc) self.assertEqual(audited.description, new_desc)
# Make sure audit 'log' was filled out # Make sure audit 'log' was filled out
self.assertEqual(self.profile.initials, audited.last_audited_by.initials) self.assertEqual(self.profile.initials, audited.last_audited_by.initials)
self.assertEqual(timezone.now().date(), audited.last_audited_at.date()) self.assertEqual(submit_time.replace(microsecond=0), audited.last_audited_at.replace(microsecond=0))
self.assertEqual(timezone.now().hour, audited.last_audited_at.hour)
self.assertEqual(timezone.now().minute, audited.last_audited_at.minute)
# Check we've removed it from the 'needing audit' list # Check we've removed it from the 'needing audit' list
self.assertNotIn(asset_id, self.page.assets) self.assertNotIn(asset_id, self.page.assets)