ci: run intergration e2e tests with puppeteer

angular · May 11, 2020 · 3f26c30 · 3f26c30
1 parent f46d26e
commit 3f26c30
Show file tree

Hide file tree

Showing 18 changed files with 182 additions and 160 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -118,8 +118,11 @@ jobs:
       # Run a step to setup an environment variable.
       - run:
           name: "Setup custom environment variables"
+          # Use matching versions of Chromium (via puppeteer) and ChromeDriver.
+          # https://github.com/GoogleChrome/puppeteer/releases
+          # http://chromedriver.chromium.org/downloads
           command: |
-            echo 'export CHROMEDRIVER_VERSION_ARG="--versions.chrome 83.0.4103.39"' >> $BASH_ENV # Redirect into $BASH_ENV
+            echo 'export CHROMEDRIVER_VERSION_ARG="--versions.chrome 81.0.4044.0"' >> $BASH_ENV # Redirect into $BASH_ENV
       - run: ./integration/run_tests.sh
 
 workflows:

diff --git a/integration/common/e2e/protractor.config.js b/integration/common/e2e/protractor.config.js
@@ -11,8 +11,8 @@ exports.config = {
   capabilities: {
     browserName: 'chrome',
     chromeOptions: {
-      args: ['--no-sandbox'],
-      binary: process.env.CHROME_BIN,
+      args: ['--headless'],
+      binary: require('puppeteer').executablePath(),
     }
   },
   directConnect: true,

diff --git a/integration/express-engine-ivy-prerender/e2e/protractor.conf.js b/integration/express-engine-ivy-prerender/e2e/protractor.conf.js
@@ -17,8 +17,8 @@ exports.config = {
   capabilities: {
     browserName: 'chrome',
     chromeOptions: {
-      args: ['--no-sandbox'],
-      binary: process.env.CHROME_BIN,
+      args: ['--headless'],
+      binary: require('puppeteer').executablePath(),
     }
   },
   directConnect: true,

diff --git a/integration/express-engine-ivy-prerender/e2e/src/app.e2e-spec.ts b/integration/express-engine-ivy-prerender/e2e/src/app.e2e-spec.ts
@@ -8,21 +8,21 @@ describe('workspace-project App', () => {
   });
 
   it('should have prerendered /pokemon/pikachu', async () => {
-    page.navigateTo('pokemon/pikachu/index.html');
+    await page.navigateTo('pokemon/pikachu/index.html');
     expect(await page.isPrerendered());
   });
 
   // Note: We use '../index.html' because in order to serve
   // static content we must match '*.*' - See server.ts line 28.
   it('should have prerendered /../index.html', async () => {
-    page.navigateTo('../index.html');
+    await page.navigateTo('../index.html');
     expect(await page.isPrerendered());
   });
 
   // This also verifies that we are using index.original.html to
   // render pages (instead of index.html)
   it('should not have prerendered anything else', async () => {
-    page.navigateTo('pokemon/charmander/index.html');
+    await page.navigateTo('pokemon/charmander/index.html');
     expect(await page.isPrerendered()).toBe(false);
   });
 });
diff --git a/integration/express-engine-ivy-prerender/e2e/src/app.po.ts b/integration/express-engine-ivy-prerender/e2e/src/app.po.ts
@@ -1,8 +1,8 @@
-import { browser, by, element, logging } from 'protractor';
+import { browser } from 'protractor';
 
 export class AppPage {
   navigateTo(route: string) {
-    browser.get(browser.baseUrl + route);
+    return browser.get(browser.baseUrl + route);
   }
 
   async isPrerendered() {

diff --git a/integration/express-engine-ivy-prerender/package.json b/integration/express-engine-ivy-prerender/package.json
@@ -54,6 +54,7 @@
     "karma-jasmine": "3.1.1",
     "karma-jasmine-html-reporter": "1.5.3",
     "protractor": "file:../../node_modules/protractor",
+    "puppeteer":  "file:../../node_modules/puppeteer",
     "ts-node": "8.10.1",
     "tslint": "6.1.2",
     "typescript": "file:../../node_modules/typescript"

diff --git a/integration/express-engine-ivy-prerender/server.ts b/integration/express-engine-ivy-prerender/server.ts
@@ -12,7 +12,7 @@ import { existsSync } from 'fs';
 export function app() {
   const server = express();
   const distFolder = join(process.cwd(), 'dist/express-engine-ivy-prerender/browser');
-  const indexHtml = existsSync(join(distFolder, 'index.original.html')) ? 'index.original.html' : 'index';
+  const indexHtml = existsSync(join(distFolder, 'src/home.html')) ? 'src/home.html' : 'index.html';
 
   // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
   server.engine('html', ngExpressEngine({

diff --git a/integration/express-engine-ivy-prerender/static-server.js b/integration/express-engine-ivy-prerender/static-server.js
diff --git a/integration/express-engine-ivy/e2e/protractor.conf.js b/integration/express-engine-ivy/e2e/protractor.conf.js
@@ -15,8 +15,8 @@ exports.config = {
   capabilities: {
     browserName: 'chrome',
     chromeOptions: {
-      args: ['--no-sandbox'],
-      binary: process.env.CHROME_BIN,
+      args: ['--headless'],
+      binary: require('puppeteer').executablePath(),
     }
   },
   directConnect: true,

diff --git a/integration/express-engine-ivy/package.json b/integration/express-engine-ivy/package.json
@@ -52,6 +52,7 @@
     "karma-jasmine": "3.1.1",
     "karma-jasmine-html-reporter": "1.5.3",
     "protractor": "file:../../node_modules/protractor",
+    "puppeteer":  "file:../../node_modules/puppeteer",
     "ts-node": "8.10.1",
     "tslint": "6.1.2",
     "typescript": "file:../../node_modules/typescript"

diff --git a/integration/express-engine-ve/e2e/protractor.conf.js b/integration/express-engine-ve/e2e/protractor.conf.js
@@ -15,8 +15,8 @@ exports.config = {
   capabilities: {
     browserName: 'chrome',
     chromeOptions: {
-      args: ['--no-sandbox'],
-      binary: process.env.CHROME_BIN,
+      args: ['--headless'],
+      binary: require('puppeteer').executablePath(),
     }
   },
   directConnect: true,

diff --git a/integration/express-engine-ve/package.json b/integration/express-engine-ve/package.json
@@ -52,6 +52,7 @@
     "karma-jasmine": "3.1.1",
     "karma-jasmine-html-reporter": "1.5.3",
     "protractor": "file:../../node_modules/protractor",
+    "puppeteer":  "file:../../node_modules/puppeteer",
     "ts-node": "8.10.1",
     "tslint": "6.1.2",
     "typescript": "file:../../node_modules/typescript"

diff --git a/integration/hapi-engine-ivy/e2e/protractor.conf.js b/integration/hapi-engine-ivy/e2e/protractor.conf.js
@@ -15,8 +15,8 @@ exports.config = {
   capabilities: {
     browserName: 'chrome',
     chromeOptions: {
-      args: ['--no-sandbox'],
-      binary: process.env.CHROME_BIN,
+      args: ['--headless'],
+      binary: require('puppeteer').executablePath(),
     }
   },
   directConnect: true,

diff --git a/integration/hapi-engine-ivy/package.json b/integration/hapi-engine-ivy/package.json
@@ -54,6 +54,7 @@
     "karma-jasmine": "3.1.1",
     "karma-jasmine-html-reporter": "1.5.3",
     "protractor": "file:../../node_modules/protractor",
+    "puppeteer":  "file:../../node_modules/puppeteer",
     "ts-node": "8.10.1",
     "tslint": "6.1.2",
     "typescript": "file:../../node_modules/typescript"

diff --git a/integration/hapi-engine-ve/e2e/protractor.conf.js b/integration/hapi-engine-ve/e2e/protractor.conf.js
@@ -15,8 +15,8 @@ exports.config = {
   capabilities: {
     browserName: 'chrome',
     chromeOptions: {
-      args: ['--no-sandbox'],
-      binary: process.env.CHROME_BIN,
+      args: ['--headless'],
+      binary: require('puppeteer').executablePath(),
     }
   },
   directConnect: true,

diff --git a/integration/hapi-engine-ve/package.json b/integration/hapi-engine-ve/package.json
@@ -54,6 +54,7 @@
     "karma-jasmine": "3.1.1",
     "karma-jasmine-html-reporter": "1.5.3",
     "protractor": "file:../../node_modules/protractor",
+    "puppeteer":  "file:../../node_modules/puppeteer",
     "ts-node": "8.10.1",
     "tslint": "6.1.2",
     "typescript": "file:../../node_modules/typescript"

diff --git a/package.json b/package.json
@@ -88,6 +88,7 @@
     "minimatch": "^3.0.4",
     "node-fetch": "^2.2.0",
     "protractor": "5.4.4",
+    "puppeteer": "~3.0.4",
     "rollup": "~1.31.0",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-node-resolve": "^5.2.0",