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

Solving conflicts updating with last changes in develop branch

Browse Source
This commit is contained in:
Julio Cesar Laura Avendaño
2020-12-03 20:19:49 +00:00
parent ebc8e61d8c 098acc57a2
commit bb935e1637
66 changed files with 3721 additions and 1224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
database/factories/ApplicationFactory.php
View File

@@ -5,21 +5,21 @@ use Faker\Generator as Faker;
$factory->define(\ProcessMaker\Model\Application::class, function(Faker $faker) {
$user = factory(\ProcessMaker\Model\User::class)->create();
$appNumber = $faker->unique()->numberBetween(1000);
//APP_TITLE field is used in 'MYSQL: MATCH() AGAINST()' function, string size should not be less than 3.
// APP_TITLE field is used in 'MYSQL: MATCH() AGAINST()' function, string size should not be less than 3.
$appTitle = $faker->lexify(str_repeat('?', rand(3, 5)) . ' ' . str_repeat('?', rand(3, 5)));
//APP_STATUS must start in TO_DO because all tests require this state.
return [
'APP_UID' => G::generateUniqueID(),
'APP_TITLE' => $appTitle,
'APP_DESCRIPTION' => $faker->text,
'APP_NUMBER' => $appNumber,
'APP_STATUS' => 'TO_DO',
'APP_STATUS_ID' => 2,
'PRO_UID' => function() {
return factory(\ProcessMaker\Model\Process::class)->create()->PRO_UID;
},
'APP_PROC_STATUS' => '',
'APP_PROC_CODE' => '',
'APP_PARALLEL' => 'N',
'APP_INIT_USER' => $user->USR_UID,
'APP_CUR_USER' => $user->USR_UID,
@@ -38,18 +38,22 @@ $factory->state(\ProcessMaker\Model\Application::class, 'foreign_keys', function
$user = factory(\ProcessMaker\Model\User::class)->create();
$appNumber = $faker->unique()->numberBetween(1000);
//APP_TITLE field is used in 'MYSQL: MATCH() AGAINST()' function, string size should not be less than 3.
// APP_TITLE field is used in 'MYSQL: MATCH() AGAINST()' function, string size should not be less than 3.
$appTitle = $faker->lexify(str_repeat('?', rand(3, 5)) . ' ' . str_repeat('?', rand(3, 5)));
//APP_STATUS must start in TO_DO because all tests require this state.
$statuses = ['DRAFT', 'TO_DO', 'COMPLETED', 'CANCELLED'];
$status = $faker->randomElement($statuses);
$statusId = array_search($status, $statuses) + 1;
return [
'APP_UID' => G::generateUniqueID(),
'APP_TITLE' => $appTitle,
'APP_NUMBER' => $appNumber,
'APP_STATUS' => 'TO_DO',
'APP_STATUS_ID' => 2,
'APP_STATUS' => $status,
'APP_STATUS_ID' => $statusId,
'PRO_UID' => $process->PRO_UID,
'APP_PROC_STATUS' => '',
'APP_PROC_CODE' => '',
'APP_PARALLEL' => 'N',
'APP_INIT_USER' => $user->USR_UID,
'APP_CUR_USER' => $user->USR_UID,