mirror of
https://github.com/TryGhost/Ghost.git
synced 2025-02-03 23:00:14 -05:00
Fix test conflicts
Closes #6710 - Restore config to baseline before testing. - Don't mutate fixture data.
This commit is contained in:
parent
b2cdfb802f
commit
7559bb7b26
4 changed files with 27 additions and 9 deletions
|
@ -230,10 +230,10 @@ var _ = require('lodash'),
|
||||||
},
|
},
|
||||||
coverage_all: {
|
coverage_all: {
|
||||||
src: [
|
src: [
|
||||||
'core/test/unit',
|
|
||||||
'core/server/apps',
|
|
||||||
'core/test/integration',
|
'core/test/integration',
|
||||||
'core/test/functional'
|
'core/server/apps',
|
||||||
|
'core/test/functional',
|
||||||
|
'core/test/unit'
|
||||||
],
|
],
|
||||||
options: {
|
options: {
|
||||||
coverageFolder: 'core/test/coverage/all',
|
coverageFolder: 'core/test/coverage/all',
|
||||||
|
|
|
@ -232,6 +232,8 @@ describe('Channel Routes', function () {
|
||||||
}).catch(done);
|
}).catch(done);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
after(testUtils.teardown);
|
||||||
|
|
||||||
it('should 404 for /tag/ route', function (done) {
|
it('should 404 for /tag/ route', function (done) {
|
||||||
request.get('/tag/')
|
request.get('/tag/')
|
||||||
.expect('Cache-Control', testUtils.cacheRules.private)
|
.expect('Cache-Control', testUtils.cacheRules.private)
|
||||||
|
|
|
@ -17,6 +17,10 @@ var should = require('should'),
|
||||||
i18n.init();
|
i18n.init();
|
||||||
|
|
||||||
describe('Config', function () {
|
describe('Config', function () {
|
||||||
|
before(function () {
|
||||||
|
configUtils.restore();
|
||||||
|
});
|
||||||
|
|
||||||
afterEach(function () {
|
afterEach(function () {
|
||||||
configUtils.restore();
|
configUtils.restore();
|
||||||
});
|
});
|
||||||
|
|
|
@ -245,7 +245,9 @@ DataGenerator.forKnex = (function () {
|
||||||
clients;
|
clients;
|
||||||
|
|
||||||
function createBasic(overrides) {
|
function createBasic(overrides) {
|
||||||
return _.defaults(overrides, {
|
var newObj = _.cloneDeep(overrides);
|
||||||
|
|
||||||
|
return _.defaults(newObj, {
|
||||||
uuid: uuid.v4(),
|
uuid: uuid.v4(),
|
||||||
created_by: 1,
|
created_by: 1,
|
||||||
created_at: new Date(),
|
created_at: new Date(),
|
||||||
|
@ -255,7 +257,9 @@ DataGenerator.forKnex = (function () {
|
||||||
}
|
}
|
||||||
|
|
||||||
function createPost(overrides) {
|
function createPost(overrides) {
|
||||||
return _.defaults(overrides, {
|
var newObj = _.cloneDeep(overrides);
|
||||||
|
|
||||||
|
return _.defaults(newObj, {
|
||||||
uuid: uuid.v4(),
|
uuid: uuid.v4(),
|
||||||
status: 'published',
|
status: 'published',
|
||||||
html: overrides.markdown,
|
html: overrides.markdown,
|
||||||
|
@ -291,7 +295,9 @@ DataGenerator.forKnex = (function () {
|
||||||
}
|
}
|
||||||
|
|
||||||
function createUser(overrides) {
|
function createUser(overrides) {
|
||||||
return _.defaults(overrides, {
|
var newObj = _.cloneDeep(overrides);
|
||||||
|
|
||||||
|
return _.defaults(newObj, {
|
||||||
uuid: uuid.v4(),
|
uuid: uuid.v4(),
|
||||||
status: 'active',
|
status: 'active',
|
||||||
created_by: 1,
|
created_by: 1,
|
||||||
|
@ -316,7 +322,9 @@ DataGenerator.forKnex = (function () {
|
||||||
}
|
}
|
||||||
|
|
||||||
function createAppField(overrides) {
|
function createAppField(overrides) {
|
||||||
return _.defaults(overrides, {
|
var newObj = _.cloneDeep(overrides);
|
||||||
|
|
||||||
|
return _.defaults(newObj, {
|
||||||
uuid: uuid.v4(),
|
uuid: uuid.v4(),
|
||||||
created_by: 1,
|
created_by: 1,
|
||||||
created_at: new Date(),
|
created_at: new Date(),
|
||||||
|
@ -328,7 +336,9 @@ DataGenerator.forKnex = (function () {
|
||||||
}
|
}
|
||||||
|
|
||||||
function createAppSetting(overrides) {
|
function createAppSetting(overrides) {
|
||||||
return _.defaults(overrides, {
|
var newObj = _.cloneDeep(overrides);
|
||||||
|
|
||||||
|
return _.defaults(newObj, {
|
||||||
uuid: uuid.v4(),
|
uuid: uuid.v4(),
|
||||||
app_id: 1,
|
app_id: 1,
|
||||||
created_by: 1,
|
created_by: 1,
|
||||||
|
@ -337,7 +347,9 @@ DataGenerator.forKnex = (function () {
|
||||||
}
|
}
|
||||||
|
|
||||||
function createToken(overrides) {
|
function createToken(overrides) {
|
||||||
return _.defaults(overrides, {
|
var newObj = _.cloneDeep(overrides);
|
||||||
|
|
||||||
|
return _.defaults(newObj, {
|
||||||
token: uuid.v4(),
|
token: uuid.v4(),
|
||||||
client_id: 1,
|
client_id: 1,
|
||||||
expires: Date.now() + globalUtils.ONE_DAY_MS
|
expires: Date.now() + globalUtils.ONE_DAY_MS
|
||||||
|
|
Loading…
Add table
Reference in a new issue