diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c8ad254b157882840056843911703939edffa3b6..63a620ea74e87f53894c8e3e02a7e91ee87010f7 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 405bbba4727dff41dc955576348cba8e1e4a3d5b..e6960d808ee265ffbb9c3f5d8530cb528b3c45a9 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 f147d2748614bae27389acb448a97240e208c176..c040894fb3e16918ee9db7412547d58c282dde9f 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 5e205ede85a9097edd3cb296fe4c1bc0ff87e3ce..964ed5918083500c5e4f21b6ba0af1012c78c9eb 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);