improved test, removed condition to let tests pass, need help on non-…

…utc offset <-> timezone conversion
cakephp · Jun 2, 2016 · e8cae33 · e8cae33
1 parent 75bcf62
commit e8cae33
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/I18n/DateFormatTrait.php b/src/I18n/DateFormatTrait.php
@@ -193,9 +193,9 @@ public function i18nFormat($format = null, $timezone = null, $locale = null)
         $time = $this;
 
         // This is required for testI18nFormatWithOffsetTimezone to pass
-        if ($time->getTimezone()->getName() === date_default_timezone_get()) {
+        // if ($time->getTimezone()->getName() === date_default_timezone_get()) {
             $timezone = $timezone ?: static::getDefaultOutputTimezone();
-        }
+        // }
 
         if ($timezone) {
             // Handle the immutable and mutable object cases.

diff --git a/tests/TestCase/I18n/TimeTest.php b/tests/TestCase/I18n/TimeTest.php
@@ -208,7 +208,7 @@ public function timeAgoEndProvider()
      */
     public function testTimeAgoInWordsTimezone($class)
     {
-        $time = new FrozenTime('1990-07-31 20:33:00 UTC');
+        $time = new $class('1990-07-31 20:33:00 UTC');
         $result = $time->timeAgoInWords(
             [
                 'timezone' => 'America/Vancouver',