mirror of
https://github.com/TryGhost/Ghost.git
synced 2025-01-20 22:42:53 -05:00
Node v0.12 & io.js support.
fixes #4811, refs #4240 - Add v0.12 to the build - Fix express tests to work with iojs/0.12 - Add iojs-v1.2.0 to the build matrix
This commit is contained in:
parent
1ca96a8508
commit
47e16df196
4 changed files with 33 additions and 25 deletions
|
@ -1,6 +1,8 @@
|
||||||
language: node_js
|
language: node_js
|
||||||
node_js:
|
node_js:
|
||||||
- "0.10"
|
- "0.10"
|
||||||
|
- "0.12"
|
||||||
|
- "iojs-v1.2.0"
|
||||||
sudo: false
|
sudo: false
|
||||||
cache:
|
cache:
|
||||||
directories:
|
directories:
|
||||||
|
|
|
@ -46,7 +46,8 @@ GhostServer.prototype.closeConnections = function () {
|
||||||
|
|
||||||
GhostServer.prototype.logStartMessages = function () {
|
GhostServer.prototype.logStartMessages = function () {
|
||||||
// Tell users if their node version is not supported, and exit
|
// Tell users if their node version is not supported, and exit
|
||||||
if (!semver.satisfies(process.versions.node, packageInfo.engines.node)) {
|
if (!semver.satisfies(process.versions.node, packageInfo.engines.node) &&
|
||||||
|
!semver.satisfies(process.versions.node, packageInfo.engines.iojs)) {
|
||||||
console.log(
|
console.log(
|
||||||
'\nERROR: Unsupported version of Node'.red,
|
'\nERROR: Unsupported version of Node'.red,
|
||||||
'\nGhost needs Node version'.red,
|
'\nGhost needs Node version'.red,
|
||||||
|
|
|
@ -326,11 +326,6 @@ describe('Error handling', function () {
|
||||||
options.code.should.equal(404);
|
options.code.should.equal(404);
|
||||||
this.statusCode.should.equal(404);
|
this.statusCode.should.equal(404);
|
||||||
|
|
||||||
// Test that the headers are correct
|
|
||||||
this._headers['cache-control'].should.equal(
|
|
||||||
'no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0'
|
|
||||||
);
|
|
||||||
|
|
||||||
done();
|
done();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -339,6 +334,12 @@ describe('Error handling', function () {
|
||||||
return res;
|
return res;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
sandbox.stub(res, 'set', function (value) {
|
||||||
|
// Test that the headers are correct
|
||||||
|
value['Cache-Control'].should.eql('no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0');
|
||||||
|
return res;
|
||||||
|
});
|
||||||
|
|
||||||
errors.error404(req, res, done);
|
errors.error404(req, res, done);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -356,11 +357,6 @@ describe('Error handling', function () {
|
||||||
options.code.should.equal(404);
|
options.code.should.equal(404);
|
||||||
this.statusCode.should.equal(404);
|
this.statusCode.should.equal(404);
|
||||||
|
|
||||||
// Test that the headers are correct
|
|
||||||
this._headers['cache-control'].should.equal(
|
|
||||||
'no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0'
|
|
||||||
);
|
|
||||||
|
|
||||||
done();
|
done();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -369,6 +365,12 @@ describe('Error handling', function () {
|
||||||
return res;
|
return res;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
sandbox.stub(res, 'set', function (value) {
|
||||||
|
// Test that the headers are correct
|
||||||
|
value['Cache-Control'].should.eql('no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0');
|
||||||
|
return res;
|
||||||
|
});
|
||||||
|
|
||||||
err.status = 404;
|
err.status = 404;
|
||||||
errors.error500(err, req, res, null);
|
errors.error500(err, req, res, null);
|
||||||
});
|
});
|
||||||
|
@ -387,14 +389,15 @@ describe('Error handling', function () {
|
||||||
options.code.should.equal(500);
|
options.code.should.equal(500);
|
||||||
this.statusCode.should.equal(500);
|
this.statusCode.should.equal(500);
|
||||||
|
|
||||||
// Test that the headers are correct
|
|
||||||
this._headers['cache-control'].should.equal(
|
|
||||||
'no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0'
|
|
||||||
);
|
|
||||||
|
|
||||||
done();
|
done();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
sandbox.stub(res, 'set', function (value) {
|
||||||
|
// Test that the headers are correct
|
||||||
|
value['Cache-Control'].should.eql('no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0');
|
||||||
|
return res;
|
||||||
|
});
|
||||||
|
|
||||||
sandbox.stub(express.response, 'status', function (status) {
|
sandbox.stub(express.response, 'status', function (status) {
|
||||||
res.statusCode = status;
|
res.statusCode = status;
|
||||||
return res;
|
return res;
|
||||||
|
@ -417,11 +420,6 @@ describe('Error handling', function () {
|
||||||
options.code.should.equal(500);
|
options.code.should.equal(500);
|
||||||
this.statusCode.should.equal(500);
|
this.statusCode.should.equal(500);
|
||||||
|
|
||||||
// Test that the headers are correct
|
|
||||||
this._headers['cache-control'].should.equal(
|
|
||||||
'no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0'
|
|
||||||
);
|
|
||||||
|
|
||||||
done();
|
done();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -430,6 +428,12 @@ describe('Error handling', function () {
|
||||||
return res;
|
return res;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
sandbox.stub(res, 'set', function (value) {
|
||||||
|
// Test that the headers are correct
|
||||||
|
value['Cache-Control'].should.eql('no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0');
|
||||||
|
return res;
|
||||||
|
});
|
||||||
|
|
||||||
err.code = 500;
|
err.code = 500;
|
||||||
errors.error500(err, req, res, null);
|
errors.error500(err, req, res, null);
|
||||||
});
|
});
|
||||||
|
|
|
@ -27,7 +27,8 @@
|
||||||
"test": "./node_modules/.bin/grunt validate --verbose"
|
"test": "./node_modules/.bin/grunt validate --verbose"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": "~0.10.0"
|
"node": "~0.10.0 || ~0.12.0",
|
||||||
|
"iojs": "~1.2.0"
|
||||||
},
|
},
|
||||||
"engineStrict": true,
|
"engineStrict": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
@ -46,7 +47,7 @@
|
||||||
"extract-zip": "1.0.3",
|
"extract-zip": "1.0.3",
|
||||||
"fs-extra": "0.13.0",
|
"fs-extra": "0.13.0",
|
||||||
"glob": "4.3.2",
|
"glob": "4.3.2",
|
||||||
"html-to-text": "1.0.0",
|
"html-to-text": "1.2.0",
|
||||||
"knex": "0.7.3",
|
"knex": "0.7.3",
|
||||||
"lodash": "2.4.1",
|
"lodash": "2.4.1",
|
||||||
"moment": "2.8.3",
|
"moment": "2.8.3",
|
||||||
|
@ -62,7 +63,7 @@
|
||||||
"rss": "1.0.0",
|
"rss": "1.0.0",
|
||||||
"semver": "4.1.0",
|
"semver": "4.1.0",
|
||||||
"showdown-ghost": "0.3.4",
|
"showdown-ghost": "0.3.4",
|
||||||
"sqlite3": "3.0.4",
|
"sqlite3": "3.0.5",
|
||||||
"unidecode": "0.1.3",
|
"unidecode": "0.1.3",
|
||||||
"validator": "3.28.0",
|
"validator": "3.28.0",
|
||||||
"xml": "0.0.12"
|
"xml": "0.0.12"
|
||||||
|
@ -91,7 +92,7 @@
|
||||||
"grunt-express-server": "~0.4.19",
|
"grunt-express-server": "~0.4.19",
|
||||||
"grunt-jscs": "~1.2.0",
|
"grunt-jscs": "~1.2.0",
|
||||||
"grunt-mocha-cli": "~1.11.0",
|
"grunt-mocha-cli": "~1.11.0",
|
||||||
"grunt-sass": "~0.17.0",
|
"grunt-sass": "~0.18.0",
|
||||||
"grunt-shell": "~1.1.1",
|
"grunt-shell": "~1.1.1",
|
||||||
"grunt-update-submodules": "~0.4.1",
|
"grunt-update-submodules": "~0.4.1",
|
||||||
"matchdep": "~0.3.0",
|
"matchdep": "~0.3.0",
|
||||||
|
|
Loading…
Add table
Reference in a new issue