diff --git a/package-lock.json b/package-lock.json index 41b88c8d0cad3b64a773f957edb56ffe31121560..c39d109ded958dca18e711f55ed7cd0beb84e28c 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.66.0", + "webpack": "5.65.0", "webpack-dev-middleware": "5.2.2", "webpack-dev-server": "4.6.0", "webpack-merge": "5.8.0", @@ -27455,7 +27455,8 @@ } }, "webpack": { - "version": "https://registry.npmjs.org/webpack/-/webpack-5.65.0.tgz", + "version": "5.65.0", + "resolved": "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 f477681db06fa87dae116be01c23707aaf3938ce..89e73fd116ec1b29d744c3501f3eae4ca17d2298 100644 --- a/package.json +++ b/package.json @@ -38,13 +38,8 @@ "docker:others:down": "npm run docker:elasticsearch:down", "predocker:others:up": "", "docker:others:up": "npm run docker:elasticsearch:up", - "e2e": "npm run e2e:protractor --", - "e2e:dev": "concurrently -k -s first \"./mvnw\" \"npm run e2e\"", - "e2e:devserver": "concurrently -k -s first \"npm run backend:start\" \"npm start\" \"wait-on http-get://localhost:9000 && npm run e2e:headless -- -c baseUrl=http://localhost:9000\"", - "pree2e:headless": "npm run ci:server:await", - "e2e:headless": "npm run e2e:protractor --headless --disable-gpu", - "e2e:protractor": "protractor src/test/javascript/protractor.conf.js", - "e2e:protractor:headless": "npm run e2e:protractor --", + "e2e": "protractor src/test/javascript/protractor.conf.js", + "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", "java:docker": "./mvnw -ntp verify -DskipTests -Pprod jib:dockerBuild", diff --git a/src/main/webapp/app/home/home.component.html b/src/main/webapp/app/home/home.component.html index 1bee5f3c276ef75d00fb00cac8cabd493bbbc69a..828f7e3b493b6a667150267cd708f7301c96e1dd 100644 --- a/src/main/webapp/app/home/home.component.html +++ b/src/main/webapp/app/home/home.component.html @@ -7,11 +7,11 @@ <div class="row" style="padding-top: 15px"> <div class="col-12"> <div [ngSwitch]="account !== null"> - <!-- <div class="alert alert-success" *ngSwitchCase="true"> + <div class="alert alert-success" *ngSwitchCase="true"> <span id="home-logged-message" *ngIf="account" jhiTranslate="home.logged.message" [translateValues]="{ username: account.login }" >You are logged in as user "{{ account.login }}".</span > - </div> --> + </div> </div> </div> </div> diff --git a/src/test/javascript/protractor.conf.js b/src/test/javascript/protractor.conf.js index 915ba287d63066c81f84d0d240ee9614fd282880..b80b85528cdb5ccdff80d3036649905d5fd11825 100644 --- a/src/test/javascript/protractor.conf.js +++ b/src/test/javascript/protractor.conf.js @@ -12,14 +12,14 @@ exports.config = { browserName: 'chrome', chromeOptions: { args: process.env.JHI_E2E_HEADLESS - ? ['--headless', '--disable-gpu', '--window-size=800,600'] + ? ['--headless', '--disable-gpu', '--window-size=1920,1080', '--start-maximized'] : ['--disable-gpu', '--window-size=800,600'], }, }, directConnect: true, - baseUrl: 'http://localhost:9000/', + baseUrl: process.env.baseUrl ? process.env.baseUrl : 'http://localhost:9000/', framework: 'mocha',