projects / working / Evergreen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2cd4053)
LP???????: Make an e2e-suitable version of ng serve user/sandbergja/e2e_a11y_tests
authorJane Sandberg <sandbej@linnbenton.edu>
Tue, 31 Dec 2019 01:08:20 +0000 (17:08 -0800)
committerJane Sandberg <sandbej@linnbenton.edu>
Sun, 26 Jan 2020 13:17:26 +0000 (05:17 -0800)
Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
Open-ILS/src/eg2/angular.json patch | blob | history
Open-ILS/src/eg2/e2e/app.po.ts patch | blob | history
Open-ILS/src/eg2/protractor.conf.js patch | blob | history
Open-ILS/src/eg2/src/index.e2e.html [new file with mode: 0644] patch | blob
docs/installation/server_installation.adoc patch | blob | history

diff --git a/Open-ILS/src/eg2/angular.json b/Open-ILS/src/eg2/angular.json
index d26b37e..381e060 100644 (file)
--- 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 82ea75b..bdc722b 100644 (file)
--- 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 7ee3b5e..9faa992 100644 (file)
--- 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 (file)
index 0000000..1da1bcf
--- /dev/null
+++ b/Open-ILS/src/eg2/src/index.e2e.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title i18n="Page Title">Evergreen</title>
+  <base href="/eg2">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="icon" type="image/x-icon" href="favicon.ico">
+</head>
+<body>
+  <eg-root></eg-root>
+  <script src="http://127.0.0.1:80/IDL2js"></script>
+  <script src="http://127.0.0.1:80/js/dojo/opensrf/JSON_v1.js"></script>
+  <script src="http://127.0.0.1:80/js/dojo/opensrf/opensrf.js"></script>
+  <script src="http://127.0.0.1:80/js/dojo/opensrf/opensrf_ws.js"></script>
+</body>
+</html>
diff --git a/docs/installation/server_installation.adoc b/docs/installation/server_installation.adoc
index f72a85f..7b864a6 100644 (file)
--- 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
Evergreen ILS