From e7b69e16fb5245fb79e9c6cf310cdcfe157660a2 Mon Sep 17 00:00:00 2001 From: Donato Laynes Date: Wed, 16 Nov 2016 20:55:30 -0500 Subject: [PATCH 1/2] Fix migrations error --- .../{ => migrations}/2016_05_18_000000_teamwork_setup_tables.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/database/{ => migrations}/2016_05_18_000000_teamwork_setup_tables.php (100%) diff --git a/src/database/2016_05_18_000000_teamwork_setup_tables.php b/src/database/migrations/2016_05_18_000000_teamwork_setup_tables.php similarity index 100% rename from src/database/2016_05_18_000000_teamwork_setup_tables.php rename to src/database/migrations/2016_05_18_000000_teamwork_setup_tables.php From 7bb911da604c2f3fbc74bb28bb228335d9a6f1c4 Mon Sep 17 00:00:00 2001 From: Marcel Pociot Date: Thu, 17 Nov 2016 07:04:54 +0100 Subject: [PATCH 2/2] Fix test migration paths --- tests/TeamworkTeamInviteTraitTest.php | 2 +- tests/TeamworkTest.php | 2 +- tests/UsedByTeamsTraitTest.php | 2 +- tests/UserHasTeamsTraitTest.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/TeamworkTeamInviteTraitTest.php b/tests/TeamworkTeamInviteTraitTest.php index 82ee429..eb793c8 100644 --- a/tests/TeamworkTeamInviteTraitTest.php +++ b/tests/TeamworkTeamInviteTraitTest.php @@ -40,7 +40,7 @@ public function setUp() $this->artisan('migrate', [ '--database' => 'testing', - '--realpath' => realpath(__DIR__.'/../src/database'), + '--realpath' => realpath(__DIR__.'/../src/database/migrations'), ]); $this->user = new User(); diff --git a/tests/TeamworkTest.php b/tests/TeamworkTest.php index 56d41d8..2883132 100644 --- a/tests/TeamworkTest.php +++ b/tests/TeamworkTest.php @@ -36,7 +36,7 @@ public function setUp() $this->artisan('migrate', [ '--database' => 'testing', - '--realpath' => realpath(__DIR__.'/../src/database'), + '--realpath' => realpath(__DIR__.'/../src/database/migrations'), ]); $this->user = new User(); diff --git a/tests/UsedByTeamsTraitTest.php b/tests/UsedByTeamsTraitTest.php index ea45bba..f8d3c77 100644 --- a/tests/UsedByTeamsTraitTest.php +++ b/tests/UsedByTeamsTraitTest.php @@ -43,7 +43,7 @@ public function setUp() $this->artisan('migrate', [ '--database' => 'testing', - '--realpath' => realpath(__DIR__.'/../src/database'), + '--realpath' => realpath(__DIR__.'/../src/database/migrations'), ]); $this->user = new User(); diff --git a/tests/UserHasTeamsTraitTest.php b/tests/UserHasTeamsTraitTest.php index 1efdd11..a44f3d1 100644 --- a/tests/UserHasTeamsTraitTest.php +++ b/tests/UserHasTeamsTraitTest.php @@ -32,7 +32,7 @@ public function setUp() $this->artisan('migrate', [ '--database' => 'testing', - '--realpath' => realpath(__DIR__.'/../src/database'), + '--realpath' => realpath(__DIR__.'/../src/database/migrations'), ]); $this->user = new User();