Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix test conflicts #6712

Merged
merged 1 commit into from Apr 13, 2016
Merged

Fix test conflicts #6712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions Gruntfile.js
View file
Open in desktop
Expand Up @@ -230,10 +230,10 @@ var _ = require('lodash'),
},
coverage_all: {
src: [
'core/test/unit',
'core/server/apps',
'core/test/integration',
'core/test/functional'
'core/server/apps',
'core/test/functional',
'core/test/unit'

This comment was marked as abuse.

Sign in to view

],
options: {
coverageFolder: 'core/test/coverage/all',
Expand Down
2 changes: 2 additions & 0 deletions core/test/functional/routes/channel_spec.js
View file
Open in desktop
Expand Up @@ -232,6 +232,8 @@ describe('Channel Routes', function () {
}).catch(done);
});

after(testUtils.teardown);

it('should 404 for /tag/ route', function (done) {
request.get('/tag/')
.expect('Cache-Control', testUtils.cacheRules.private)
Expand Down
4 changes: 4 additions & 0 deletions core/test/unit/config_spec.js
View file
Open in desktop
Expand Up @@ -17,6 +17,10 @@ var should = require('should'),
i18n.init();

describe('Config', function () {
before(function () {
configUtils.restore();
});

afterEach(function () {
configUtils.restore();
});
Expand Down
24 changes: 18 additions & 6 deletions core/test/utils/fixtures/data-generator.js
View file
Open in desktop
Expand Up @@ -245,7 +245,9 @@ DataGenerator.forKnex = (function () {
clients;

function createBasic(overrides) {
return _.defaults(overrides, {
var newObj = _.cloneDeep(overrides);

return _.defaults(newObj, {
uuid: uuid.v4(),
created_by: 1,
created_at: new Date(),
Expand All @@ -255,7 +257,9 @@ DataGenerator.forKnex = (function () {
}

function createPost(overrides) {
return _.defaults(overrides, {
var newObj = _.cloneDeep(overrides);

return _.defaults(newObj, {
uuid: uuid.v4(),
status: 'published',
html: overrides.markdown,
Expand Down Expand Up @@ -291,7 +295,9 @@ DataGenerator.forKnex = (function () {
}

function createUser(overrides) {
return _.defaults(overrides, {
var newObj = _.cloneDeep(overrides);

return _.defaults(newObj, {
uuid: uuid.v4(),
status: 'active',
created_by: 1,
Expand All @@ -316,7 +322,9 @@ DataGenerator.forKnex = (function () {
}

function createAppField(overrides) {
return _.defaults(overrides, {
var newObj = _.cloneDeep(overrides);

return _.defaults(newObj, {
uuid: uuid.v4(),
created_by: 1,
created_at: new Date(),
Expand All @@ -328,7 +336,9 @@ DataGenerator.forKnex = (function () {
}

function createAppSetting(overrides) {
return _.defaults(overrides, {
var newObj = _.cloneDeep(overrides);

return _.defaults(newObj, {
uuid: uuid.v4(),
app_id: 1,
created_by: 1,
Expand All @@ -337,7 +347,9 @@ DataGenerator.forKnex = (function () {
}

function createToken(overrides) {
return _.defaults(overrides, {
var newObj = _.cloneDeep(overrides);

return _.defaults(newObj, {
token: uuid.v4(),
client_id: 1,
expires: Date.now() + globalUtils.ONE_DAY_MS
Expand Down