fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PMC-761

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2019-05-03 12:07:11 -04:00
parent 1b77bd12b9
commit 22383ec53b
3 changed files with 57 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -41,3 +41,4 @@ node_modules
test_shared/
**/cache/
storage/
phpunit.xml

25
phpunit.xml
View File

@@ -33,6 +33,19 @@
</filter>
<php>
<!--Connection to database-->
<env name="DB_HOST" value="127.0.0.1" />
<env name="DB_DATABASE" value="test" />
<env name="DB_USERNAME" value="root" />
<env name="DB_PASSWORD" value="password" />
<!--Connection to database SQLServer-->
<env name="RUN_MSSQL_TESTS" value="false" />
<env name="MSSQL_HOST" value="172.16.3.1" />
<env name="MSSQL_PORT" value="1433" />
<env name="MSSQL_DATABASE" value="testexternal" />
<env name="MSSQL_USERNAME" value="test" />
<env name="MSSQL_PASSWORD" value="test" />
<!--Php variables-->
<var name="APP_ENV" value="testing" />
<var name="SYS_SYS" value="test" />
<var name="SYS_LANG" value="en" />
@@ -47,17 +60,5 @@
<var name="APP_HOST" value="processmaker3.local" />
<var name="HTTPS" value="off" />
<var name="SERVER_PORT" value="8080" />
<env name="DB_DATABASE" value="test" />
<env name="DB_USERNAME" value="root" />
<env name="DB_PASSWORD" value="" />
<env name="RUN_MSSQL_TESTS" value="true" />
<env name="MSSQL_HOST" value="172.16.3.1" />
<env name="MSSQL_PORT" value="1433" />
<env name="MSSQL_DATABASE" value="testexternal" />
<env name="MSSQL_USERNAME" value="test" />
<env name="MSSQL_PASSWORD" value="test" />
</php>
</phpunit>

9
tests/bootstrap.php
View File

@@ -1,4 +1,5 @@
<?php
/**
* Test harness bootstrap that sets up initial defines and builds up the initial database schema
*/
@@ -20,6 +21,7 @@ define('PATH_DB', 'shared/sites/');
define('PATH_DATA', 'shared/rbac/');
define('PATH_SEP', '/');
define('PATH_METHODS', 'workflow/engine/methods/');
define('SYS_LANG', 'en');
// Setup basic app services
$app = require __DIR__ . '/../bootstrap/app.php';
@@ -29,9 +31,9 @@ $app->make(Kernel::class)->bootstrap();
config(['database.connections.testexternal' => [
'driver' => 'mysql',
'host' => env('DB_HOST', '127.0.0.1'),
'database' => env('DB_TESTEXTERNAL_DB', 'testexternal'),
'database' => env('DB_DATABASE', 'testexternal'),
'username' => env('DB_USERNAME', 'root'),
'password' => env('DB_PASSWORD', ''),
'password' => env('DB_PASSWORD', 'password'),
'unix_socket' => env('DB_SOCKET', ''),
'charset' => 'utf8mb4',
'collation' => 'utf8mb4_unicode_ci',
@@ -58,7 +60,7 @@ if(env('RUN_MSSQL_TESTS')) {
'host' => env('MSSQL_HOST', '127.0.0.1'),
'database' => env('MSSQL_DATABASE', 'testexternal'),
'username' => env('MSSQL_USERNAME', 'root'),
'password' => env('MSSQL_PASSWORD', ''),
'password' => env('MSSQL_PASSWORD', 'password'),
]]);
Schema::connection('mssql')->dropIfExists('test');
@@ -73,7 +75,6 @@ if(env('RUN_MSSQL_TESTS')) {
// THIS IS FOR STANDARD PROCESSMAKER TABLES
// Now, drop all test tables and repopulate with schema
DB::unprepared('SET FOREIGN_KEY_CHECKS = 0');
$colname = 'Tables_in_' . env('DB_DATABASE');