From fabdd66dc3d46e3c89dc93e627f5e31b0788ace0 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Thu, 2 Apr 2020 13:47:28 +0100
Subject: [PATCH] Test TF
---
.gitlab-ci.yml | 2 +-
src/app/versionUpdate/controllers/VersionUpdateController.php | 3 +++
test/e2e/index-resource-spec.js | 4 ++--
test/e2e/login-spec.js | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c8ad254b157..63a620ea74e 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,7 +56,7 @@ job_e2e:
- npm install npm@latest -g
- npm set registry https://registry.npmjs.org/
- npm install
- - npm run build
+ - npm run build-prod
- apt-get install -yqq openjdk-11-jdk
- apt-get install -yqq chromium
- sed 's/<databaseserver>.*<\/databaseserver>/<databaseserver>postgres<\/databaseserver>/;s/<databasepassword>.*<\/databasepassword>/<databasepassword><\/databasepassword>/;s/<databasename>.*<\/databasename>/<databasename>MaarchCourrier<\/databasename>/;s/<databaseuser>.*<\/databaseuser>/<databaseuser>maarch<\/databaseuser>/' apps/maarch_entreprise/xml/config.xml.default > apps/maarch_entreprise/xml/config.xml
diff --git a/src/app/versionUpdate/controllers/VersionUpdateController.php b/src/app/versionUpdate/controllers/VersionUpdateController.php
index 405bbba4727..e6960d808ee 100755
--- a/src/app/versionUpdate/controllers/VersionUpdateController.php
+++ b/src/app/versionUpdate/controllers/VersionUpdateController.php
@@ -101,6 +101,9 @@ class VersionUpdateController
]);
}
+ /**
+ * @codeCoverageIgnore
+ */
public function update(Request $request, Response $response)
{
if (!PrivilegeController::hasPrivilege(['privilegeId' => 'admin_update_control', 'userId' => $GLOBALS['id']])) {
diff --git a/test/e2e/index-resource-spec.js b/test/e2e/index-resource-spec.js
index f147d274861..c040894fb3e 100644
--- a/test/e2e/index-resource-spec.js
+++ b/test/e2e/index-resource-spec.js
@@ -9,8 +9,8 @@ describe('index resource page', function() {
});
it('index a document whitout file', function() {
- browser.sleep(10000);
- browser.waitForAngularEnabled(true);
+ browser.sleep(5000);
+ browser.waitForAngularEnabled(false);
element(by.id('indexing')).click();
browser.sleep(500);
element(by.id('doctype')).click();
diff --git a/test/e2e/login-spec.js b/test/e2e/login-spec.js
index 5e205ede85a..964ed591808 100644
--- a/test/e2e/login-spec.js
+++ b/test/e2e/login-spec.js
@@ -19,7 +19,7 @@ describe('angular homepage todo list', function() {
it('test 2', function() {
browser.sleep(4000);
- browser.waitForAngularEnabled(true);
+ browser.waitForAngularEnabled(false);
var nbHeader = element.all(by.css('[class="bg-head-content"]'));
expect(nbHeader.count()).toEqual(1);
--
GitLab