From ac38cdbae331511b2fcb1f92ba9cba8b590cfefe Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Wed, 17 Oct 2018 14:11:46 +0200
Subject: [PATCH] build: run e2e tests on circlci

---
 .circleci/config.yml    | 35 ++++++++++++++++++++++++++++++-----
 .travis.yml             |  1 -
 test/protractor.conf.js |  8 +-------
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c37d478f274c..176c8f332d11 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -52,6 +52,14 @@ var_8: &copy_bazel_config
   # Set up the CircleCI specific bazel configuration.
   run: sudo cp ./.circleci/bazel.rc /etc/bazel.bazelrc
 
+# Sets up a different Docker image that includes a moe recent Firefox version which
+# is needed for headless testing.
+var_9: &docker-firefox-image
+  # TODO(devversion): Temporarily use a image that includes Firefox 62 because the
+  # ngcontainer image does include an old Firefox version that does not support headless.
+  # See the PR that fixes this: https://github.com/angular/angular/pull/26435
+  - image: circleci/node:10.12-browsers
+
 # -----------------------------
 # Container version of CircleCI
 # -----------------------------
@@ -85,11 +93,7 @@ jobs:
   # The available browsers are installed through the angular/ngcontainer Docker image.
   # ------------------------------------------------------------------------------------------
   tests_local_browsers:
-    docker:
-      # TODO(devversion): Temporarily use a image that includes Firefox 62 because the
-      # ngcontainer image does include an old Firefox version that does not support headless.
-      # See the PR that fixes this: https://github.com/angular/angular/pull/26435
-      - image: circleci/node:10.12-browsers
+    docker: *docker-firefox-image
     resource_class: xlarge
     environment:
       TEST_PLATFORM: local
@@ -104,6 +108,23 @@ jobs:
 
       - *save_cache
 
+  # ----------------------------------------------------------------
+  # Job that runs the e2e tests with Protractor and Chrome w/ Xvfb. We cannot use
+  # Chrome headless because our tests rely on APIs which are not testable in headless mode.
+  # For example: the Fullscreen browser API.
+  # ----------------------------------------------------------------
+  e2e_tests:
+    docker: *docker-firefox-image
+    resource_class: xlarge
+    steps:
+      - *checkout_code
+      - *restore_cache
+      - *yarn_install
+
+      - run: xvfb-run -a --server-args='-screen 0, 1024x768x16' yarn gulp ci:e2e
+
+      - *save_cache
+
   # ----------------------------------
   # Lint job. Runs the gulp lint task.
   # ----------------------------------
@@ -138,6 +159,10 @@ workflows:
     jobs:
       - tests_local_browsers
 
+  integration_tests:
+    jobs:
+      - e2e_tests
+
   # Lint workflow. As we want to lint in one job, this is a workflow with just one job.
   lint:
     jobs:
diff --git a/.travis.yml b/.travis.yml
index 2c64bf0c5a17..d4a85bc39259 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,6 @@ jobs:
     - env: "MODE=aot"
     - env: "MODE=payload"
     - env: "MODE=prerender"
-    - env: "MODE=e2e"
     - env: "MODE=saucelabs_required"
     - env: "MODE=browserstack_required"
     - env: "DEPLOY_MODE=build-artifacts"
diff --git a/test/protractor.conf.js b/test/protractor.conf.js
index 7a7af9440846..7f8ff4599f98 100644
--- a/test/protractor.conf.js
+++ b/test/protractor.conf.js
@@ -36,14 +36,8 @@ exports.config = {
   capabilities: {
     browserName: 'chrome',
 
-    chromeOptions: {
-      // Inside of Travis, we need to specify `--no-sandbox` because otherwise Chrome cannot
-      // be launched properly due to insufficient permissions in a non-sudo environment.
-      args: process.env['TRAVIS'] ? ['--no-sandbox'] : [],
-    },
-
     // Enables concurrent testing in the Webdriver. Currently runs three e2e files in parallel.
     shardTestFiles: true,
-    maxInstances: 3,
+    maxInstances: 5,
   }
 };