Issue #62 Use a custom constant instead of YII_ENV_TEST during tests

codemix · Oct 8, 2016 · d0b40ce · d0b40ce
1 parent ad0bd31
commit d0b40ce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/UrlManager.php b/UrlManager.php
@@ -432,7 +432,7 @@ protected function redirectToLanguage($language)
         }
         Yii::trace("Redirecting to $url.", __METHOD__);
         Yii::$app->getResponse()->redirect($url);
-        if (YII_ENV_TEST) {
+        if (YII2_LOCALEURLS_TEST) {
             // Response::redirect($url) above will call `Url::to()` internally. So to really
             // test for the same final redirect URL here, we need to call Url::to(), too.
             throw new \yii\base\Exception(\yii\helpers\Url::to($url));

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -5,6 +5,7 @@
 
 define('YII_DEBUG', true);
 define('YII_ENV_TEST', true);
+define('YII2_LOCALEURLS_TEST', true);
 // require composer autoloader if available
 require(__DIR__ . '/../vendor/autoload.php');
 require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');