Merge pull request #6460 from kenjis/fix-test-restore-locales

test: restore changed locale in Time tests
codeigniter4 · Aug 31, 2022 · 57385ea · 57385ea
2 parents 5b396db + 528eed7
commit 57385ea
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/tests/system/I18n/TimeDifferenceTest.php b/tests/system/I18n/TimeDifferenceTest.php
@@ -19,12 +19,23 @@
  */
 final class TimeDifferenceTest extends CIUnitTestCase
 {
+ private string $currentLocale;
+
  protected function setUp(): void
  {
  parent::setUp();
 
  helper('date');
- Locale::setDefault('America/Chicago');
+
+ $this->currentLocale = Locale::getDefault();
+ Locale::setDefault('en-US');
+ }
+
+ protected function tearDown(): void
+ {
+ parent::tearDown();
+
+ Locale::setDefault($this->currentLocale);
  }
 
  public function testDifferenceBasics()

diff --git a/tests/system/I18n/TimeTest.php b/tests/system/I18n/TimeTest.php
@@ -25,14 +25,25 @@
  */
 final class TimeTest extends CIUnitTestCase
 {
+ private string $currentLocale;
+
  protected function setUp(): void
  {
  parent::setUp();
 
  helper('date');
+
+ $this->currentLocale = Locale::getDefault();
  Locale::setDefault('en_US');
  }
 
+ protected function tearDown(): void
+ {
+ parent::tearDown();
+
+ Locale::setDefault($this->currentLocale);
+ }
+
  public function testNewTimeNow()
  {
  $formatter = new IntlDateFormatter(