Update versions (#870)

- move jsdom to devDependencies
- fix issues with benchmark upgrade
- run benchmark on travis and test on node@6
- update benchmark jQuery to 3.0.0

Author: fb55

.travis.yml

@@ -2,12 +2,14 @@ language: node_js
 node_js:
   - "stable"
   - "unstable"
-  - "4.2"
-  - "4.1"
+  - "6"
   - "4"
   - "0.12"
 script: make travis-test
 matrix:
   fast_finish: true
   allow_failures:
-    - node_js: "unstable"
+    - node_js: unstable
+  include:
+    - env: BENCHMARK=true
+      script: "node benchmark/benchmark.js --regex '^(?!.*highmem)'"

benchmark/benchmark.js

@@ -33,23 +33,25 @@ suites.add('manipulation - append', 'jquery.html', {
     $body.append(new Array(50).join('<div>'));
   }
 });
-suites.add('manipulation - prepend', 'jquery.html', {
+
+// These tests run out of memory in jsdom
+suites.add('manipulation - prepend - highmem', 'jquery.html', {
   setup: function($) {
     return $('body');
   },
   test: function($, $body) {
     $body.prepend(new Array(50).join('<div>'));
   }
 });
-suites.add('manipulation - after', 'jquery.html', {
+suites.add('manipulation - after - highmem', 'jquery.html', {
   setup: function($) {
     return $('body');
   },
   test: function($, $body) {
     $body.after(new Array(50).join('<div>'));
   }
 });
-suites.add('manipulation - before', 'jquery.html', {
+suites.add('manipulation - before - highmem', 'jquery.html', {
   setup: function($) {
     return $('body');
   },

benchmark/jquery-2.0.3.js

@@ -6,7 +6,7 @@ var jsdom = require('jsdom');
 var cheerio = require('..');
 
 var documentDir = path.join(__dirname, 'documents');
-var jQuerySrc = path.join(__dirname, 'jquery-2.0.3.js');
+var jQuerySrc = path.join(__dirname, 'jquery-3.0.0.slim.js');
 var filterRe = /./;
 var cheerioOnly = false;
 
@@ -48,7 +48,7 @@ Suites.prototype.add = function(name, fileName, options) {
       console.log();
       return;
     }
-    console.log('\tFastest: ' + this.filter('fastest').pluck('name') + '\n');
+    console.log('\tFastest: ' + this.filter('fastest')[0].name + '\n');
   });
 
   this._benchCheerio(suite, markup, options);

benchmark/jquery-3.0.0.slim.js

@@ -28,7 +28,7 @@
     "css-select": "~1.2.0",
     "dom-serializer": "~0.1.0",
     "entities": "~1.1.1",
-    "htmlparser2": "~3.8.1",
+    "htmlparser2": "^3.9.1",
     "lodash.assignin": "^4.0.9",
     "lodash.bind": "^4.1.4",
     "lodash.defaults": "^4.0.1",
@@ -43,18 +43,16 @@
     "lodash.some": "^4.4.0"
   },
   "devDependencies": {
-    "benchmark": "~1.0.0",
-    "coveralls": "~2.10",
+    "benchmark": "^2.1.0",
+    "coveralls": "^2.11.9",
     "expect.js": "~0.3.1",
-    "istanbul": "~0.2",
-    "jshint": "~2.5.1",
-    "mocha": "*",
+    "istanbul": "^0.4.3",
+    "jsdom": "^9.2.1",
+    "jshint": "^2.9.2",
+    "mocha": "^2.5.3",
     "xyz": "~0.5.0"
   },
   "scripts": {
     "test": "make test"
-  },
-  "optionalDependencies": {
-    "jsdom": "^7.0.2"
   }
 }