Update DB test namespaces

Author: MGatner

system/Test/CIDatabaseTestCase.php

@@ -67,9 +67,8 @@ class CIDatabaseTestCase extends CIUnitTestCase
 	protected $seed = '';
 
 	/**
-	 * The path to where we can find the migrations
-	 * and seeds directories. Allows overriding
-	 * the default application directories.
+	 * The path to where we can find the seeds directory.
+	 * Allows overriding the default application directories.
 	 *
 	 * @var string
 	 */

tests/_support/Config/MockServices.php

@@ -7,7 +7,9 @@ class MockServices extends BaseService
 {
 
 	public $psr4     = [
-		'Tests/Support' => TESTPATH . '_support/',
+		'Tests/Support'                         => TESTPATH . '_support/',
+		'Tests/Support/DatabaseTestMigrations'  => TESTPATH . '_support/DatabaseTestMigrations',
+		'Tests/Support/MigrationTestMigrations' => TESTPATH . '_support/MigrationTestMigrations',
 	];
 	public $classmap = [];
 

tests/system/Database/Migrations/MigrationRunnerTest.php

@@ -176,17 +176,22 @@ public function testFindMigrationsSuccessTimestamp()
 		$runner = $runner->setNamespace('Tests\Support\MigrationTestMigrations');
 
 		$mig1 = (object)[
-							'name'    => 'Some_migration',
-							'path'    => TESTPATH . '_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php',
-							'version' => '2018-01-24-102301',
-							'class'   => 'Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_some_migration',
+							'name'      => 'Some_migration',
+							'path'      => TESTPATH . '_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php',
+							'version'   => '2018-01-24-102301',
+							'class'     => 'Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_some_migration',
+							'namespace' => 'Tests\Support\MigrationTestMigrations',
 						];
+		$mig1->uid = $runner->getObjectUid($mig1);
+
 		$mig2 = (object)[
-							'name'    => 'Another_migration',
-							'path'    => TESTPATH . '_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php',
-							'version' => '2018-01-24-102302',
-							'class'   => 'Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_another_migration',
+							'name'      => 'Another_migration',
+							'path'      => TESTPATH . '_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php',
+							'version'   => '2018-01-24-102302',
+							'class'     => 'Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_another_migration',
+							'namespace' => 'Tests\Support\MigrationTestMigrations',
 						];
+		$mig1->uid = $runner->getObjectUid($mig1);
 
 		$migrations = $runner->findMigrations();
 
@@ -217,7 +222,7 @@ public function testMigrationThrowsDisabledException()
 		$this->expectException(ConfigException::class);
 		$this->expectExceptionMessage('Migrations have been loaded but are disabled or setup incorrectly.');
 
-		$runner->version(1);
+		$runner->progress();
 	}
 
 	public function testVersionReturnsUpDownSuccess()
@@ -235,7 +240,7 @@ public function testVersionReturnsUpDownSuccess()
 		$runner->progress();
 		$version = $runner->getBatchEnd($runner->getLastBatch());
 
-		$this->assertEquals('2018-01-24-102301', $version);
+		$this->assertEquals('2018-01-24-102302', $version);
 		$this->seeInDatabase('foo', ['key' => 'foobar']);
 
 		$runner->version(0);

user_guide_src/source/testing/database.rst

@@ -94,10 +94,15 @@ test data prior to every test running.
 
 **$basePath**
 
-By default, CodeIgniter will look in **tests/_support/database/migrations** and **tests/_support_database/seeds**
-to locate the migrations and seeds that it should run during testing. You can change this directory by specifying
-the path in the ``$basePath`` property. This should not include the **migrations** or **seeds** directories, but
-the path to the single directory that holds both of those sub-directories.
+By default, CodeIgniter will look in **tests/_support/Database/Seeds** to locate the seeds that it should run during testing.
+You can change this directores by specifying the ``$basePath`` property. This should not include the **seeds** directory,
+but the path to the single directory that holds the sub-directory.
+
+**$namespace**
+
+By default, CodeIgniter will look in **tests/_support/DatabaseTestMigrations/Database/Migrations** to locate the migrations
+that it should run during testing. You can change this location by specifying a new namespace in the ``$namespace`` properties.
+This should not include the **Database/Migrations** path, just the base namespace.
 
 Helper Methods
 ==============