Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2970 from crynobone/patch/phpunit 

[Fixes] Move PHPUnit to require-dev and fixes directory references to tests.
This commit is contained in:
Taylor Otwell 2014-08-20 09:21:47 -05:00
parent cadc592ee2 e084583077
commit 695ee0193d
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
composer.json
View File

@ -4,7 +4,9 @@
"keywords": ["framework", "laravel"], "keywords": ["framework", "laravel"],
"license": "MIT", "license": "MIT",
"require": { "require": {
"laravel/framework": "4.3.*", "laravel/framework": "4.3.*"
},
"require-dev": {
"phpunit/phpunit": "~4.0" "phpunit/phpunit": "~4.0"
}, },
"autoload": { "autoload": {

2
phpunit.xml
View File

@ -12,7 +12,7 @@
> >
<testsuites> <testsuites>
<testsuite name="Application Test Suite"> <testsuite name="Application Test Suite">
<directory>./app/tests/</directory> <directory>./tests/</directory>
</testsuite> </testsuite>
</testsuites> </testsuites>
</phpunit> </phpunit>

2
tests/TestCase.php
View File

@ -13,7 +13,7 @@ public function createApplication()
$testEnvironment = 'testing'; $testEnvironment = 'testing';
return require __DIR__.'/../../bootstrap/start.php'; return require __DIR__.'/../bootstrap/start.php';
} }
} }