diff --git a/.travis.yml b/.travis.yml index ca0c0eb5..07b704c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,4 +18,4 @@ before_script: script: - php artisan database:create --reset - - vendor/bin/phpunit --debug --verbose --testdox tests + - vendor/bin/phpunit --debug --verbose diff --git a/composer.lock b/composer.lock index a44bfc0f..c4214f03 100644 --- a/composer.lock +++ b/composer.lock @@ -1027,7 +1027,7 @@ "laravel", "templates" ], - "time": "2017-05-20 10:43:37" + "time": "2017-05-20T10:43:37+00:00" }, { "name": "infyomlabs/laravel-generator", @@ -1082,7 +1082,7 @@ "test", "view" ], - "time": "2016-08-18 14:19:50" + "time": "2016-08-18T14:19:50+00:00" }, { "name": "infyomlabs/swagger-generator", @@ -1119,7 +1119,7 @@ "swagger", "templates" ], - "time": "2016-02-14 10:41:03" + "time": "2016-02-14T10:41:03+00:00" }, { "name": "jeremeamia/SuperClosure", @@ -1222,7 +1222,7 @@ "laravel", "swagger" ], - "time": "2016-01-25 15:38:17" + "time": "2016-01-25T15:38:17+00:00" }, { "name": "laracasts/flash", @@ -4527,7 +4527,7 @@ "permission", "roles" ], - "time": "2016-12-29 06:25:06" + "time": "2016-12-29T06:25:06+00:00" } ], "packages-dev": [ diff --git a/phpunit.xml b/phpunit.xml index 87d3edc4..df99ef11 100755 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,9 +1,9 @@ @@ -18,14 +18,14 @@ - + diff --git a/phpvms.iml b/phpvms.iml index 2f8fcdf1..68160d53 100644 --- a/phpvms.iml +++ b/phpvms.iml @@ -13,6 +13,7 @@ + @@ -32,5 +33,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/PIREPTest.php b/tests/PIREPTest.php index 4925e254..22f433eb 100644 --- a/tests/PIREPTest.php +++ b/tests/PIREPTest.php @@ -56,7 +56,6 @@ class PIREPTest extends TestCase } /** - * @outputBuffering disabled */ public function testAddPirep() { @@ -91,8 +90,6 @@ class PIREPTest extends TestCase /** * check the stats/ranks, etc have incremented properly - * @covers \App\Services\PilotService - * @covers \App\Services\PIREPService */ public function testPilotStatsIncr() { diff --git a/tests/TestCase.php b/tests/TestCase.php index 987701bb..ab9125d4 100755 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -20,7 +20,7 @@ abstract class TestCase extends Illuminate\Foundation\Testing\TestCase } protected function reset_db() { -// exec('make -f '.__DIR__.'/../Makefile unittest-db'); + exec('make -f '.__DIR__.'/../Makefile unittest-db'); } public function setUp() { @@ -28,9 +28,6 @@ abstract class TestCase extends Illuminate\Foundation\Testing\TestCase $this->reset_db(); Mail::fake(); - - #Artisan::call('migrate'); - #Artisan::call('db:seed'); } /**