Fix Testing
This commit is contained in:
parent
cbb9a2e8b7
commit
4a82708cbf
4 changed files with 22 additions and 26 deletions
|
@ -14,6 +14,8 @@ use PHPUnit\DbUnit\TestCaseTrait;
|
|||
use PHPUnit\Framework\TestCase;
|
||||
use PHPUnit_Extensions_Database_DB_IDatabaseConnection;
|
||||
|
||||
require_once __DIR__.'/../boot.php';
|
||||
|
||||
/**
|
||||
* Abstract class used by tests that need a database.
|
||||
*/
|
||||
|
@ -21,23 +23,6 @@ abstract class DatabaseTest extends TestCase
|
|||
{
|
||||
use TestCaseTrait;
|
||||
|
||||
/**
|
||||
* @var App The Friendica App
|
||||
*/
|
||||
protected $app;
|
||||
|
||||
protected function setUp()
|
||||
{
|
||||
require_once __DIR__.'/../boot.php';
|
||||
|
||||
// Reusable App object
|
||||
$this->app = BaseObject::getApp();
|
||||
|
||||
Config::set('system', 'url', 'http://localhost');
|
||||
Config::set('system', 'hostname', 'localhost');
|
||||
Config::set('system', 'worker_dont_fork', true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get database connection.
|
||||
*
|
||||
|
@ -55,6 +40,11 @@ abstract class DatabaseTest extends TestCase
|
|||
$this->markTestSkipped('Please set the MYSQL_* environment variables to your test database credentials.');
|
||||
}
|
||||
|
||||
DBA::connect(getenv('MYSQL_HOST'),
|
||||
getenv('MYSQL_USERNAME'),
|
||||
getenv('MYSQL_PASSWORD'),
|
||||
getenv('MYSQL_DATABASE'));
|
||||
|
||||
if (!DBA::connected()) {
|
||||
$this->markTestSkipped('Could not connect to the database.');
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue