From 98c9b0eb3990ec2cdafe11a07ca63da2a5daa801 Mon Sep 17 00:00:00 2001
From: Tim Schaub <tim.schaub@gmail.com>
Date: Sun, 1 Nov 2015 01:45:47 -0600
Subject: [PATCH] Update phantomjs and use mocha-phantomjs-core

---
 package.json                             |  4 +--
 tasks/test.js                            |  7 +----
 test/index.html                          | 33 ++++++++++++------------
 test/spec/ol/source/rastersource.test.js |  2 +-
 4 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/package.json b/package.json
index 76ed45cdf4..61d49b1d59 100644
--- a/package.json
+++ b/package.json
@@ -60,9 +60,9 @@
     "jquery": "2.1.1",
     "jshint": "2.8.0",
     "mocha": "1.21.5",
-    "mocha-phantomjs": "3.5.1",
+    "mocha-phantomjs-core": "^1.2.1",
     "mustache": "2.1.3",
-    "phantomjs": "1.9.10",
+    "phantomjs": "1.9.18",
     "proj4": "2.3.12",
     "resemblejs": "1.2.0",
     "sinon": "1.10.3",
diff --git a/tasks/test.js b/tasks/test.js
index aecda4c744..6276bd34f3 100644
--- a/tasks/test.js
+++ b/tasks/test.js
@@ -58,10 +58,7 @@ function runTests(includeCoverage, callback) {
       var address = server.address();
       var url = 'http://' + address.address + ':' + address.port;
       var args = [
-        path.join(
-          __dirname,
-          '../node_modules/mocha-phantomjs/lib/mocha-phantomjs.coffee'
-        ),
+        require.resolve('mocha-phantomjs-core'),
         url + '/test/index.html'
       ];
 
@@ -88,5 +85,3 @@ module.exports = {
   runTests: runTests,
   listen: listen
 };
-
-
diff --git a/test/index.html b/test/index.html
index 6ef3079c27..70bdcab6ac 100644
--- a/test/index.html
+++ b/test/index.html
@@ -16,6 +16,9 @@
   <script type="text/javascript" src="../node_modules/proj4/dist/proj4.js"></script>
   <script type="text/javascript" src="test-extensions.js"></script>
   <script>
+    if (typeof initMochaPhantomJS === 'function') {
+      initMochaPhantomJS()
+    }
     mocha.setup({
       ui: 'bdd',
       bail: false
@@ -43,25 +46,21 @@
      */
     goog.events.listen(this, 'test', function() {});
 
-    if (window.mochaPhantomJS) {
-      mochaPhantomJS.run();
-    } else {
-      var runner = mocha.run();
-      if (window.console && console.log) {
-        // write stacks to the console for failed tests
-        runner.on('fail', function(test, err) {
-          if (test.duration > test._timeout) {
-            var titles = [];
-            for (var p = test; p; p = p.parent) {
-              if (p.title) {
-                titles.unshift(p.title);
-              }
+    var runner = mocha.run();
+    if (window.console && console.log) {
+      // write stacks to the console for failed tests
+      runner.on('fail', function(test, err) {
+        if (test.duration > test._timeout) {
+          var titles = [];
+          for (var p = test; p; p = p.parent) {
+            if (p.title) {
+              titles.unshift(p.title);
             }
-            console.log('Test timed out:', titles.join(' > '));
           }
-          console.error(test.err.stack);
-        });
-      }
+          console.log('Test timed out:', titles.join(' > '));
+        }
+        console.error(test.err.stack);
+      });
     }
   </script>
   <!--
diff --git a/test/spec/ol/source/rastersource.test.js b/test/spec/ol/source/rastersource.test.js
index 0aa680f75f..4ea9ec4887 100644
--- a/test/spec/ol/source/rastersource.test.js
+++ b/test/spec/ol/source/rastersource.test.js
@@ -10,7 +10,7 @@ var blue = 'data:image/gif;base64,R0lGODlhAQABAPAAAAAA/////yH5BAAAAAAALAAAAA' +
     'ABAAEAAAICRAEAOw==';
 
 function itNoPhantom() {
-  if (window.mochaPhantomJS) {
+  if (window.initMochaPhantomJS) {
     return xit.apply(this, arguments);
   } else {
     return it.apply(this, arguments);