diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 60728dd6c94794d93b9fe1881b20a3269214906b..6cb9d5c6502f9e5b597314e2cf92f69ea0c9c6bd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,13 +5,13 @@ cache: paths: - .maven/ stages: - - lint - - build - - test - - analyze + # - lint + # - build + - test2 + # - analyze # - package - - release - - deploy + # - release + # - deploy before_script: - export NG_CLI_ANALYTICS="false" @@ -98,6 +98,12 @@ frontend-test: expire_in: 15 days needs: [] +e2e-test: + stage: test2 + cache: {} + script: + - npm run e2e + sonar-analyze: stage: analyze dependencies: diff --git a/package-lock.json b/package-lock.json index c39d109ded958dca18e711f55ed7cd0beb84e28c..41b88c8d0cad3b64a773f957edb56ffe31121560 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26826,7 +26826,7 @@ "text-table": "0.2.0", "tree-kill": "1.2.2", "tslib": "2.3.1", - "webpack": "5.65.0", + "webpack": "5.66.0", "webpack-dev-middleware": "5.2.2", "webpack-dev-server": "4.6.0", "webpack-merge": "5.8.0", @@ -27455,8 +27455,7 @@ } }, "webpack": { - "version": "5.65.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.65.0.tgz", + "version": "https://registry.npmjs.org/webpack/-/webpack-5.65.0.tgz", "integrity": "sha512-Q5or2o6EKs7+oKmJo7LaqZaMOlDWQse9Tm5l1WAfU/ujLGN5Pb0SqGeVkN/4bpPmEqEP5RnVhiqsOtWtUVwGRw==", "dev": true, "requires": { diff --git a/package.json b/package.json index 89e73fd116ec1b29d744c3501f3eae4ca17d2298..3d74f0326aae572c0e3863bc1b99bf64ff5faf9d 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "docker:others:down": "npm run docker:elasticsearch:down", "predocker:others:up": "", "docker:others:up": "npm run docker:elasticsearch:up", - "e2e": "protractor src/test/javascript/protractor.conf.js", + "e2e": "export JHI_E2E_HEADLESS=true; protractor src/test/javascript/protractor.conf.js --disableChecks", "e2e:ci": "protractor --baseUrl='https://dev-exchange.codeability-austria.uibk.ac.at/' src/test/javascript/protractor.conf.js --disableChecks", "e2e:update-webdriver": "webdriver-manager update --gecko false", "postinstall": "npm run e2e:update-webdriver", diff --git a/src/test/javascript/e2e/page-objects/jhi-page-objects.ts b/src/test/javascript/e2e/page-objects/jhi-page-objects.ts index 379f17f7379177950152846a06507cc5bc604b55..5d2c4b4b96381e583a8f2784819ee6c8e03eb85e 100644 --- a/src/test/javascript/e2e/page-objects/jhi-page-objects.ts +++ b/src/test/javascript/e2e/page-objects/jhi-page-objects.ts @@ -1,5 +1,3 @@ -// eslint-disable-next-line @typescript-eslint/no-unused-vars -import { A } from '@angular/cdk/keycodes'; import { element, by, ElementFinder } from 'protractor'; /* eslint @typescript-eslint/no-use-before-define: 0 */ export class NavBarPage { diff --git a/src/test/javascript/protractor.conf.js b/src/test/javascript/protractor.conf.js index b80b85528cdb5ccdff80d3036649905d5fd11825..8aebf09519ceaa7a4bbfe86d05a7ae223be59b9d 100644 --- a/src/test/javascript/protractor.conf.js +++ b/src/test/javascript/protractor.conf.js @@ -19,7 +19,7 @@ exports.config = { directConnect: true, - baseUrl: process.env.baseUrl ? process.env.baseUrl : 'http://localhost:9000/', + baseUrl: process.env.baseUrl ? process.env.baseUrl : 'http://localhost:8080/', framework: 'mocha',