From 922ca4acd78486317147a924f4f763ca9480e995 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Thu, 30 Apr 2020 18:45:50 +0100
Subject: [PATCH] FIX #11895 TIME 4:15 Test E2E + fix TIME
---
.gitlab-ci.yml | 1 -
test/e2e/conf.js | 1 +
.../app/notification/DiffusionTypesControllerTest.php | 10 +++++-----
.../app/signatureBook/SignatureBookControllerTest.php | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 42b5b721a05..8d387d5ad1f 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,6 @@ variables:
stages:
- test
- - deploy
before_script:
- apt-get update -yqq > /dev/null
diff --git a/test/e2e/conf.js b/test/e2e/conf.js
index 8347c4cce1c..d75fd5b729b 100644
--- a/test/e2e/conf.js
+++ b/test/e2e/conf.js
@@ -21,6 +21,7 @@ exports.config = {
}
],
chromeDriver: '/usr/bin/chromedriver',
+ maxSessions: 1,
onPrepare: () => {
browser.driver.getCapabilities().then(function(caps){
diff --git a/test/unitTests/app/notification/DiffusionTypesControllerTest.php b/test/unitTests/app/notification/DiffusionTypesControllerTest.php
index aecdfcf55c2..387253f788d 100755
--- a/test/unitTests/app/notification/DiffusionTypesControllerTest.php
+++ b/test/unitTests/app/notification/DiffusionTypesControllerTest.php
@@ -118,7 +118,7 @@ class DiffusionTypesControllerTest extends TestCase
$args = [
'notification' => [
'diffusion_type' => 'dest_user',
- 'diffusion_properties' => 'NEW,COU,CLO,END,ATT,VAL,INIT'
+ 'diffusion_properties' => 'NEW,COU,CLO,END,ATT,VAL,INIT,ESIG'
],
'request' => 'recipients',
'event' => [
@@ -169,7 +169,7 @@ class DiffusionTypesControllerTest extends TestCase
$args = [
'notification' => [
'diffusion_type' => 'dest_user',
- 'diffusion_properties' => 'NEW,COU,CLO,END,ATT,VAL,INIT'
+ 'diffusion_properties' => 'NEW,COU,CLO,END,ATT,VAL,INIT,ESIG'
],
'request' => 'res_id',
'event' => [
@@ -220,7 +220,7 @@ class DiffusionTypesControllerTest extends TestCase
$args = [
'notification' => [
'diffusion_type' => 'dest_entity',
- 'diffusion_properties' => 'NEW,COU,CLO,END,ATT,VAL,INIT'
+ 'diffusion_properties' => 'NEW,COU,CLO,END,ATT,VAL,INIT,ESIG'
],
'request' => 'res_id',
'event' => [
@@ -279,7 +279,7 @@ class DiffusionTypesControllerTest extends TestCase
$args = [
'notification' => [
'diffusion_type' => 'dest_user_sign',
- 'diffusion_properties' => 'NEW,COU,CLO,END,ATT,VAL,INIT'
+ 'diffusion_properties' => 'NEW,COU,CLO,END,ATT,VAL,INIT,ESIG'
],
'request' => 'res_id',
'event' => [
@@ -338,7 +338,7 @@ class DiffusionTypesControllerTest extends TestCase
$args = [
'notification' => [
'diffusion_type' => 'dest_user_visa',
- 'diffusion_properties' => 'NEW,COU,CLO,END,ATT,VAL,INIT'
+ 'diffusion_properties' => 'NEW,COU,CLO,END,ATT,VAL,INIT,ESIG'
],
'request' => 'res_id',
'event' => [
diff --git a/test/unitTests/app/signatureBook/SignatureBookControllerTest.php b/test/unitTests/app/signatureBook/SignatureBookControllerTest.php
index 58d02bdf095..d747959ea1f 100644
--- a/test/unitTests/app/signatureBook/SignatureBookControllerTest.php
+++ b/test/unitTests/app/signatureBook/SignatureBookControllerTest.php
@@ -103,7 +103,7 @@ class SignatureBookControllerTest extends TestCase
'sequence' => 0,
'item_id' => $userInfo['id'],
'item_type' => 'user_id',
- 'item_mode' => 'dest',
+ 'item_mode' => 'sign',
'added_by_user' => $GLOBALS['id'],
'viewed' => 0,
'difflist_type' => 'VISA_CIRCUIT'
@@ -445,7 +445,7 @@ class SignatureBookControllerTest extends TestCase
'sequence' => 0,
'item_id' => $userInfo['id'],
'item_type' => 'user_id',
- 'item_mode' => 'dest',
+ 'item_mode' => 'sign',
'added_by_user' => $GLOBALS['id'],
'viewed' => 0,
'difflist_type' => 'VISA_CIRCUIT'
--
GitLab