Commit 8077ea3f by Alexander Makarov

Silenced migrations output in rbac test in case there's no error

parent a86d2ad1
...@@ -3,6 +3,7 @@ namespace yiiunit\framework\rbac; ...@@ -3,6 +3,7 @@ namespace yiiunit\framework\rbac;
use Yii; use Yii;
use yii\console\Application; use yii\console\Application;
use yii\console\Controller;
use yii\console\controllers\MigrateController; use yii\console\controllers\MigrateController;
use yii\db\Connection; use yii\db\Connection;
use yii\rbac\DbManager; use yii\rbac\DbManager;
...@@ -20,7 +21,7 @@ abstract class DbManagerTestCase extends ManagerTestCase ...@@ -20,7 +21,7 @@ abstract class DbManagerTestCase extends ManagerTestCase
*/ */
protected static $db; protected static $db;
public static function getApplication() protected static function runConsoleAction($route, $params = [])
{ {
if (Yii::$app === null) { if (Yii::$app === null) {
new Application([ new Application([
...@@ -32,7 +33,15 @@ abstract class DbManagerTestCase extends ManagerTestCase ...@@ -32,7 +33,15 @@ abstract class DbManagerTestCase extends ManagerTestCase
], ],
]); ]);
} }
return Yii::$app;
ob_start();
$result = Yii::$app->runAction('migrate/up', ['migrationPath' => '@yii/rbac/migrations/', 'interactive' => false]);
echo "Result is ".$result;
if ($result !== Controller::EXIT_CODE_NORMAL) {
ob_end_flush();
} else {
ob_end_clean();
}
} }
public static function setUpBeforeClass() public static function setUpBeforeClass()
...@@ -46,12 +55,12 @@ abstract class DbManagerTestCase extends ManagerTestCase ...@@ -46,12 +55,12 @@ abstract class DbManagerTestCase extends ManagerTestCase
static::markTestSkipped('pdo and ' . $pdo_database . ' extension are required.'); static::markTestSkipped('pdo and ' . $pdo_database . ' extension are required.');
} }
static::getApplication()->runAction('migrate/up', ['migrationPath' => '@yii/rbac/migrations/', 'interactive' => false]); static::runConsoleAction('migrate/up', ['migrationPath' => '@yii/rbac/migrations/', 'interactive' => false]);
} }
public static function tearDownAfterClass() public static function tearDownAfterClass()
{ {
static::getApplication()->runAction('migrate/down', ['migrationPath' => '@yii/rbac/migrations/', 'interactive' => false]); static::runConsoleAction('migrate/down', ['migrationPath' => '@yii/rbac/migrations/', 'interactive' => false]);
if (static::$db) { if (static::$db) {
static::$db->close(); static::$db->close();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment