Cleanup tests (laravel#39876)

dietercoopman · Dec 2, 2021 · 4c9dfc1 · 4c9dfc1
1 parent f4f8e32
commit 4c9dfc1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/...on/Database/EloquentRelationshipsTest.php → ...ase/DatabaseEloquentRelationshipsTest.php b/...on/Database/EloquentRelationshipsTest.php → ...ase/DatabaseEloquentRelationshipsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Illuminate\Tests\Integration\Database\EloquentRelationshipsTest;
+namespace Illuminate\Tests\Database\EloquentRelationshipsTest;
 
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
@@ -14,9 +14,9 @@
 use Illuminate\Database\Eloquent\Relations\MorphOne;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
-use Orchestra\Testbench\TestCase;
+use PHPUnit\Framework\TestCase;
 
-class EloquentRelationshipsTest extends TestCase
+class DatabaseEloquentRelationshipsTest extends TestCase
 {
     public function testStandardRelationships()
     {

diff --git a/...ion/Database/EloquentStrictMorphsTest.php → ...base/DatabaseEloquentStrictMorphsTest.php b/...ion/Database/EloquentStrictMorphsTest.php → ...base/DatabaseEloquentStrictMorphsTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Illuminate\Tests\Integration\Database;
+namespace Illuminate\Tests\Database;
 
 use Illuminate\Database\ClassMorphViolationException;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\Relation;
-use Orchestra\Testbench\TestCase;
+use PHPUnit\Framework\TestCase;
 
-class EloquentStrictMorphsTest extends TestCase
+class DatabaseEloquentStrictMorphsTest extends TestCase
 {
     protected function setUp(): void
     {

diff --git a/...Database/EloquentModelConnectionsTest.php → ...e/Sqlite/EloquentModelConnectionsTest.php b/...Database/EloquentModelConnectionsTest.php → ...e/Sqlite/EloquentModelConnectionsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Illuminate\Tests\Integration\Database;
+namespace Illuminate\Tests\Integration\Database\Sqlite;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Schema\Blueprint;
@@ -12,6 +12,10 @@ class EloquentModelConnectionsTest extends TestCase
 {
     protected function getEnvironmentSetUp($app)
     {
+        if (getenv('DB_CONNECTION') !== 'testing') {
+            $this->markTestSkipped('Test requires a Sqlite connection.');
+        }
+
         $app['config']->set('database.default', 'conn1');
 
         $app['config']->set('database.connections.conn1', [