diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index 5b6876689..42437c99b 100644 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -2,8 +2,12 @@ ini_set('memory_limit', '2048M'); -include_once 'vendor/autoload.php'; -include_once '../../vendor/autoload.php'; +if (file_exists('vendor/autoload.php')) { + include_once 'vendor/autoload.php'; +} elseif (file_exists('../../vendor/autoload.php')) { + include_once '../../vendor/autoload.php'; +} + require_once __DIR__ . '/../Autoloader.php'; use phpOMS\DataStorage\Session\HttpSession; @@ -19,7 +23,7 @@ $CONFIG = [ 'host' => '127.0.0.1', /* db host address */ 'port' => '3306', /* db host port */ 'login' => 'root', /* db login name */ - 'password' => '', /* db login password */ + 'password' => '123456', /* db login password */ 'database' => 'oms', /* db name */ 'prefix' => 'oms_', /* db table prefix */ 'weight' => 1000, /* db table prefix */ @@ -29,7 +33,7 @@ $CONFIG = [ 'host' => '127.0.0.1', /* db host address */ 'port' => '3306', /* db host port */ 'login' => 'root', /* db login name */ - 'password' => '', /* db login password */ + 'password' => '123456', /* db login password */ 'database' => 'oms', /* db name */ 'prefix' => 'oms_', /* db table prefix */ 'weight' => 1000, /* db table prefix */ @@ -39,7 +43,7 @@ $CONFIG = [ 'host' => '127.0.0.1', /* db host address */ 'port' => '3306', /* db host port */ 'login' => 'root', /* db login name */ - 'password' => '', /* db login password */ + 'password' => '123456', /* db login password */ 'database' => 'oms', /* db name */ 'prefix' => 'oms_', /* db table prefix */ 'weight' => 1000, /* db table prefix */ @@ -49,7 +53,7 @@ $CONFIG = [ 'host' => '127.0.0.1', /* db host address */ 'port' => '3306', /* db host port */ 'login' => 'root', /* db login name */ - 'password' => '', /* db login password */ + 'password' => '123456', /* db login password */ 'database' => 'oms', /* db name */ 'prefix' => 'oms_', /* db table prefix */ 'weight' => 1000, /* db table prefix */ @@ -59,7 +63,7 @@ $CONFIG = [ 'host' => '127.0.0.1', /* db host address */ 'port' => '3306', /* db host port */ 'login' => 'root', /* db login name */ - 'password' => '', /* db login password */ + 'password' => '123456', /* db login password */ 'database' => 'oms', /* db name */ 'prefix' => 'oms_', /* db table prefix */ 'weight' => 1000, /* db table prefix */ @@ -69,7 +73,7 @@ $CONFIG = [ 'host' => '127.0.0.1', /* db host address */ 'port' => '3306', /* db host port */ 'login' => 'root', /* db login name */ - 'password' => '', /* db login password */ + 'password' => '123456', /* db login password */ 'database' => 'oms', /* db name */ 'prefix' => 'oms_', /* db table prefix */ 'weight' => 1000, /* db table prefix */ diff --git a/tests/DataStorage/Session/HttpSessionTest.php b/tests/DataStorage/Session/HttpSessionTest.php index f18121296..95d60e730 100644 --- a/tests/DataStorage/Session/HttpSessionTest.php +++ b/tests/DataStorage/Session/HttpSessionTest.php @@ -21,7 +21,6 @@ class HttpSessionTest extends \PHPUnit\Framework\TestCase { $session = new HttpSession(); self::assertEquals(null, $session->get('key')); - self::assertGreaterThan(0, strlen($session->getSID())); self::assertFalse(HttpSession::isLocked()); }