diff --git a/.circleci/config.yml b/.circleci/config.yml
index 37afed28d..5bb423cc9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,7 +4,7 @@ jobs:
working_directory: ~/processmaker
docker:
- image: devopsstacks/pm:n285-phpunit
- - image: circleci/mysql:8.0.13-ram
+ - image: cimg/mysql:8.0
command: |
mysqld --default-authentication-plugin='mysql_native_password' --optimizer-switch='derived_merge=off' --sql-mode='NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' --collation-server='utf8mb4_unicode_ci' --character-set-server='utf8mb4' --max_connections=500
environment:
@@ -28,10 +28,12 @@ jobs:
name: Run Test Units
command: |
mkdir -p coverage
- vendor/phpunit/phpunit/phpunit --stop-on-error --testdox-html coverage/result.html --coverage-html coverage --verbose tests/unit/
+ vendor/bin/phpunit --stop-on-error --testdox-html coverage/result.html --coverage-html coverage --verbose tests/unit/
environment:
XDEBUG_MODE: coverage
- store_artifacts:
path: coverage
destination: coverage
+ - store_test_results:
+ path: coverage
\ No newline at end of file
diff --git a/composer.json b/composer.json
index d2507dcb6..31269cc51 100644
--- a/composer.json
+++ b/composer.json
@@ -96,7 +96,6 @@
"thirdparty/pear",
"thirdparty/phing",
"thirdparty/pake",
- "thirdparty/wizard",
"rbac/engine/classes/"
],
"files": [
diff --git a/config/app.php b/config/app.php
index 956946042..c74b539f3 100644
--- a/config/app.php
+++ b/config/app.php
@@ -9,7 +9,7 @@ return [
'url' => env('APP_URL', 'http://localhost'),
'env' => env('APP_ENV', 'production'),
'debug' => env('APP_DEBUG', false),
- 'cache_lifetime' => env('APP_CACHE_LIFETIME', 60),
+ 'cache_lifetime' => env('APP_CACHE_LIFETIME', 3600), //laravel 8.x the time parameter is in seconds.
'key' => env('APP_KEY', 'base64:rU28h/tElUn/eiLY0qC24jJq1rakvAFRoRl1DWxj/kM='),
'cipher' => 'AES-256-CBC',
'timezone' => 'UTC',
diff --git a/gulliver/system/class.dbMaintenance.php b/gulliver/system/class.dbMaintenance.php
index cb011d23a..5c2f7d712 100644
--- a/gulliver/system/class.dbMaintenance.php
+++ b/gulliver/system/class.dbMaintenance.php
@@ -368,6 +368,7 @@ class DataBaseMaintenance
. ' --port=' . $dbPort
. ' --opt'
. ' --skip-comments'
+ . ' --no-tablespaces'
. ' ' . $this->getDbName()
. ' > ' . $outfile;
} else {
@@ -376,6 +377,7 @@ class DataBaseMaintenance
. ' --user=' . $this->getUser()
. ' --opt'
. ' --skip-comments'
+ . ' --no-tablespaces'
. ' --password=' . $password
. ' ' . $this->getDbName()
. ' > ' . $outfile;
diff --git a/phpunit.xml b/phpunit.xml
index 850c25e30..1875587b5 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -25,6 +25,21 @@
+
+
+ ./app
+ ./gulliver
+ ./rbac
+ ./workflow
+
+
+ ./workflow/engine/classes/model/map
+ ./workflow/engine/classes/model/om
+ ./workflow/public_html
+ ./workflow/engine/templates
+
+
+
diff --git a/resources/assets/js/components/home/caseDetail/CaseComments.vue b/resources/assets/js/components/home/caseDetail/CaseComments.vue
index d934c4e82..afbff7d53 100644
--- a/resources/assets/js/components/home/caseDetail/CaseComments.vue
+++ b/resources/assets/js/components/home/caseDetail/CaseComments.vue
@@ -2,8 +2,8 @@
- {{ data.title }} +
+ {{ data.title }}