From 62efa057981267571c9841ad4523d9df7b3745af Mon Sep 17 00:00:00 2001 From: Hannah Wolfe Date: Wed, 17 Sep 2014 16:44:30 +0100 Subject: [PATCH] Updating dev dependencies refs #3795 - updates all dev dependencies to their latest version number - jshint now complains about the Promise global, removed it from predef in lieu of a better solution - changes in should require minor updates to the tests - tests are passing and all major grunt commands appear to work: clean, init, prod, validate and release --- .jshintrc | 3 +- core/test/.jshintrc | 3 +- core/test/functional/routes/api/posts_test.js | 6 +-- core/test/unit/apps_spec.js | 4 +- core/test/unit/filters_spec.js | 6 +-- package.json | 46 +++++++++---------- 6 files changed, 35 insertions(+), 33 deletions(-) diff --git a/.jshintrc b/.jshintrc index d3d8fe33ed..129152f27b 100644 --- a/.jshintrc +++ b/.jshintrc @@ -22,5 +22,6 @@ "trailing": true, "indent": 4, "onevar": true, - "white": true + "white": true, + "predef": [ "-Promise" ] } diff --git a/core/test/.jshintrc b/core/test/.jshintrc index 0830747358..bcc496e6c6 100644 --- a/core/test/.jshintrc +++ b/core/test/.jshintrc @@ -23,5 +23,6 @@ "indent": 4, "onevar": true, "white": true, - "quotmark": "single" + "quotmark": "single", + "predef": [ "-Promise" ] } diff --git a/core/test/functional/routes/api/posts_test.js b/core/test/functional/routes/api/posts_test.js index 9e83c43884..2a2fdbd29a 100644 --- a/core/test/functional/routes/api/posts_test.js +++ b/core/test/functional/routes/api/posts_test.js @@ -159,12 +159,12 @@ describe('Post API', function () { request.get(testUtils.API.getApiQuery('posts/1/')) .set('Authorization', 'Bearer ' + accesstoken) .expect('Content-Type', /json/) + .expect(200) .end(function (err, res) { if (err) { return done(err); } - res.should.have.status(200); should.not.exist(res.headers['x-cache-invalidate']); var jsonResponse = res.body; jsonResponse.should.exist; @@ -186,12 +186,12 @@ describe('Post API', function () { request.get(testUtils.API.getApiQuery('posts/slug/welcome-to-ghost/')) .set('Authorization', 'Bearer ' + accesstoken) .expect('Content-Type', /json/) + .expect(200) .end(function (err, res) { if (err) { return done(err); } - res.should.have.status(200); should.not.exist(res.headers['x-cache-invalidate']); var jsonResponse = res.body; jsonResponse.should.exist; @@ -212,12 +212,12 @@ describe('Post API', function () { request.get(testUtils.API.getApiQuery('posts/1/?include=author,tags,created_by')) .set('Authorization', 'Bearer ' + accesstoken) .expect('Content-Type', /json/) + .expect(200) .end(function (err, res) { if (err) { return done(err); } - res.should.have.status(200); should.not.exist(res.headers['x-cache-invalidate']); var jsonResponse = res.body; jsonResponse.should.exist; diff --git a/core/test/unit/apps_spec.js b/core/test/unit/apps_spec.js index a4093176a6..f51901c0ed 100644 --- a/core/test/unit/apps_spec.js +++ b/core/test/unit/apps_spec.js @@ -410,8 +410,8 @@ describe('Apps', function () { should.exist(AppPermissions.DefaultPermissions.posts); - AppPermissions.DefaultPermissions.posts.should.contain('browse'); - AppPermissions.DefaultPermissions.posts.should.contain('read'); + AppPermissions.DefaultPermissions.posts.should.containEql('browse'); + AppPermissions.DefaultPermissions.posts.should.containEql('read'); // Make it hurt to add more so additional checks are added here _.keys(AppPermissions.DefaultPermissions).length.should.equal(1); diff --git a/core/test/unit/filters_spec.js b/core/test/unit/filters_spec.js index 4be09dc003..c9ec45492a 100644 --- a/core/test/unit/filters_spec.js +++ b/core/test/unit/filters_spec.js @@ -32,7 +32,7 @@ describe('Filters', function () { should.exist(filters.filterCallbacks[filterName]); should.exist(filters.filterCallbacks[filterName][filterPriority]); - filters.filterCallbacks[filterName][filterPriority].should.include(testFilterHandler); + filters.filterCallbacks[filterName][filterPriority].should.containEql(testFilterHandler); }); it('can register filters with default priority', function () { @@ -45,7 +45,7 @@ describe('Filters', function () { should.exist(filters.filterCallbacks[filterName]); should.exist(filters.filterCallbacks[filterName][defaultPriority]); - filters.filterCallbacks[filterName][defaultPriority].should.include(testFilterHandler); + filters.filterCallbacks[filterName][defaultPriority].should.containEql(testFilterHandler); }); it('can register filters with priority null with default priority', function () { @@ -58,7 +58,7 @@ describe('Filters', function () { should.exist(filters.filterCallbacks[filterName]); should.exist(filters.filterCallbacks[filterName][defaultPriority]); - filters.filterCallbacks[filterName][defaultPriority].should.include(testFilterHandler); + filters.filterCallbacks[filterName][defaultPriority].should.containEql(testFilterHandler); }); it('executes filters in priority order', function (done) { diff --git a/package.json b/package.json index 0285dbb267..5a900ae6a3 100644 --- a/package.json +++ b/package.json @@ -71,36 +71,36 @@ "mysql": "2.1.1" }, "devDependencies": { - "blanket": "~1.1.5", - "bower": "~1.3.5", - "grunt": "~0.4.1", + "blanket": "~1.1.6", + "bower": "~1.3.10", + "grunt": "~0.4.5", "grunt-cli": "~0.1.13", "grunt-autoprefixer": "1.0.1", "grunt-concat-sourcemap": "~0.4.3", - "grunt-contrib-clean": "~0.5.0", - "grunt-contrib-compress": "~0.5.2", - "grunt-contrib-concat": "~0.4.0", - "grunt-contrib-copy": "~0.4.1", - "grunt-contrib-jshint": "~0.8.0", - "grunt-contrib-uglify": "~0.5.0", - "grunt-contrib-watch": "~0.5.3", + "grunt-contrib-clean": "~0.6.0", + "grunt-contrib-compress": "~0.11.0", + "grunt-contrib-concat": "~0.5.0", + "grunt-contrib-copy": "~0.5.0", + "grunt-contrib-jshint": "~0.10.0", + "grunt-contrib-uglify": "~0.5.1", + "grunt-contrib-watch": "~0.6.1", "grunt-docker": "~0.0.8", - "grunt-ember-templates": "~0.4.18", + "grunt-ember-templates": "~0.4.21", "grunt-es6-module-transpiler": "~0.6.0", - "grunt-express-server": "~0.4.11", - "grunt-mocha-cli": "~1.4.0", - "grunt-sass": "~0.14.0", - "grunt-shell": "~0.7.0", - "grunt-update-submodules": "~0.4.0", + "grunt-express-server": "~0.4.19", + "grunt-mocha-cli": "~1.10.0", + "grunt-sass": "~0.14.1", + "grunt-shell": "~1.1.1", + "grunt-update-submodules": "~0.4.1", "matchdep": "~0.3.0", - "mocha": "~1.15.1", - "nock": "0.27.2", - "rewire": "~2.0.0", - "request": "~2.29.0", + "mocha": "~1.21.4", + "nock": "0.47.0", + "request": "~2.42.0", "require-dir": "~0.1.0", - "should": "~2.1.1", - "sinon": "~1.7.3", - "supertest": "~0.8.2", + "rewire": "~2.1.0", + "should": "~4.0.4", + "sinon": "~1.10.3", + "supertest": "~0.13.0", "top-gh-contribs": "0.0.1" } }