Fixing a fragile Time test that keeps causing us to look like we're failing.

lonnieezell · lonnieezell · commit d05b49a6c444 · 2017-07-13T22:54:01.000-05:00
diff --git a/tests/system/I18n/TimeTest.php b/tests/system/I18n/TimeTest.php
@@ -185,9 +185,13 @@ public function testCreateFromTimeLocalized()
 
 	public function testCreateFromFormat()
 	{
+		$now = new \DateTime('now');
+
+		Time::setTestNow($now);
 		$time = Time::createFromFormat('F j, Y', 'January 15, 2017', 'America/Chicago');
 
-		$this->assertEquals(date('2017-01-15 H:i:s'), $time->toDateTimeString());
+		$this->assertEquals(date('2017-01-15 H:i:s', $now->getTimestamp()), $time->toDateTimeString());
+		Time::setTestNow();
 	}
 
 	public function testCreateFromFormatWithTimezoneString()

Original file line number	Diff line number	Diff line change
`@@ -185,9 +185,13 @@ public function testCreateFromTimeLocalized()`
`185`	`185`
`186`	`186`	`public function testCreateFromFormat()`
`187`	`187`	`{`
	`188`	`+ $now = new \DateTime('now');`
	`189`	`+`
	`190`	`+ Time::setTestNow($now);`
`188`	`191`	`$time = Time::createFromFormat('F j, Y', 'January 15, 2017', 'America/Chicago');`
`189`	`192`
`190`		`- $this->assertEquals(date('2017-01-15 H:i:s'), $time->toDateTimeString());`
	`193`	`+ $this->assertEquals(date('2017-01-15 H:i:s', $now->getTimestamp()), $time->toDateTimeString());`
	`194`	`+ Time::setTestNow();`
`191`	`195`	`}`
`192`	`196`
`193`	`197`	`public function testCreateFromFormatWithTimezoneString()`