From 1c6a1a82f03f2bd5911dfc37f365329d6f5acb60 Mon Sep 17 00:00:00 2001
From: Michael Krotscheck <krotscheck@gmail.com>
Date: Mon, 4 Jun 2018 14:23:07 -0700
Subject: [PATCH] fix(circleci): Switch to using circleci v2 syntax and fix
 build errors (#4837)

This patch fixes the continually breaking circleci build. The changes made were:
- Switch to using circleci v2 syntax, as the v1 syntax will be deprecated in August.
  It also permits running this build locally using the `circleci` commandline tool.
- Adjust timeouts on error tests to fail consistently on high-performance machines.
- Correct error formatting on error tests.
---
 circle.yml                               | 106 +++++++++++++++--------
 scripts/test.js                          |   4 +-
 spec/errorTest/slowHttpAndTimeoutConf.js |   2 +-
 3 files changed, 72 insertions(+), 40 deletions(-)

diff --git a/circle.yml b/circle.yml
index 4c77f5abc..9a92e3224 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,40 +1,72 @@
-machine:
-  node:
-    version: 6.9.1
-  environment:
-    # Fix issue with selenium-server in containers.
-    # See http://github.com/SeleniumHQ/docker-selenium/issues/87
-    DBUS_SESSION_BUS_ADDRESS: /dev/null
-
-dependencies:
-  override:
-    - npm i
-  cache_directories:
-    - testapp/node_modules
-  post:
-    - ./node_modules/.bin/gulp lint
-    - ./node_modules/.bin/webdriver-manager update
-    - ./node_modules/.bin/webdriver-manager start:
-        background: true
-    - cd testapp && npm i
-    - npm start:
+version: 2
+jobs:
+  build:
+    docker:
+      - image: circleci/node:6.14-browsers
+        environment:
+          # Fix issue with selenium-server in containers.
+          # See http://github.com/SeleniumHQ/docker-selenium/issues/87
+          DBUS_SESSION_BUS_ADDRESS: /dev/null
+    steps:
+      - checkout
+
+      - run:
+          name: Install Dependencies
+          command: |
+            sudo apt-get update
+            sudo apt-get install python-pip tcpdump
+
+            # Have to update firefox, default is ESR.
+            sudo pip install --upgrade pip
+            sudo pip install mozdownload mozinstall
+            mozdownload --version latest --destination firefox.tar.bz2
+            mozinstall firefox.tar.bz2
+            sudo cp -R firefox/* /opt/firefox/
+
+            # Latest chrome is already installed in the default container.
+            # curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+            # sudo dpkg -i google-chrome.deb
+            # sudo sed -i 's|HERE/chrome\"|HERE/chrome\" --disable-setuid-sandbox|g' /opt/google/chrome/google-chrome
+            # rm google-chrome.deb
+
+      - restore_cache:
+          key: node_modules-{{ .Branch }}-{{ checksum "package-lock.json" }}
+
+      - run:
+          name: NPM Install
+          command: |
+            npm i
+            cd testapp && npm i
+
+      - save_cache:
+          key: node_modules-{{ .Branch }}-{{ checksum "package-lock.json" }}
+          paths:
+            - "node_modules"
+            - "testapp/node_modules"
+
+      - run:
+          name: Lint
+          command: ./node_modules/.bin/gulp lint
+
+      - run:
+          name: Selenium Start
           background: true
-    - sudo apt-get update
-    # Install the latest Firefox beta
-    - pip install --upgrade pip
-    - pip install mozdownload mozinstall
-    - mozdownload --version latest --destination firefox.tar.bz2
-    - mozinstall firefox.tar.bz2
-    - sudo cp -R firefox/* /opt/firefox/
-    # Install the latest Chrome
-    - curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-    - sudo dpkg -i google-chrome.deb
-    - sudo sed -i 's|HERE/chrome\"|HERE/chrome\" --disable-setuid-sandbox|g' /opt/google/chrome/google-chrome
-    - rm google-chrome.deb
-    # Extra tcp logging for BlockingProxy
-    - sudo tcpdump -i lo 'tcp && dst localhost' -w $CIRCLE_ARTIFACTS/localdump.pcap:
+          command: |
+            ./node_modules/.bin/webdriver-manager update
+            ./node_modules/.bin/webdriver-manager start
+
+      - run:
+          name: TestApp Start
           background: true
+          command: |
+            npm start
+
+      # Seems like the new circleci container no longer permits packet introspection on lo, even for root.
+      # - run:
+      #    name: Extra tcp logging for BlockingProxy
+      #    background: true
+      #    command: sudo tcpdump -i lo 'tcp && dst localhost' -w $CIRCLE_ARTIFACTS/localdump.pcap
 
-test:
-  override:
-    - npm test
+      - run:
+          name: Test
+          command: npm test
diff --git a/scripts/test.js b/scripts/test.js
index 7e15e45b8..2a900a968 100755
--- a/scripts/test.js
+++ b/scripts/test.js
@@ -129,8 +129,8 @@ executor.addCommandlineTest('node built/cli.js spec/errorTest/slowHttpAndTimeout
     .expectExitCode(1)
     .expectErrors([
       {message: 'The following tasks were pending[\\s\\S]*\\$http: slowcall'},
-      {message: 'The following tasks were pending[\\s\\S]*' +
-                '\\$timeout: function \\(\\) {[\\s\\S]*' +
+      {message: 'The following tasks were pending:[\\s\\S]*' +
+                '- \\$timeout: function\\(\\) {[\\s\\S]*' +
                   '\\$scope\\.slowAngularTimeoutStatus = \'done\';[\\s\\S]' +
                 '*}'}
     ]);
diff --git a/spec/errorTest/slowHttpAndTimeoutConf.js b/spec/errorTest/slowHttpAndTimeoutConf.js
index edbc372e3..f81811758 100644
--- a/spec/errorTest/slowHttpAndTimeoutConf.js
+++ b/spec/errorTest/slowHttpAndTimeoutConf.js
@@ -15,5 +15,5 @@ exports.config = {
 
   baseUrl: env.baseUrl + '/ng1/',
 
-  allScriptsTimeout: 10000
+  allScriptsTimeout: 4000 // Each test waits on something that has a 5 second tick.
 };