From: Jane Sandberg Date: Tue, 31 Dec 2019 01:08:20 +0000 (-0800) Subject: LP???????: Make an e2e-suitable version of ng serve X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=0f9935035a38cd21c845d93776ba40925aaf1b57;p=working%2FEvergreen.git LP???????: Make an e2e-suitable version of ng serve Signed-off-by: Jane Sandberg --- diff --git a/Open-ILS/src/eg2/angular.json b/Open-ILS/src/eg2/angular.json index d26b37e03b..381e060ac8 100644 --- a/Open-ILS/src/eg2/angular.json +++ b/Open-ILS/src/eg2/angular.json @@ -67,17 +67,39 @@ "with": "src/environments/environment.prod.ts" } ] + }, + "e2e": { + "optimization": false, + "outputHashing": "all", + "sourceMap": false, + "extractCss": true, + "namedChunks": false, + "aot": true, + "extractLicenses": true, + "vendorChunk": false, + "buildOptimizer": false, + "fileReplacements": [ + { + "replace": "src/index.html", + "with": "src/index.e2e.html" + } + ] } } }, "serve": { "builder": "@angular-devkit/build-angular:dev-server", "options": { - "browserTarget": "eg:build" + "browserTarget": "eg:build", + "servePath": "/eg2/en-US/" }, "configurations": { "production": { "browserTarget": "eg:build:production" + }, + "e2e": { + "browserTarget": "eg:build:e2e", + "publicHost": "http://localhost:4200/eg2/en-US" } } }, diff --git a/Open-ILS/src/eg2/e2e/app.po.ts b/Open-ILS/src/eg2/e2e/app.po.ts index 82ea75ba50..bdc722b626 100644 --- a/Open-ILS/src/eg2/e2e/app.po.ts +++ b/Open-ILS/src/eg2/e2e/app.po.ts @@ -2,7 +2,8 @@ import { browser, by, element } from 'protractor'; export class AppPage { navigateTo() { - return browser.get('/'); + browser.waitForAngularEnabled(false); + return browser.get('/eg2/en-US/'); } getParagraphText() { diff --git a/Open-ILS/src/eg2/protractor.conf.js b/Open-ILS/src/eg2/protractor.conf.js index 7ee3b5ee86..9faa992958 100644 --- a/Open-ILS/src/eg2/protractor.conf.js +++ b/Open-ILS/src/eg2/protractor.conf.js @@ -9,7 +9,10 @@ exports.config = { './e2e/**/*.e2e-spec.ts' ], capabilities: { - 'browserName': 'chrome' + 'browserName': 'firefox', + 'moz:firefoxOptions': { + args: [ "--headless" ] + } }, directConnect: true, baseUrl: 'http://localhost:4200/', @@ -26,3 +29,4 @@ exports.config = { jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } })); } }; + diff --git a/Open-ILS/src/eg2/src/index.e2e.html b/Open-ILS/src/eg2/src/index.e2e.html new file mode 100644 index 0000000000..1da1bcf435 --- /dev/null +++ b/Open-ILS/src/eg2/src/index.e2e.html @@ -0,0 +1,17 @@ + + + + + Evergreen + + + + + + + + + + + + diff --git a/docs/installation/server_installation.adoc b/docs/installation/server_installation.adoc index f72a85f348..7b864a6f1f 100644 --- a/docs/installation/server_installation.adoc +++ b/docs/installation/server_installation.adoc @@ -185,7 +185,6 @@ npm install # fetch JS dependencies + [source,sh] ------------------------------------------------------------------------------ -# build and run tests ng build --prod ------------------------------------------------------------------------------ + @@ -196,6 +195,7 @@ ng build --prod [source,sh] ------------------------------------------------------------------------------ CHROME_BIN=/path/to/chrome npm run test +node_modules/protractor/bin/webdriver-manager update && ng e2e --dev-server-target="" ------------------------------------------------------------------------------ Configuration and compilation instructions