From d413ae66f4f013d0ca4ea03bcc91eb4837e29ab0 Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Wed, 2 Aug 2017 09:00:00 -0700
Subject: [PATCH] Fix the build (#38)

Fixes #34
---
 .travis.yml  |  7 ++++---
 .zuul.yml    | 19 ++++++++++---------
 README.md    |  4 ----
 package.json |  6 ++----
 test/test.js |  3 +--
 5 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 74fb263..f18ce9e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,13 @@
 language: node_js
 node_js:
-- 'stable'
+- stable
 sudo: false
-script: npm test
+script: travis_retry npm test
 env:
   global:
   - secure: Tj8fcY4Pig7i38wVncEF4RAgn7i786qwiFYeog94oSllsmJsCvQ61Qco9Yg8Xr4fDcOIRI8xz6AsB8Z4kuGfgywbOlvCiVEC1qqJpOG490e0OOrvrPR1YToSW1DsLFsnb381CiP9FadOOUx3COMjmJvKR+4kYoJGiRJrpDF5PVA=
   - secure: MssON602wZqWuCeEcZHROyKI7YkkBUOHTF54Qsh41wR7EhBqG+EuU67SUp8RCX3e+aiID0mKCD6+C43c0uEMrdAk0fdPlG6MiQX8dfbq1V7MgIMf8DT2xw0bXt3xrw3bBBsR4Fa6XB6At1VlLmswj1lqGyWvLwTkykSJSTnPrYI=
+  - secure: Jh+ZAYimpwDokeuni8ywLIdPyt6Z8PTxdPdHGY5fD4dsRUUc5+eTtu4HKeywzLm/X7Oy17MCC+JK/RCO8LjiQK7M+6Fw+NLkpEgIjJ83MfBBOb8QE9yHWWCpdCNf+V5ZxrEhw0G0wlk0cSMRYbxvsmidDPtfbwy3l9FEC6Qgx1s=
 branches:
   only:
-  - master
\ No newline at end of file
+  - master
diff --git a/.zuul.yml b/.zuul.yml
index 6a71446..0ada790 100644
--- a/.zuul.yml
+++ b/.zuul.yml
@@ -1,18 +1,19 @@
 ui: mocha-bdd
+concurrency: 2
+tunnel:
+  type: ngrok
 browsers:
   - name: chrome
-    version: 45..latest
+    version: latest
   - name: firefox
-    version: 40..latest
+    version: latest
   - name: safari
-    version: [8, 9..latest]
+    version: latest
   - name: ie
-    version: 10..latest
+    version: 10
   - name: microsoftedge
-    version: 13..latest
+    version: latest
   - name: iphone
-    version: [7.1, 8.4, 9.1..latest]
-  - name: ipad
-    version: [7.1, 8.4, 9.1..latest]
+    version: latest
   - name: android
-    version: 4.4..latest
+    version: latest
diff --git a/README.md b/README.md
index cf8f3f4..ed44d28 100644
--- a/README.md
+++ b/README.md
@@ -477,7 +477,3 @@ Then to test in the browser using Saucelabs:
 Or to test locally in your browser of choice:
 
     npm run test-local
-
-Or to test in PhantomJS:
-
-    npm run test-phantom
diff --git a/package.json b/package.json
index 7a8f2ed..76ea2d1 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,6 @@
     "jshint": "jshint -c .jshintrc lib/*.js test/test.js",
     "test": "npm run jshint && zuul ./test/test.js",
     "test-local": "zuul ./test/test.js --local 9000",
-    "test-phantom": "zuul ./test/test.js --phantom",
     "build": "mkdirp dist && npm run browserify && npm run min",
     "browserify": "browserify . -p bundle-collapser/plugin -s blobUtil | ./bin/es3ify.js | derequire > dist/blob-util.js",
     "min": "uglifyjs dist/blob-util.js -mc > dist/blob-util.min.js",
@@ -47,11 +46,10 @@
     "jshint": "~2.3.0",
     "mkdirp": "^0.5.0",
     "mocha": "~1.18",
-    "phantomjs": "^1.9.7-5",
-    "phantomjs-polyfill": "0.0.1",
     "request": "^2.36.0",
     "uglify-js": "^2.4.13",
-    "zuul": "^3.10.1"
+    "zuul": "^3.10.1",
+    "zuul-ngrok": "nolanlawson/zuul-ngrok#patch-1"
   },
   "files": [
     "lib",
diff --git a/test/test.js b/test/test.js
index 0b793b3..ffbf54b 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1,7 +1,5 @@
 'use strict';
 
-require('phantomjs-polyfill');
-
 var blobUtil = require('../lib');
 
 var chai = require('chai');
@@ -18,6 +16,7 @@ var black1x1Png =
   'ADNjd8qAAAAABJRU5ErkJggg==';
 
 describe('basic tests', function () {
+  this.timeout(30000);
 
   before(function () {
     var img = document.createElement('img');