ITT: Made Laravel 5.1 related fixes.

dmitry-ivanov · dmitry-ivanov · commit f29dd996c3bd · 2017-03-15T11:57:07.000+02:00
diff --git a/tests/TestingTools/TestCase.php b/tests/TestingTools/TestCase.php
@@ -34,7 +34,10 @@ protected function setUpDatabase()
 
         DB::statement('PRAGMA foreign_keys = ON');
 
-        $this->artisan('migrate', ['--database' => 'testing']);
+        $this->artisan('migrate', [
+            '--database' => 'testing',
+            '--realpath' => __DIR__ . '/fixture/database/migrations/',
+        ]);
         $this->seeArtisanOutput(__DIR__ . '/migrate.output.txt');
     }
 
diff --git a/tests/TestingTools/fixture/app/Providers/FixtureServiceProvider.php b/tests/TestingTools/fixture/app/Providers/FixtureServiceProvider.php
@@ -12,7 +12,9 @@ public function register()
 
     public function boot()
     {
-        $this->loadMigrationsFrom(__DIR__ . '/../../database/migrations/');
+        if (method_exists($this, 'loadMigrationsFrom')) {
+            $this->loadMigrationsFrom(__DIR__ . '/../../database/migrations/');
+        }
     }
 
     private function registerAliases()

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,10 @@ protected function setUpDatabase()`
`34`	`34`
`35`	`35`	`DB::statement('PRAGMA foreign_keys = ON');`
`36`	`36`
`37`		`- $this->artisan('migrate', ['--database' => 'testing']);`
	`37`	`+ $this->artisan('migrate', [`
	`38`	`+ '--database' => 'testing',`
	`39`	`+ '--realpath' => __DIR__ . '/fixture/database/migrations/',`
	`40`	`+ ]);`
`38`	`41`	`$this->seeArtisanOutput(__DIR__ . '/migrate.output.txt');`
`39`	`42`	`}`
`40`	`43`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,9 @@ public function register()`
`12`	`12`
`13`	`13`	`public function boot()`
`14`	`14`	`{`
`15`		`- $this->loadMigrationsFrom(__DIR__ . '/../../database/migrations/');`
	`15`	`+ if (method_exists($this, 'loadMigrationsFrom')) {`
	`16`	`+ $this->loadMigrationsFrom(__DIR__ . '/../../database/migrations/');`
	`17`	`+ }`
`16`	`18`	`}`
`17`	`19`
`18`	`20`	`private function registerAliases()`