Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-03-11 02:12:21 -05:00
Code Issues Activity

improvement: rename and extend test utils fixture functions

Browse source 
no issue
- rename insertPosts to insertPostsAndTags
- add insertPosts
- extend insertOne to choose index
This commit is contained in:
kirrg001 2016-06-10 07:12:46 +02:00
parent 6826a6516b
commit b057c2fc16
4 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/test/functional/routes/channel_spec.js
View file

@ -134,7 +134,7 @@ describe('Channel Routes', function () {
// we then insert with max 11 which ensures we have 16 published posts // we then insert with max 11 which ensures we have 16 published posts
before(function (done) { before(function (done) {
testUtils.initData().then(function () { testUtils.initData().then(function () {
return testUtils.fixtures.insertPosts(); return testUtils.fixtures.insertPostsAndTags();
}).then(function () { }).then(function () {
return testUtils.fixtures.insertMorePosts(11); return testUtils.fixtures.insertMorePosts(11);
}).then(function () { }).then(function () {
@ -280,7 +280,7 @@ describe('Channel Routes', function () {
// Add enough posts to trigger pages // Add enough posts to trigger pages
before(function (done) { before(function (done) {
testUtils.initData().then(function () { testUtils.initData().then(function () {
return testUtils.fixtures.insertPosts(); return testUtils.fixtures.insertPostsAndTags();
}).then(function () { }).then(function () {
return testUtils.fixtures.insertMorePosts(22); return testUtils.fixtures.insertMorePosts(22);
}).then(function () { }).then(function () {
@ -451,7 +451,7 @@ describe('Channel Routes', function () {
}).then(function () { }).then(function () {
return testUtils.fixtures.overrideOwnerUser('ghost-owner'); return testUtils.fixtures.overrideOwnerUser('ghost-owner');
}).then(function () { }).then(function () {
return testUtils.fixtures.insertPosts(); return testUtils.fixtures.insertPostsAndTags();
}).then(function () { }).then(function () {
return testUtils.fixtures.insertMorePosts(9); return testUtils.fixtures.insertMorePosts(9);
}).then(function () { }).then(function () {

4
core/test/functional/routes/frontend_spec.js
View file

@ -31,7 +31,7 @@ describe('Frontend Routing', function () {
function addPosts(done) { function addPosts(done) {
testUtils.initData().then(function () { testUtils.initData().then(function () {
return testUtils.fixtures.insertPosts(); return testUtils.fixtures.insertPostsAndTags();
}).then(function () { }).then(function () {
done(); done();
}); });
@ -570,7 +570,7 @@ describe('Frontend Routing', function () {
describe('Site Map', function () { describe('Site Map', function () {
before(function (done) { before(function (done) {
testUtils.initData().then(function () { testUtils.initData().then(function () {
return testUtils.fixtures.insertPosts(); return testUtils.fixtures.insertPostsAndTags();
}).then(function () { }).then(function () {
done(); done();
}).catch(done); }).catch(done);

6
core/test/integration/model/model_tags_spec.js
View file

@ -47,7 +47,7 @@ describe('Tag Model', function () {
}); });
it('returns count.posts if include count.posts', function (done) { it('returns count.posts if include count.posts', function (done) {
testUtils.fixtures.insertPosts().then(function () { testUtils.fixtures.insertPostsAndTags().then(function () {
TagModel.findOne({slug: 'kitchen-sink'}, {include: 'count.posts'}).then(function (tag) { TagModel.findOne({slug: 'kitchen-sink'}, {include: 'count.posts'}).then(function (tag) {
should.exist(tag); should.exist(tag);
tag.toJSON().count.posts.should.equal(2); tag.toJSON().count.posts.should.equal(2);
@ -59,7 +59,7 @@ describe('Tag Model', function () {
describe('findPage', function () { describe('findPage', function () {
beforeEach(function (done) { beforeEach(function (done) {
testUtils.fixtures.insertPosts().then(function () { testUtils.fixtures.insertPostsAndTags().then(function () {
done(); done();
}).catch(done); }).catch(done);
}); });
@ -90,7 +90,7 @@ describe('Tag Model', function () {
describe('findOne', function () { describe('findOne', function () {
beforeEach(function (done) { beforeEach(function (done) {
testUtils.fixtures.insertPosts().then(function () { testUtils.fixtures.insertPostsAndTags().then(function () {
done(); done();
}).catch(done); }).catch(done);
}); });

12
core/test/utils/index.js
View file

@ -33,7 +33,11 @@ var Promise = require('bluebird'),
/** TEST FIXTURES **/ /** TEST FIXTURES **/
fixtures = { fixtures = {
insertPosts: function insertPosts() { insertPosts: function insertPosts(posts) {
return Promise.resolve(db.knex('posts').insert(posts));
},
insertPostsAndTags: function insertPosts() {
return Promise.resolve(db.knex('posts').insert(DataGenerator.forKnex.posts)).then(function () { return Promise.resolve(db.knex('posts').insert(DataGenerator.forKnex.posts)).then(function () {
return db.knex('tags').insert(DataGenerator.forKnex.tags); return db.knex('tags').insert(DataGenerator.forKnex.tags);
}).then(function () { }).then(function () {
@ -278,9 +282,9 @@ fixtures = {
}); });
}, },
insertOne: function insertOne(obj, fn) { insertOne: function insertOne(obj, fn, index) {
return db.knex(obj) return db.knex(obj)
.insert(DataGenerator.forKnex[fn](DataGenerator.Content[obj][0])); .insert(DataGenerator.forKnex[fn](DataGenerator.Content[obj][index || 0]));
}, },
insertApps: function insertApps() { insertApps: function insertApps() {
@ -399,7 +403,7 @@ toDoList = {
tag: function insertTag() { return fixtures.insertOne('tags', 'createTag'); }, tag: function insertTag() { return fixtures.insertOne('tags', 'createTag'); },
subscriber: function insertSubscriber() { return fixtures.insertOne('subscribers', 'createSubscriber'); }, subscriber: function insertSubscriber() { return fixtures.insertOne('subscribers', 'createSubscriber'); },
posts: function insertPosts() { return fixtures.insertPosts(); }, posts: function insertPosts() { return fixtures.insertPostsAndTags(); },
'posts:mu': function insertMultiAuthorPosts() { return fixtures.insertMultiAuthorPosts(); }, 'posts:mu': function insertMultiAuthorPosts() { return fixtures.insertMultiAuthorPosts(); },
tags: function insertMoreTags() { return fixtures.insertMoreTags(); }, tags: function insertMoreTags() { return fixtures.insertMoreTags(); },
apps: function insertApps() { return fixtures.insertApps(); }, apps: function insertApps() { return fixtures.insertApps(); },