improved dockerized tests (yiisoft#15516)

- added ENV variable for using custom runtime folder - create assets directory before using asset-manager
josephmelnick · Jan 18, 2018 · 1bc17a3 · 1bc17a3
1 parent eaca9c4
commit 1bc17a3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -23,5 +23,10 @@
 
 Yii::setAlias('@yiiunit', __DIR__);
 
+if (getenv('TEST_RUNTIME_PATH')) {
+    Yii::setAlias('@yiiunit/runtime', getenv('TEST_RUNTIME_PATH'));
+    Yii::setAlias('@runtime', getenv('TEST_RUNTIME_PATH'));
+}
+
 require_once __DIR__ . '/compatibility.php';
 require_once __DIR__ . '/TestCase.php';
diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
@@ -12,6 +12,8 @@ services:
     # Tmpfs volume (experimental, asset tests may fail)
     #tmpfs:
     #  - /project/tests/runtime
+    environment:
+      - TEST_RUNTIME_PATH=/tmp/runtime
 
 networks:
   default:

diff --git a/tests/framework/grid/CheckboxColumnTest.php b/tests/framework/grid/CheckboxColumnTest.php
@@ -27,8 +27,8 @@ protected function setUp()
         $this->mockApplication();
         Yii::setAlias('@webroot', '@yiiunit/runtime');
         Yii::setAlias('@web', 'http://localhost/');
-        Yii::$app->assetManager->bundles['yii\web\JqueryAsset'] = false;
         FileHelper::createDirectory(Yii::getAlias('@webroot/assets'));
+        Yii::$app->assetManager->bundles['yii\web\JqueryAsset'] = false;
     }
 
     public function testInputName()