Attempt to get tests passing on travis

Author: Elliot Levin

tests/Tests/Integration/Fixtures/DmsFixture.php

@@ -8,6 +8,7 @@
 use Illuminate\Container\Container;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Database\Migrations\MigrationCreator;
+use Illuminate\Database\Migrations\Migrator;
 use Illuminate\Filesystem\Filesystem;
 
 /**
@@ -59,7 +60,6 @@ public function setUpBeforeClass(Application $app)
             unlink($migrationFile);
         }
 
-        $app['config']->set('database.default', 'testing-stub');
         $app['config']->set('database.default', 'testing-stub');
         $app['config']->set('database.connections.testing-stub', [
             'driver'   => 'sqlite',
@@ -73,6 +73,10 @@ public function setUpBeforeClass(Application $app)
             $migrationsPath
         );
 
+        app()->resolving(Migrator::class, function (Migrator $migrator) {
+            $migrator->path($this->migrationsPath());
+        });
+
         if (!@file_get_contents($this->dbStubFile())) {
             file_put_contents($this->dbStubFile(), '');
 
@@ -115,7 +119,7 @@ public function setUp(Application $app)
      */
     protected function migrationsPath()
     {
-        return base_path('migrations');
+        return __DIR__ . '/../temp/migrations';
     }
 
     /**

tests/Tests/Integration/Scaffold/ScaffoldTest.php

@@ -51,6 +51,9 @@ protected function assertDirectoriesEqual(string $expected, string $actual, bool
             return substr($file->getRealPath(), strlen(realpath($actual)));
         }, $actualFiles);
 
+        sort($expectedFiles, SORT_STRING);
+        sort($actualFiles, SORT_STRING);
+
         $this->assertEquals($expectedFiles, $actualFiles);
 
         foreach ($expectedFiles as $expectedFile) {