Upgrade dependencies

planetfederal · Nov 20, 2015 · 4cc1584 · 4cc1584
1 parent 3e6c552
commit 4cc1584
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 35 deletions.
diff --git a/.babelrc b/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["es2015"]
+}
diff --git a/package.json b/package.json
@@ -10,8 +10,8 @@
     "build:min": "node_modules/.bin/browserify -p browserify-header -p browserify-derequire -t babelify -p [minifyify --no-map] src/index.js --standalone ole -o dist/ole.js",
     "build:debug": "node_modules/.bin/browserify -p browserify-header -p browserify-derequire src/index.js --standalone ole -o dist/ole-debug.js",
     "build": "node_modules/.bin/npm-run-all --parallel build:min build:debug",
-    "lint": "eslint src",
-    "test": "phantomjs --ssl-protocol=any --ignore-ssl-errors=true ./node_modules/mocha-phantomjs/lib/mocha-phantomjs.coffee test/index.html"
+    "lint": "node_modules/.bin/eslint src",
+    "test": "node_modules/.bin/phantomjs node_modules/mocha-phantomjs-core/mocha-phantomjs-core.js test/index.html"
   },
   "repository": {
     "type": "git",
@@ -30,23 +30,24 @@
   },
   "homepage": "https://github.com/boundlessgeo/ole",
   "dependencies": {
-    "babelify": "^6.3.0"
+    "babelify": "7.2.0"
   },
   "devDependencies": {
-    "browserify": "^11.1.0",
-    "browserify-derequire": "^0.9.4",
-    "browserify-header": "^0.9.2",
-    "eslint": "^0.22.1",
+    "babel-preset-es2015": "^6.1.18",
+    "browserify": "12.0.1",
+    "browserify-derequire": "0.9.4",
+    "browserify-header": "0.9.2",
+    "eslint": "1.9.0",
     "expect.js": "0.3.1",
-    "fs-extra": "0.12.0",
-    "minifyify": "^7.0.6",
-    "mocha": "1.21.5",
-    "mocha-phantomjs": "3.5.1",
-    "npm-run-all": "^1.2.11",
-    "openlayers": "^3.10.1",
-    "phantomjs": "1.9.10",
-    "st": "^0.5.3",
-    "watchify": "^3.2.0"
+    "fs-extra": "0.26.2",
+    "minifyify": "7.1.0",
+    "mocha": "2.3.4",
+    "mocha-phantomjs-core": "1.3.0",
+    "npm-run-all": "1.3.1",
+    "openlayers": "3.11.2",
+    "phantomjs": "1.9.1 - 1.9.7-15",
+    "st": "1.0.0",
+    "watchify": "3.6.1"
   },
   "browserify": {
     "transform": [

diff --git a/test/index.html b/test/index.html
@@ -13,6 +13,9 @@
   <script src="../node_modules/openlayers/dist/ol.js"></script>
   <script src="../dist/ole.js"></script>
   <script>
+    if (typeof initMochaPhantomJS === 'function') {
+      initMochaPhantomJS()
+    }
     mocha.setup({
       ui: 'bdd',
       bail: false
@@ -22,26 +25,21 @@
   <script src="./test-helper-functions.js"></script>
   <script src="./load-tests.js"></script>
   <script>
-
-    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/StyleGenerator.test.js b/test/spec/StyleGenerator.test.js
@@ -1,5 +1,5 @@
 function itNoPhantom() {
-  if (window.mochaPhantomJS) {
+  if (window.checkForMocha) {
     return xit.apply(this, arguments);
   } else {
     return it.apply(this, arguments);