From 2b69bb14968e9f6f642006118e60cccb42a6af02 Mon Sep 17 00:00:00 2001
From: Daniel Freedman <dfreedm@google.com>
Date: Mon, 14 Dec 2015 16:04:13 -0800
Subject: [PATCH] Modernize the build

---
 .travis.yml            | 9 ++++++---
 test/unit/globals.html | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ee77195f..9d3a1a94 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,18 @@
 language: node_js
 sudo: false
-node_js: 4
+node_js: stable
 addons:
   firefox: latest
+  sauce_connect: true
   apt:
     sources:
     - google-chrome
+    - ubuntu-toolchain-r-test
     packages:
     - google-chrome-stable
+    - g++-4.8
 before_script:
-- npm install bower
-- export PATH=$PWD/node_modules/.bin:$PATH
+- npm install -g bower
 - bower install
 script:
 - xvfb-run wct
@@ -19,3 +21,4 @@ env:
   global:
   - secure: eFrp9xwSYG579rAR9/XyXYKh+UtIQJ1xS5q5PABu4ndYFckdJb8o3m7oXqRSikbiPWbCSd3Fkd6+ZKXlcQFdjJ+nx9gFitGthtH93qkvZCO3XhWEEBPj65igIo3hrRSOB6dIWyiZcnoH9IXLLQtKXY9uL1NCqCcyVHg1omPKr9w=
   - secure: EAjjkzqZ8z+PEvdo2N2MiIjkqUYAjVkQABKyMw6N4hUa6YSNEW9PYyn4I0d9Rdvc25GwJ+oLQFdeQepioAkNfp6wYUj2IdMIfmmKa1aJWo5DWvOMDYp3ufRhIoiVi4ZVpLg9sTjw+078UhUQFWE44rwfUtHiIb2UbWe2/ueLOiM=
+  - CXX=g++-4.8
diff --git a/test/unit/globals.html b/test/unit/globals.html
index 3978314b..34ae5552 100644
--- a/test/unit/globals.html
+++ b/test/unit/globals.html
@@ -39,7 +39,7 @@ suite('globals', function() {
 
     // Polymer
     Polymer: true,
-    currentImport: true
+    currentImport: true,
 
     // weird safari + selenium globals
     alert: true,