Fix corrupted global state.

On my non en_US machine tests following this would fail as my default locale of en_CA was picked up.
cakephp · Aug 9, 2014 · 75207a0 · 75207a0
1 parent 22e551a
commit 75207a0
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/tests/TestCase/Routing/Filter/LocaleSelectorFilterTest.php b/tests/TestCase/Routing/Filter/LocaleSelectorFilterTest.php
@@ -25,14 +25,24 @@
  */
 class LocaleSelectorFilterTest extends TestCase {
 
+/**
+ * setup
+ *
+ * @return void
+ */
+	public function setUp() {
+		parent::setUp();
+		$this->locale = Locale::getDefault();
+	}
+
 /**
  * Resets the default locale
  *
  * @return void
  */
 	public function tearDown() {
 		parent::tearDown();
-		Locale::setDefault('');
+		Locale::setDefault($this->locale);
 	}
 
 /**
@@ -67,6 +77,7 @@ public function testSimpleSelection() {
  * @return void
  */
 	public function testWithWhitelist() {
+		Locale::setDefault('en_US');
 		$filter = new LocaleSelectorFilter([
 			'locales' => ['en_CA', 'en_IN', 'es_VE']
 		]);
@@ -77,8 +88,8 @@ public function testWithWhitelist() {
 		]);
 		$filter->beforeDispatch(new Event('name', null, ['request' => $request]));
 		$this->assertEquals('es_VE', Locale::getDefault());
-		Locale::setDefault('');
 
+		Locale::setDefault('en_US');
 		$request = new Request([
 			'environment' => [
 				'HTTP_ACCEPT_LANGUAGE' => 'en-GB;q=0.8,es-ES;q=0.9,da-DK;q=0.4'