diff --git a/Makefile b/Makefile
index b101e993..a451dbcb 100644
--- a/Makefile
+++ b/Makefile
@@ -43,13 +43,15 @@ unittest-db:
sqlite3 database/unittest.sqlite ""
php artisan migrate:refresh --env unittest
+.PHONY: tests
tests: test
.PHONY: test
test:
- echo "" > storage/logs/laravel.log
- -vendor/bin/phpunit --testdox tests
- cat storage/logs/laravel.log
+ @echo "" > storage/logs/laravel.log
+ @chmod 0777 storage/logs/*
+ @vendor/bin/phpunit --testdox tests
+ @cat storage/logs/laravel.log
.PHONY: schema
schema:
diff --git a/config/app.php b/config/app.php
index 71e57255..cd0c45b8 100755
--- a/config/app.php
+++ b/config/app.php
@@ -6,7 +6,7 @@ return [
'env' => env('APP_ENV', 'dev'),
'debug' => env('APP_DEBUG', true),
'url' => env('APP_URL', 'http://localhost'),
- 'version' => '2.0',
+ 'version' => '4.0',
'timezone' => env('APP_TIMEZONE', 'UTC'),
'locale' => env('APP_LOCALE', 'en'),
diff --git a/phpunit.xml b/phpunit.xml
index b6e88fef..01271e96 100755
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -2,7 +2,7 @@
+
+
diff --git a/tests/AircraftTest.php b/tests/AircraftTest.php
index 2275d7ba..598a9574 100644
--- a/tests/AircraftTest.php
+++ b/tests/AircraftTest.php
@@ -9,7 +9,7 @@ class AircraftTest extends TestCase
public function setUp()
{
parent::setUp();
- $this->addData('aircraft_test');
+ $this->addData('aircraft');
}
protected function getAircraftClass()
@@ -44,7 +44,7 @@ class AircraftTest extends TestCase
return $this->findByICAO($this->ICAO);
}
- public function testAircraftFaresNoOverride()
+ public function XtestAircraftFaresNoOverride()
{
$this->markTestIncomplete(
'This test has not been implemented yet.'
@@ -82,7 +82,7 @@ class AircraftTest extends TestCase
$this->assertCount(0, $fare_svc->getForAircraft($aircraft));
}
- public function testAircraftFaresOverride()
+ public function XtestAircraftFaresOverride()
{
$this->markTestSkipped(
'This test has not been implemented yet.'
@@ -125,7 +125,7 @@ class AircraftTest extends TestCase
/**
* @expectedException Exception
*/
- public function testAircraftMissingField()
+ public function XtestAircraftMissingField()
{
$this->markTestSkipped(
'This test has not been implemented yet.'
diff --git a/tests/FlightTest.php b/tests/FlightTest.php
index 09f39a9e..a4c026ec 100644
--- a/tests/FlightTest.php
+++ b/tests/FlightTest.php
@@ -24,7 +24,7 @@ class FlightTest extends TestCase
/**
* mainly to test the model relationships work correctly
*/
- public function testAddFlight()
+ public function XtestAddFlight()
{
$this->markTestSkipped(
'This test has not been implemented yet.'
diff --git a/tests/PIREPTest.php b/tests/PIREPTest.php
index 8b72084a..8f69ed6b 100644
--- a/tests/PIREPTest.php
+++ b/tests/PIREPTest.php
@@ -4,11 +4,11 @@ use App\Models\Pirep;
use Illuminate\Foundation\Testing\WithoutMiddleware;
use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
class PIREPTest extends TestCase
{
use WithoutMiddleware;
+ #use DatabaseMigrations;
protected $pirepSvc;
protected $SAMPLE_PIREP
diff --git a/tests/TestCase.php b/tests/TestCase.php
index fe7e1bc1..a9ac5efa 100755
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -17,7 +17,7 @@ abstract class TestCase extends Illuminate\Foundation\Testing\TestCase
parent::__construct($name, $data, $dataName);
}
- protected function reset_db(){
+ protected function reset_db() {
exec('make -f ' . __DIR__ . '/../Makefile unittest-db');
}