From b82d32c1eff44ef5d20ed39bdfa4963ddd909de8 Mon Sep 17 00:00:00 2001 From: Alexander Makarov <sam@rmcreative.ru> Date: Mon, 25 Aug 2014 02:00:49 +0400 Subject: [PATCH] Used a single database and a single CLI entry point for all test types. Added faker to basic app dev requirements. --- apps/advanced/tests/README.md | 12 ++---------- apps/advanced/tests/codeception/bin/yii | 32 ++++++++++++++++++++++++++++++++ apps/advanced/tests/codeception/bin/yii.bat | 20 ++++++++++++++++++++ apps/advanced/tests/codeception/bin/yii_acceptance | 32 -------------------------------- apps/advanced/tests/codeception/bin/yii_acceptance.bat | 20 -------------------- apps/advanced/tests/codeception/bin/yii_functional | 32 -------------------------------- apps/advanced/tests/codeception/bin/yii_functional.bat | 20 -------------------- apps/advanced/tests/codeception/bin/yii_unit | 32 -------------------------------- apps/advanced/tests/codeception/bin/yii_unit.bat | 20 -------------------- apps/advanced/tests/codeception/config/acceptance.php | 6 +----- apps/advanced/tests/codeception/config/config.php | 3 +++ apps/advanced/tests/codeception/config/functional.php | 6 +----- apps/advanced/tests/codeception/config/unit.php | 6 +----- apps/basic/composer.json | 3 ++- apps/basic/tests/README.md | 12 ++---------- apps/basic/tests/codeception/bin/yii | 29 +++++++++++++++++++++++++++++ apps/basic/tests/codeception/bin/yii.bat | 20 ++++++++++++++++++++ apps/basic/tests/codeception/bin/yii_acceptance | 34 ---------------------------------- apps/basic/tests/codeception/bin/yii_acceptance.bat | 20 -------------------- apps/basic/tests/codeception/bin/yii_functional | 34 ---------------------------------- apps/basic/tests/codeception/bin/yii_functional.bat | 20 -------------------- apps/basic/tests/codeception/bin/yii_unit | 34 ---------------------------------- apps/basic/tests/codeception/bin/yii_unit.bat | 20 -------------------- apps/basic/tests/codeception/config/acceptance.php | 6 +----- apps/basic/tests/codeception/config/config.php | 3 +++ apps/basic/tests/codeception/config/functional.php | 6 +----- apps/basic/tests/codeception/config/unit.php | 6 +----- tests/unit/data/travis/init-apps.sh | 8 ++------ 28 files changed, 121 insertions(+), 375 deletions(-) create mode 100644 apps/advanced/tests/codeception/bin/yii create mode 100644 apps/advanced/tests/codeception/bin/yii.bat delete mode 100644 apps/advanced/tests/codeception/bin/yii_acceptance delete mode 100644 apps/advanced/tests/codeception/bin/yii_acceptance.bat delete mode 100644 apps/advanced/tests/codeception/bin/yii_functional delete mode 100644 apps/advanced/tests/codeception/bin/yii_functional.bat delete mode 100644 apps/advanced/tests/codeception/bin/yii_unit delete mode 100644 apps/advanced/tests/codeception/bin/yii_unit.bat create mode 100644 apps/basic/tests/codeception/bin/yii create mode 100644 apps/basic/tests/codeception/bin/yii.bat delete mode 100644 apps/basic/tests/codeception/bin/yii_acceptance delete mode 100644 apps/basic/tests/codeception/bin/yii_acceptance.bat delete mode 100644 apps/basic/tests/codeception/bin/yii_functional delete mode 100644 apps/basic/tests/codeception/bin/yii_functional.bat delete mode 100644 apps/basic/tests/codeception/bin/yii_unit delete mode 100644 apps/basic/tests/codeception/bin/yii_unit.bat diff --git a/apps/advanced/tests/README.md b/apps/advanced/tests/README.md index 3f9a623..80bafd6 100644 --- a/apps/advanced/tests/README.md +++ b/apps/advanced/tests/README.md @@ -28,18 +28,10 @@ composer require --dev yiisoft/yii2-faker:* ``` -3. Create three databases that are used in tests: - -* `yii2_advanced_unit` - for unit tests; -* `yii2_advanced_functional` - for functional tests; -* `yii2_advanced_acceptance` - for acceptance tests. - -Then update databases by applying migrations: +3. Create `yii2_advanced_tests` database then update it by applying migrations: ``` -codeception/bin/yii_acceptance migrate -codeception/bin/yii_functional migrate -codeception/bin/yii_unit migrate +codeception/bin/yii migrate ``` 4. In order to be able to run acceptance tests you need to start a webserver. The simplest way is to use PHP built in diff --git a/apps/advanced/tests/codeception/bin/yii b/apps/advanced/tests/codeception/bin/yii new file mode 100644 index 0000000..5890b37 --- /dev/null +++ b/apps/advanced/tests/codeception/bin/yii @@ -0,0 +1,32 @@ +#!/usr/bin/env php +<?php +/** + * Yii console bootstrap file. + * + * @link http://www.yiiframework.com/ + * @copyright Copyright (c) 2008 Yii Software LLC + * @license http://www.yiiframework.com/license/ + */ + +require_once __DIR__ . '/_bootstrap.php'; + +$config = yii\helpers\ArrayHelper::merge( + require(YII_APP_BASE_PATH . '/common/config/main.php'), + require(YII_APP_BASE_PATH . '/common/config/main-local.php'), + require(YII_APP_BASE_PATH . '/console/config/main.php'), + require(YII_APP_BASE_PATH . '/console/config/main-local.php'), + require(dirname(__DIR__) . '/config/config.php'), + [ + 'controllerMap' => [ + 'fixture' => [ + 'class' => 'yii\faker\FixtureController', + 'fixtureDataPath' => dirname(__DIR__) . 'common/fixtures', + 'templatePath' => dirname(__DIR__) . 'common/templates' + ], + ], + ] +); + +$application = new yii\console\Application($config); +$exitCode = $application->run(); +exit($exitCode); diff --git a/apps/advanced/tests/codeception/bin/yii.bat b/apps/advanced/tests/codeception/bin/yii.bat new file mode 100644 index 0000000..3edcabe --- /dev/null +++ b/apps/advanced/tests/codeception/bin/yii.bat @@ -0,0 +1,20 @@ +@echo off + +rem ------------------------------------------------------------- +rem Yii command line bootstrap script for Windows. +rem +rem @author Qiang Xue <qiang.xue@gmail.com> +rem @link http://www.yiiframework.com/ +rem @copyright Copyright (c) 2008 Yii Software LLC +rem @license http://www.yiiframework.com/license/ +rem ------------------------------------------------------------- + +@setlocal + +set YII_PATH=%~dp0 + +if "%PHP_COMMAND%" == "" set PHP_COMMAND=php.exe + +"%PHP_COMMAND%" "%YII_PATH%yii_acceptance" %* + +@endlocal diff --git a/apps/advanced/tests/codeception/bin/yii_acceptance b/apps/advanced/tests/codeception/bin/yii_acceptance deleted file mode 100644 index 2daa01b..0000000 --- a/apps/advanced/tests/codeception/bin/yii_acceptance +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env php -<?php -/** - * Yii console bootstrap file. - * - * @link http://www.yiiframework.com/ - * @copyright Copyright (c) 2008 Yii Software LLC - * @license http://www.yiiframework.com/license/ - */ - -require_once __DIR__ . '/_bootstrap.php'; - -$config = yii\helpers\ArrayHelper::merge( - require(YII_APP_BASE_PATH . '/common/config/main.php'), - require(YII_APP_BASE_PATH . '/common/config/main-local.php'), - require(YII_APP_BASE_PATH . '/console/config/main.php'), - require(YII_APP_BASE_PATH . '/console/config/main-local.php'), - require(dirname(__DIR__) . '/config/acceptance.php'), - [ - 'controllerMap' => [ - 'fixture' => [ - 'class' => 'yii\faker\FixtureController', - 'fixtureDataPath' => dirname(__DIR__) . 'common/fixtures', - 'templatePath' => dirname(__DIR__) . 'common/templates' - ], - ], - ] -); - -$application = new yii\console\Application($config); -$exitCode = $application->run(); -exit($exitCode); diff --git a/apps/advanced/tests/codeception/bin/yii_acceptance.bat b/apps/advanced/tests/codeception/bin/yii_acceptance.bat deleted file mode 100644 index 3edcabe..0000000 --- a/apps/advanced/tests/codeception/bin/yii_acceptance.bat +++ /dev/null @@ -1,20 +0,0 @@ -@echo off - -rem ------------------------------------------------------------- -rem Yii command line bootstrap script for Windows. -rem -rem @author Qiang Xue <qiang.xue@gmail.com> -rem @link http://www.yiiframework.com/ -rem @copyright Copyright (c) 2008 Yii Software LLC -rem @license http://www.yiiframework.com/license/ -rem ------------------------------------------------------------- - -@setlocal - -set YII_PATH=%~dp0 - -if "%PHP_COMMAND%" == "" set PHP_COMMAND=php.exe - -"%PHP_COMMAND%" "%YII_PATH%yii_acceptance" %* - -@endlocal diff --git a/apps/advanced/tests/codeception/bin/yii_functional b/apps/advanced/tests/codeception/bin/yii_functional deleted file mode 100644 index 5f7213b..0000000 --- a/apps/advanced/tests/codeception/bin/yii_functional +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env php -<?php -/** - * Yii console bootstrap file. - * - * @link http://www.yiiframework.com/ - * @copyright Copyright (c) 2008 Yii Software LLC - * @license http://www.yiiframework.com/license/ - */ - -require_once __DIR__ . '/_bootstrap.php'; - -$config = yii\helpers\ArrayHelper::merge( - require(YII_APP_BASE_PATH . '/common/config/main.php'), - require(YII_APP_BASE_PATH . '/common/config/main-local.php'), - require(YII_APP_BASE_PATH . '/console/config/main.php'), - require(YII_APP_BASE_PATH . '/console/config/main-local.php'), - require(dirname(__DIR__) . '/config/functional.php'), - [ - 'controllerMap' => [ - 'fixture' => [ - 'class' => 'yii\faker\FixtureController', - 'fixtureDataPath' => dirname(__DIR__) . 'common/fixtures', - 'templatePath' => dirname(__DIR__) . 'common/templates' - ], - ], - ] -); - -$application = new yii\console\Application($config); -$exitCode = $application->run(); -exit($exitCode); diff --git a/apps/advanced/tests/codeception/bin/yii_functional.bat b/apps/advanced/tests/codeception/bin/yii_functional.bat deleted file mode 100644 index 2d04dcc..0000000 --- a/apps/advanced/tests/codeception/bin/yii_functional.bat +++ /dev/null @@ -1,20 +0,0 @@ -@echo off - -rem ------------------------------------------------------------- -rem Yii command line bootstrap script for Windows. -rem -rem @author Qiang Xue <qiang.xue@gmail.com> -rem @link http://www.yiiframework.com/ -rem @copyright Copyright (c) 2008 Yii Software LLC -rem @license http://www.yiiframework.com/license/ -rem ------------------------------------------------------------- - -@setlocal - -set YII_PATH=%~dp0 - -if "%PHP_COMMAND%" == "" set PHP_COMMAND=php.exe - -"%PHP_COMMAND%" "%YII_PATH%yii_functional" %* - -@endlocal diff --git a/apps/advanced/tests/codeception/bin/yii_unit b/apps/advanced/tests/codeception/bin/yii_unit deleted file mode 100644 index c084027..0000000 --- a/apps/advanced/tests/codeception/bin/yii_unit +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env php -<?php -/** - * Yii console bootstrap file. - * - * @link http://www.yiiframework.com/ - * @copyright Copyright (c) 2008 Yii Software LLC - * @license http://www.yiiframework.com/license/ - */ - -require_once __DIR__ . '/_bootstrap.php'; - -$config = yii\helpers\ArrayHelper::merge( - require(YII_APP_BASE_PATH . '/common/config/main.php'), - require(YII_APP_BASE_PATH . '/common/config/main-local.php'), - require(YII_APP_BASE_PATH . '/console/config/main.php'), - require(YII_APP_BASE_PATH . '/console/config/main-local.php'), - require(dirname(__DIR__) . '/config/unit.php'), - [ - 'controllerMap' => [ - 'fixture' => [ - 'class' => 'yii\faker\FixtureController', - 'fixtureDataPath' => dirname(__DIR__) . 'common/fixtures', - 'templatePath' => dirname(__DIR__) . 'common/templates' - ], - ], - ] -); - -$application = new yii\console\Application($config); -$exitCode = $application->run(); -exit($exitCode); diff --git a/apps/advanced/tests/codeception/bin/yii_unit.bat b/apps/advanced/tests/codeception/bin/yii_unit.bat deleted file mode 100644 index 6852bf0..0000000 --- a/apps/advanced/tests/codeception/bin/yii_unit.bat +++ /dev/null @@ -1,20 +0,0 @@ -@echo off - -rem ------------------------------------------------------------- -rem Yii command line bootstrap script for Windows. -rem -rem @author Qiang Xue <qiang.xue@gmail.com> -rem @link http://www.yiiframework.com/ -rem @copyright Copyright (c) 2008 Yii Software LLC -rem @license http://www.yiiframework.com/license/ -rem ------------------------------------------------------------- - -@setlocal - -set YII_PATH=%~dp0 - -if "%PHP_COMMAND%" == "" set PHP_COMMAND=php.exe - -"%PHP_COMMAND%" "%YII_PATH%yii_unit" %* - -@endlocal diff --git a/apps/advanced/tests/codeception/config/acceptance.php b/apps/advanced/tests/codeception/config/acceptance.php index 09f8200..9318da5 100644 --- a/apps/advanced/tests/codeception/config/acceptance.php +++ b/apps/advanced/tests/codeception/config/acceptance.php @@ -3,9 +3,5 @@ * Application configuration shared by all applications acceptance tests */ return [ - 'components' => [ - 'db' => [ - 'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_acceptance', - ], - ], + ]; \ No newline at end of file diff --git a/apps/advanced/tests/codeception/config/config.php b/apps/advanced/tests/codeception/config/config.php index b6df8d2..59e485a 100644 --- a/apps/advanced/tests/codeception/config/config.php +++ b/apps/advanced/tests/codeception/config/config.php @@ -4,6 +4,9 @@ */ return [ 'components' => [ + 'db' => [ + 'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_tests', + ], 'mailer' => [ 'useFileTransport' => true, ], diff --git a/apps/advanced/tests/codeception/config/functional.php b/apps/advanced/tests/codeception/config/functional.php index 290f5f6..1778b1c 100644 --- a/apps/advanced/tests/codeception/config/functional.php +++ b/apps/advanced/tests/codeception/config/functional.php @@ -3,9 +3,5 @@ * Application configuration shared by all applications functional tests */ return [ - 'components' => [ - 'db' => [ - 'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_acceptance', - ], - ], + ]; \ No newline at end of file diff --git a/apps/advanced/tests/codeception/config/unit.php b/apps/advanced/tests/codeception/config/unit.php index 26abe6b..6bd08d3 100644 --- a/apps/advanced/tests/codeception/config/unit.php +++ b/apps/advanced/tests/codeception/config/unit.php @@ -3,9 +3,5 @@ * Application configuration shared by all applications unit tests */ return [ - 'components' => [ - 'db' => [ - 'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_unit', - ], - ], + ]; \ No newline at end of file diff --git a/apps/basic/composer.json b/apps/basic/composer.json index 607accb..0966855 100644 --- a/apps/basic/composer.json +++ b/apps/basic/composer.json @@ -22,7 +22,8 @@ "require-dev": { "yiisoft/yii2-codeception": "*", "yiisoft/yii2-debug": "*", - "yiisoft/yii2-gii": "*" + "yiisoft/yii2-gii": "*", + "yiisoft/yii2-faker": "*" }, "scripts": { "post-create-project-cmd": [ diff --git a/apps/basic/tests/README.md b/apps/basic/tests/README.md index 34439f8..f14db26 100644 --- a/apps/basic/tests/README.md +++ b/apps/basic/tests/README.md @@ -27,18 +27,10 @@ line globally. composer require --dev yiisoft/yii2-faker:* ``` -3. Create three databases that are used in tests: - -* `yii2_basic_unit` - for unit tests; -* `yii2_basic_functional` - for functional tests; -* `yii2_basic_acceptance` - for acceptance tests. - -Then update databases by applying migrations: +3. Create `yii2_basic_tests` database and update it by applying migrations: ``` -codeception/bin/yii_acceptance migrate -codeception/bin/yii_functional migrate -codeception/bin/yii_unit migrate +codeception/bin/yii migrate ``` 4. Build the test suites: diff --git a/apps/basic/tests/codeception/bin/yii b/apps/basic/tests/codeception/bin/yii new file mode 100644 index 0000000..9046b48 --- /dev/null +++ b/apps/basic/tests/codeception/bin/yii @@ -0,0 +1,29 @@ +#!/usr/bin/env php +<?php +/** + * Yii console bootstrap file. + * + * @link http://www.yiiframework.com/ + * @copyright Copyright (c) 2008 Yii Software LLC + * @license http://www.yiiframework.com/license/ + */ + +require_once __DIR__ . '/_bootstrap.php'; + +$config = yii\helpers\ArrayHelper::merge( + require(YII_APP_BASE_PATH . '/config/console.php'), + require(__DIR__ . '/../config/config.php'), + [ + 'controllerMap' => [ + 'fixture' => [ + 'class' => 'yii\faker\FixtureController', + 'fixtureDataPath' => dirname(__DIR__) . 'fixtures', + 'templatePath' => dirname(__DIR__) . 'templates' + ], + ], + ] +); + +$application = new yii\console\Application($config); +$exitCode = $application->run(); +exit($exitCode); diff --git a/apps/basic/tests/codeception/bin/yii.bat b/apps/basic/tests/codeception/bin/yii.bat new file mode 100644 index 0000000..3edcabe --- /dev/null +++ b/apps/basic/tests/codeception/bin/yii.bat @@ -0,0 +1,20 @@ +@echo off + +rem ------------------------------------------------------------- +rem Yii command line bootstrap script for Windows. +rem +rem @author Qiang Xue <qiang.xue@gmail.com> +rem @link http://www.yiiframework.com/ +rem @copyright Copyright (c) 2008 Yii Software LLC +rem @license http://www.yiiframework.com/license/ +rem ------------------------------------------------------------- + +@setlocal + +set YII_PATH=%~dp0 + +if "%PHP_COMMAND%" == "" set PHP_COMMAND=php.exe + +"%PHP_COMMAND%" "%YII_PATH%yii_acceptance" %* + +@endlocal diff --git a/apps/basic/tests/codeception/bin/yii_acceptance b/apps/basic/tests/codeception/bin/yii_acceptance deleted file mode 100644 index 99ac417..0000000 --- a/apps/basic/tests/codeception/bin/yii_acceptance +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env php -<?php -/** - * Yii console bootstrap file. - * - * @link http://www.yiiframework.com/ - * @copyright Copyright (c) 2008 Yii Software LLC - * @license http://www.yiiframework.com/license/ - */ - -require_once __DIR__ . '/_bootstrap.php'; - -$config = yii\helpers\ArrayHelper::merge( - require(YII_APP_BASE_PATH . '/config/console.php'), - require(__DIR__ . '/../config/config.php'), - [ - 'controllerMap' => [ - 'fixture' => [ - 'class' => 'yii\faker\FixtureController', - 'fixtureDataPath' => dirname(__DIR__) . 'fixtures', - 'templatePath' => dirname(__DIR__) . 'templates' - ], - ], - 'components' => [ - 'db' => [ - 'dsn' => 'mysql:host=localhost;dbname=yii2_basic_acceptance', - ], - ], - ] -); - -$application = new yii\console\Application($config); -$exitCode = $application->run(); -exit($exitCode); diff --git a/apps/basic/tests/codeception/bin/yii_acceptance.bat b/apps/basic/tests/codeception/bin/yii_acceptance.bat deleted file mode 100644 index 3edcabe..0000000 --- a/apps/basic/tests/codeception/bin/yii_acceptance.bat +++ /dev/null @@ -1,20 +0,0 @@ -@echo off - -rem ------------------------------------------------------------- -rem Yii command line bootstrap script for Windows. -rem -rem @author Qiang Xue <qiang.xue@gmail.com> -rem @link http://www.yiiframework.com/ -rem @copyright Copyright (c) 2008 Yii Software LLC -rem @license http://www.yiiframework.com/license/ -rem ------------------------------------------------------------- - -@setlocal - -set YII_PATH=%~dp0 - -if "%PHP_COMMAND%" == "" set PHP_COMMAND=php.exe - -"%PHP_COMMAND%" "%YII_PATH%yii_acceptance" %* - -@endlocal diff --git a/apps/basic/tests/codeception/bin/yii_functional b/apps/basic/tests/codeception/bin/yii_functional deleted file mode 100644 index 39efa98..0000000 --- a/apps/basic/tests/codeception/bin/yii_functional +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env php -<?php -/** - * Yii console bootstrap file. - * - * @link http://www.yiiframework.com/ - * @copyright Copyright (c) 2008 Yii Software LLC - * @license http://www.yiiframework.com/license/ - */ - -require_once __DIR__ . '/_bootstrap.php'; - -$config = yii\helpers\ArrayHelper::merge( - require(YII_APP_BASE_PATH . '/config/console.php'), - require(__DIR__ . '/../config/config.php'), - [ - 'controllerMap' => [ - 'fixture' => [ - 'class' => 'yii\faker\FixtureController', - 'fixtureDataPath' => dirname(__DIR__) . 'fixtures', - 'templatePath' => dirname(__DIR__) . 'templates' - ], - ], - 'components' => [ - 'db' => [ - 'dsn' => 'mysql:host=localhost;dbname=yii2_basic_functional', - ], - ], - ] -); - -$application = new yii\console\Application($config); -$exitCode = $application->run(); -exit($exitCode); diff --git a/apps/basic/tests/codeception/bin/yii_functional.bat b/apps/basic/tests/codeception/bin/yii_functional.bat deleted file mode 100644 index 2d04dcc..0000000 --- a/apps/basic/tests/codeception/bin/yii_functional.bat +++ /dev/null @@ -1,20 +0,0 @@ -@echo off - -rem ------------------------------------------------------------- -rem Yii command line bootstrap script for Windows. -rem -rem @author Qiang Xue <qiang.xue@gmail.com> -rem @link http://www.yiiframework.com/ -rem @copyright Copyright (c) 2008 Yii Software LLC -rem @license http://www.yiiframework.com/license/ -rem ------------------------------------------------------------- - -@setlocal - -set YII_PATH=%~dp0 - -if "%PHP_COMMAND%" == "" set PHP_COMMAND=php.exe - -"%PHP_COMMAND%" "%YII_PATH%yii_functional" %* - -@endlocal diff --git a/apps/basic/tests/codeception/bin/yii_unit b/apps/basic/tests/codeception/bin/yii_unit deleted file mode 100644 index f99ec53..0000000 --- a/apps/basic/tests/codeception/bin/yii_unit +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env php -<?php -/** - * Yii console bootstrap file. - * - * @link http://www.yiiframework.com/ - * @copyright Copyright (c) 2008 Yii Software LLC - * @license http://www.yiiframework.com/license/ - */ - -require_once __DIR__ . '/_bootstrap.php'; - -$config = yii\helpers\ArrayHelper::merge( - require(YII_APP_BASE_PATH . '/config/console.php'), - require(__DIR__ . '/../config/config.php'), - [ - 'controllerMap' => [ - 'fixture' => [ - 'class' => 'yii\faker\FixtureController', - 'fixtureDataPath' => dirname(__DIR__) . 'fixtures', - 'templatePath' => dirname(__DIR__) . 'templates' - ], - ], - 'components' => [ - 'db' => [ - 'dsn' => 'mysql:host=localhost;dbname=yii2_basic_unit', - ], - ], - ] -); - -$application = new yii\console\Application($config); -$exitCode = $application->run(); -exit($exitCode); diff --git a/apps/basic/tests/codeception/bin/yii_unit.bat b/apps/basic/tests/codeception/bin/yii_unit.bat deleted file mode 100644 index 6852bf0..0000000 --- a/apps/basic/tests/codeception/bin/yii_unit.bat +++ /dev/null @@ -1,20 +0,0 @@ -@echo off - -rem ------------------------------------------------------------- -rem Yii command line bootstrap script for Windows. -rem -rem @author Qiang Xue <qiang.xue@gmail.com> -rem @link http://www.yiiframework.com/ -rem @copyright Copyright (c) 2008 Yii Software LLC -rem @license http://www.yiiframework.com/license/ -rem ------------------------------------------------------------- - -@setlocal - -set YII_PATH=%~dp0 - -if "%PHP_COMMAND%" == "" set PHP_COMMAND=php.exe - -"%PHP_COMMAND%" "%YII_PATH%yii_unit" %* - -@endlocal diff --git a/apps/basic/tests/codeception/config/acceptance.php b/apps/basic/tests/codeception/config/acceptance.php index c80d468..c688575 100644 --- a/apps/basic/tests/codeception/config/acceptance.php +++ b/apps/basic/tests/codeception/config/acceptance.php @@ -6,10 +6,6 @@ return yii\helpers\ArrayHelper::merge( require(__DIR__ . '/../../../config/web.php'), require(__DIR__ . '/config.php'), [ - 'components' => [ - 'db' => [ - 'dsn' => 'mysql:host=localhost;dbname=yii2_basic_acceptance', - ], - ], + ] ); diff --git a/apps/basic/tests/codeception/config/config.php b/apps/basic/tests/codeception/config/config.php index 005d365..bac901d 100644 --- a/apps/basic/tests/codeception/config/config.php +++ b/apps/basic/tests/codeception/config/config.php @@ -4,6 +4,9 @@ */ return [ 'components' => [ + 'db' => [ + 'dsn' => 'mysql:host=localhost;dbname=yii2_basic_tests', + ], 'mailer' => [ 'useFileTransport' => true, ], diff --git a/apps/basic/tests/codeception/config/functional.php b/apps/basic/tests/codeception/config/functional.php index 32cd7c8..499ad5a 100644 --- a/apps/basic/tests/codeception/config/functional.php +++ b/apps/basic/tests/codeception/config/functional.php @@ -9,10 +9,6 @@ return yii\helpers\ArrayHelper::merge( require(__DIR__ . '/../../../config/web.php'), require(__DIR__ . '/config.php'), [ - 'components' => [ - 'db' => [ - 'dsn' => 'mysql:host=localhost;dbname=yii2_basic_functional', - ], - ], + ] ); diff --git a/apps/basic/tests/codeception/config/unit.php b/apps/basic/tests/codeception/config/unit.php index 1b8772d..5bab5ea 100644 --- a/apps/basic/tests/codeception/config/unit.php +++ b/apps/basic/tests/codeception/config/unit.php @@ -6,10 +6,6 @@ return yii\helpers\ArrayHelper::merge( require(__DIR__ . '/../../../config/web.php'), require(__DIR__ . '/config.php'), [ - 'components' => [ - 'db' => [ - 'dsn' => 'mysql:host=localhost;dbname=yii2_basic_unit', - ], - ], + ] ); diff --git a/tests/unit/data/travis/init-apps.sh b/tests/unit/data/travis/init-apps.sh index d5980bc..2e775e9 100755 --- a/tests/unit/data/travis/init-apps.sh +++ b/tests/unit/data/travis/init-apps.sh @@ -4,12 +4,8 @@ if (php --version | grep -i HipHop > /dev/null); then echo "skipping application init on HHVM" else - mysql -e 'CREATE DATABASE yii2_advanced_acceptance;'; - mysql -e 'CREATE DATABASE yii2_advanced_functional;'; - mysql -e 'CREATE DATABASE yii2_advanced_unit;'; + mysql -e 'CREATE DATABASE yii2_advanced_tests;'; cd apps/advanced/tests/codeception/bin - php yii_acceptance migrate --interactive=0 - php yii_functional migrate --interactive=0 - php yii_unit migrate --interactive=0 + php yii migrate --interactive=0 cd ../../../../.. fi -- libgit2 0.27.1