chenx221/yii2-netdisk
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fixed paths in tests/bin/yii. Fixed typo in docs. (#76)

Browse Source
This commit is contained in:
Dmitry Kulikov 2016-07-27 09:05:48 +00:00 committed by Alexander Makarov
parent 67713f562d
commit c0ec50d6a5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -142,7 +142,7 @@ To execute acceptance tests do the following:
4. Download [Selenium Server](http://www.seleniumhq.org/download/) and launch it: 4. Download [Selenium Server](http://www.seleniumhq.org/download/) and launch it:
``` ```
java -jar java -jar ~/selenium-server-standalone-x.xx.x.jar java -jar ~/selenium-server-standalone-x.xx.x.jar
``` ```
5. (Optional) Create `yii2_basic_tests` database and update it by applying migrations if you have them. 5. (Optional) Create `yii2_basic_tests` database and update it by applying migrations if you have them.

8
tests/bin/yii
View File

@ -11,14 +11,14 @@
defined('YII_DEBUG') or define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') or define('YII_ENV', 'test'); defined('YII_ENV') or define('YII_ENV', 'test');
require(__DIR__ . '/vendor/autoload.php'); require(__DIR__ . '/../../vendor/autoload.php');
require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php'); require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
$config = yii\helpers\ArrayHelper::merge( $config = yii\helpers\ArrayHelper::merge(
require(__DIR__ . '/config/console.php'), require(__DIR__ . '/../../config/console.php'),
[ [
'components' => [ 'components' => [
'db' => require(__DIR__ . '/config/test_db.php') 'db' => require(__DIR__ . '/../../config/test_db.php')
] ]
] ]
); );