Skip to content

Commit

Permalink
Update versions (#870)
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
fb55 authored Jun 12, 2016
1 parent e7d18af commit 79d4e5e
Show file tree
Hide file tree
Showing 6 changed files with 7,951 additions and 8,846 deletions.
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)'"
8 changes: 5 additions & 3 deletions benchmark/benchmark.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
},
Expand Down
Loading

0 comments on commit 79d4e5e

Please sign in to comment.