From 6cec08fac4b797d1d2f2e2c18a90bcfb99208ac1 Mon Sep 17 00:00:00 2001 From: Master Yoda Date: Mon, 12 Nov 2018 23:39:46 -0800 Subject: [PATCH 1/2] Yet another time test to fix --- tests/system/Helpers/DateHelperTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system/Helpers/DateHelperTest.php b/tests/system/Helpers/DateHelperTest.php index fe86a49928a6..5a90e5809c5a 100644 --- a/tests/system/Helpers/DateHelperTest.php +++ b/tests/system/Helpers/DateHelperTest.php @@ -20,7 +20,7 @@ public function setUp() public function testNowDefault() { $time = new \DateTime(); - $this->assertLessThan(1, abs(now() - time())); // close enough + $this->assertCloseEnough(abs(now(), time())); // close enough } //-------------------------------------------------------------------- @@ -28,7 +28,7 @@ public function testNowDefault() public function testNowSpecific() { // Chicago should be two hours ahead of Vancouver - $this->assertEquals(7200, now('America/Chicago') - now('America/Vancouver')); + $this->assertCloseEnough(7200, now('America/Chicago') - now('America/Vancouver')); } } From 2dc6e1886153af4de30a5681a2afac493502fb53 Mon Sep 17 00:00:00 2001 From: Master Yoda Date: Tue, 13 Nov 2018 00:14:23 -0800 Subject: [PATCH 2/2] Oops - fix DateHelperTest --- tests/system/Helpers/DateHelperTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/system/Helpers/DateHelperTest.php b/tests/system/Helpers/DateHelperTest.php index 5a90e5809c5a..d8cb7c88cdc7 100644 --- a/tests/system/Helpers/DateHelperTest.php +++ b/tests/system/Helpers/DateHelperTest.php @@ -20,7 +20,7 @@ public function setUp() public function testNowDefault() { $time = new \DateTime(); - $this->assertCloseEnough(abs(now(), time())); // close enough + $this->assertCloseEnough(now(), time()); // close enough } //--------------------------------------------------------------------