Navigation Menu

Skip to content

Commit

Permalink
Update devDependencies
Browse files Browse the repository at this point in the history
I've updated the devDependencies based on the output from
running the `npm outdated` command.

The only dependency I've left alone is on sinon. Going to
any version of sinon >1.10.3 breaks `behaviors.spec.js`
and I was not able to figure out exactly why as my experience
with sinon is very limited.

Wether you choose to merge or ignore this PR, at least now
you know ahead of time that there's an issue with it.
  • Loading branch information
ivarni authored and ahumphreys87 committed Mar 16, 2016
1 parent 22a88be commit 8407e13
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 30 deletions.
5 changes: 3 additions & 2 deletions .jscsrc
@@ -1,4 +1,5 @@
{
"preset": "google",
"maximumLineLength": 120
}
"maximumLineLength": 120,
"disallowSpaceAfterObjectKeys": false
}
46 changes: 23 additions & 23 deletions package.json
Expand Up @@ -46,36 +46,36 @@
"underscore": "1.4.4 - 1.8.3"
},
"devDependencies": {
"chai": "1.9.1",
"chai-jq": "0.0.7",
"chai-jquery": "1.2.1",
"chai": "3.4.1",
"chai-jq": "0.0.9",
"chai-jquery": "2.0.0",
"dox": "git://github.com/jasonLaster/dox.git#marked",
"grunt": "0.4.5",
"grunt-cli": "0.1.13",
"grunt-contrib-clean": "0.5.0",
"grunt-contrib-concat": "0.1.2",
"grunt-contrib-connect": "0.1.2",
"grunt-contrib-jshint": "0.10.0",
"grunt-contrib-uglify": "0.2.0",
"grunt-contrib-clean": "0.7.0",
"grunt-contrib-concat": "0.5.1",
"grunt-contrib-connect": "0.11.2",
"grunt-contrib-jshint": "0.11.3",
"grunt-contrib-uglify": "0.11.0",
"grunt-contrib-watch": "0.6.1",
"grunt-coveralls": "0.3.0",
"grunt-env": "0.4.1",
"grunt-istanbul": "0.3.0",
"grunt-jscs": "^1.5.0",
"grunt-lintspaces": "0.7.0",
"grunt-mocha-test": "0.10.2",
"grunt-plato": "0.1.4",
"grunt-preprocess": "4.0.0",
"grunt-coveralls": "1.0.0",
"grunt-env": "0.4.4",
"grunt-istanbul": "0.6.1",
"grunt-jscs": "2.6.0",
"grunt-lintspaces": "0.7.1",
"grunt-mocha-test": "0.12.7",
"grunt-plato": "1.2.1",
"grunt-preprocess": "5.0.1",
"grunt-template": "0.2.3",
"highlight.js": "8.2.0",
"jquery": "2.1.1",
"js-yaml": "3.1.0",
"jsdom": "2.0.0",
"load-grunt-tasks": "0.3.0",
"highlight.js": "9.1.0",
"jquery": "2.2.0",
"js-yaml": "3.5.2",
"jsdom": "7.2.2",
"load-grunt-tasks": "3.4.0",
"marked": "0.3",
"mocha": "1.19.0",
"mocha": "2.3.4",
"sinon": "1.10.3",
"sinon-chai": "2.5.0",
"sinon-chai": "2.8.0",
"unwrap": "0.1.0",
"grunt-yaml-validate": "~0.1.1"
}
Expand Down
2 changes: 1 addition & 1 deletion test/unit/behaviors.spec.js
Expand Up @@ -315,7 +315,7 @@ describe('Behaviors', function() {
});

it('should call onShow when already shown and reset', function() {
this.collection.reset([{id:1}, {id: 2}]);
this.collection.reset([{id: 1}, {id: 2}]);

expect(this.onShowStub.callCount).to.equal(3);
});
Expand Down
2 changes: 1 addition & 1 deletion test/unit/collection-view.spec.js
Expand Up @@ -75,7 +75,7 @@ describe('collection view', function() {
childView: undefined
});

this.collection = new Backbone.Collection([{foo:'bar'}, {foo: 'baz'}]);
this.collection = new Backbone.Collection([{foo: 'bar'}, {foo: 'baz'}]);
this.collectionView = new this.NoChildView({
collection: this.collection
});
Expand Down
5 changes: 2 additions & 3 deletions test/unit/setup/node.js
Expand Up @@ -12,15 +12,14 @@ global.sinon = sinon;

if (!global.document || !global.window) {
var jsdom = require('jsdom').jsdom;

global.document = jsdom('<html><head><script></script></head><body></body></html>', null, {
global.document = jsdom('<html><head><script></script></head><body></body></html>', {
FetchExternalResources : ['script'],
ProcessExternalResources : ['script'],
MutationEvents : '2.0',
QuerySelector : false
});

global.window = document.parentWindow;
global.window = document.defaultView;
global.navigator = global.window.navigator;

global.window.Node.prototype.contains = function (node) {
Expand Down

0 comments on commit 8407e13

Please sign in to comment.