Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-20 22:42:53 -05:00
Code Issues Activity

Merge pull request #4054 from ErisDS/dev-deps

Browse source 
Updating dev dependencies
This commit is contained in:
Matt Enlow 2014-09-17 13:05:07 -06:00
commit 692a82cb8f
6 changed files with 35 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.jshintrc
View file

@ -22,5 +22,6 @@
"trailing": true, "trailing": true,
"indent": 4, "indent": 4,
"onevar": true, "onevar": true,
"white": true "white": true,
"predef": [ "-Promise" ]
} }

3
core/test/.jshintrc
View file

@ -23,5 +23,6 @@
"indent": 4, "indent": 4,
"onevar": true, "onevar": true,
"white": true, "white": true,
"quotmark": "single" "quotmark": "single",
"predef": [ "-Promise" ]
} }

6
core/test/functional/routes/api/posts_test.js
View file

@ -159,12 +159,12 @@ describe('Post API', function () {
request.get(testUtils.API.getApiQuery('posts/1/')) request.get(testUtils.API.getApiQuery('posts/1/'))
.set('Authorization', 'Bearer ' + accesstoken) .set('Authorization', 'Bearer ' + accesstoken)
.expect('Content-Type', /json/) .expect('Content-Type', /json/)
.expect(200)
.end(function (err, res) { .end(function (err, res) {
if (err) { if (err) {
return done(err); return done(err);
} }
res.should.have.status(200);
should.not.exist(res.headers['x-cache-invalidate']); should.not.exist(res.headers['x-cache-invalidate']);
var jsonResponse = res.body; var jsonResponse = res.body;
jsonResponse.should.exist; jsonResponse.should.exist;
@ -186,12 +186,12 @@ describe('Post API', function () {
request.get(testUtils.API.getApiQuery('posts/slug/welcome-to-ghost/')) request.get(testUtils.API.getApiQuery('posts/slug/welcome-to-ghost/'))
.set('Authorization', 'Bearer ' + accesstoken) .set('Authorization', 'Bearer ' + accesstoken)
.expect('Content-Type', /json/) .expect('Content-Type', /json/)
.expect(200)
.end(function (err, res) { .end(function (err, res) {
if (err) { if (err) {
return done(err); return done(err);
} }
res.should.have.status(200);
should.not.exist(res.headers['x-cache-invalidate']); should.not.exist(res.headers['x-cache-invalidate']);
var jsonResponse = res.body; var jsonResponse = res.body;
jsonResponse.should.exist; jsonResponse.should.exist;
@ -212,12 +212,12 @@ describe('Post API', function () {
request.get(testUtils.API.getApiQuery('posts/1/?include=author,tags,created_by')) request.get(testUtils.API.getApiQuery('posts/1/?include=author,tags,created_by'))
.set('Authorization', 'Bearer ' + accesstoken) .set('Authorization', 'Bearer ' + accesstoken)
.expect('Content-Type', /json/) .expect('Content-Type', /json/)
.expect(200)
.end(function (err, res) { .end(function (err, res) {
if (err) { if (err) {
return done(err); return done(err);
} }
res.should.have.status(200);
should.not.exist(res.headers['x-cache-invalidate']); should.not.exist(res.headers['x-cache-invalidate']);
var jsonResponse = res.body; var jsonResponse = res.body;
jsonResponse.should.exist; jsonResponse.should.exist;

4
core/test/unit/apps_spec.js
View file

@ -410,8 +410,8 @@ describe('Apps', function () {
should.exist(AppPermissions.DefaultPermissions.posts); should.exist(AppPermissions.DefaultPermissions.posts);
AppPermissions.DefaultPermissions.posts.should.contain('browse'); AppPermissions.DefaultPermissions.posts.should.containEql('browse');
AppPermissions.DefaultPermissions.posts.should.contain('read'); AppPermissions.DefaultPermissions.posts.should.containEql('read');
// Make it hurt to add more so additional checks are added here // Make it hurt to add more so additional checks are added here
_.keys(AppPermissions.DefaultPermissions).length.should.equal(1); _.keys(AppPermissions.DefaultPermissions).length.should.equal(1);

6
core/test/unit/filters_spec.js
View file

@ -32,7 +32,7 @@ describe('Filters', function () {
should.exist(filters.filterCallbacks[filterName]); should.exist(filters.filterCallbacks[filterName]);
should.exist(filters.filterCallbacks[filterName][filterPriority]); 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 () { 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]);
should.exist(filters.filterCallbacks[filterName][defaultPriority]); 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 () { 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]);
should.exist(filters.filterCallbacks[filterName][defaultPriority]); 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) { it('executes filters in priority order', function (done) {

46
package.json
View file

@ -71,36 +71,36 @@
"mysql": "2.1.1" "mysql": "2.1.1"
}, },
"devDependencies": { "devDependencies": {
"blanket": "~1.1.5", "blanket": "~1.1.6",
"bower": "~1.3.5", "bower": "~1.3.10",
"grunt": "~0.4.1", "grunt": "~0.4.5",
"grunt-cli": "~0.1.13", "grunt-cli": "~0.1.13",
"grunt-autoprefixer": "1.0.1", "grunt-autoprefixer": "1.0.1",
"grunt-concat-sourcemap": "~0.4.3", "grunt-concat-sourcemap": "~0.4.3",
"grunt-contrib-clean": "~0.5.0", "grunt-contrib-clean": "~0.6.0",
"grunt-contrib-compress": "~0.5.2", "grunt-contrib-compress": "~0.11.0",
"grunt-contrib-concat": "~0.4.0", "grunt-contrib-concat": "~0.5.0",
"grunt-contrib-copy": "~0.4.1", "grunt-contrib-copy": "~0.5.0",
"grunt-contrib-jshint": "~0.8.0", "grunt-contrib-jshint": "~0.10.0",
"grunt-contrib-uglify": "~0.5.0", "grunt-contrib-uglify": "~0.5.1",
"grunt-contrib-watch": "~0.5.3", "grunt-contrib-watch": "~0.6.1",
"grunt-docker": "~0.0.8", "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-es6-module-transpiler": "~0.6.0",
"grunt-express-server": "~0.4.11", "grunt-express-server": "~0.4.19",
"grunt-mocha-cli": "~1.4.0", "grunt-mocha-cli": "~1.10.0",
"grunt-sass": "~0.14.0", "grunt-sass": "~0.14.1",
"grunt-shell": "~0.7.0", "grunt-shell": "~1.1.1",
"grunt-update-submodules": "~0.4.0", "grunt-update-submodules": "~0.4.1",
"matchdep": "~0.3.0", "matchdep": "~0.3.0",
"mocha": "~1.15.1", "mocha": "~1.21.4",
"nock": "0.27.2", "nock": "0.47.0",
"rewire": "~2.0.0", "request": "~2.42.0",
"request": "~2.29.0",
"require-dir": "~0.1.0", "require-dir": "~0.1.0",
"should": "~2.1.1", "rewire": "~2.1.0",
"sinon": "~1.7.3", "should": "~4.0.4",
"supertest": "~0.8.2", "sinon": "~1.10.3",
"supertest": "~0.13.0",
"top-gh-contribs": "0.0.1" "top-gh-contribs": "0.0.1"
} }
} }