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

Merge pull request #6487 from ErisDS/app-fields

Browse source 
Don't include app fields
This commit is contained in:
Sebastian Gierlinger 2016-02-11 23:08:35 +01:00
commit 429223dc7f
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/server/controllers/frontend/fetch-data.js
View file

@ -19,7 +19,7 @@ queryDefaults = {
// Default post query needs to always include author & tags
_.extend(defaultPostQuery, queryDefaults, {
options: {
include: 'author,tags,fields'
include: 'author,tags'
}
});

6
core/server/controllers/frontend/index.js
View file

@ -108,7 +108,7 @@ frontendControllers = {
var params = {
uuid: req.params.uuid,
status: 'all',
include: 'author,tags,fields'
include: 'author,tags'
};
api.posts.read(params).then(function then(result) {
@ -160,8 +160,8 @@ frontendControllers = {
// Sanitize params we're going to use to lookup the post.
postLookup = _.pick(params, 'slug', 'id');
// Add author, tag and fields
postLookup.include = 'author,tags,fields';
// Add author & tag
postLookup.include = 'author,tags';
// Query database to find post
return api.posts.read(postLookup).then(function then(result) {

4
core/test/unit/controllers/frontend/fetch-data_spec.js
View file

@ -85,7 +85,7 @@ describe('fetchData', function () {
result.data.featured.should.not.have.properties('data');
apiPostsStub.calledTwice.should.be.true();
apiPostsStub.firstCall.args[0].should.have.property('include', 'author,tags,fields');
apiPostsStub.firstCall.args[0].should.have.property('include', 'author,tags');
apiPostsStub.firstCall.args[0].should.have.property('limit', 10);
apiPostsStub.secondCall.args[0].should.have.property('filter', 'featured:true');
apiPostsStub.secondCall.args[0].should.have.property('limit', 3);
@ -113,7 +113,7 @@ describe('fetchData', function () {
result.data.featured.should.not.have.properties('data');
apiPostsStub.calledTwice.should.be.true();
apiPostsStub.firstCall.args[0].should.have.property('include', 'author,tags,fields');
apiPostsStub.firstCall.args[0].should.have.property('include', 'author,tags');
apiPostsStub.firstCall.args[0].should.have.property('limit', 10);
apiPostsStub.firstCall.args[0].should.have.property('page', 2);
apiPostsStub.secondCall.args[0].should.have.property('filter', 'featured:true');

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

@ -284,7 +284,7 @@ describe('RSS', function () {
it('should process the data correctly for the index feed', function (done) {
res.send = function send(xmlData) {
apiBrowseStub.calledOnce.should.be.true();
apiBrowseStub.calledWith({page: 1, include: 'author,tags,fields'}).should.be.true();
apiBrowseStub.calledWith({page: 1, include: 'author,tags'}).should.be.true();
xmlData.should.match(/<channel><title><!\[CDATA\[Test\]\]><\/title>/);
done();
};
@ -304,7 +304,7 @@ describe('RSS', function () {
// test
res.send = function send(xmlData) {
apiBrowseStub.calledOnce.should.be.true();
apiBrowseStub.calledWith({page: 1, filter: 'tags:\'magic\'', include: 'author,tags,fields'}).should.be.true();
apiBrowseStub.calledWith({page: 1, filter: 'tags:\'magic\'', include: 'author,tags'}).should.be.true();
apiTagStub.calledOnce.should.be.true();
xmlData.should.match(/<channel><title><!\[CDATA\[Magic - Test\]\]><\/title>/);
done();
@ -322,7 +322,7 @@ describe('RSS', function () {
// test
res.send = function send(xmlData) {
apiBrowseStub.calledOnce.should.be.true();
apiBrowseStub.calledWith({page: 1, filter: 'author:\'joe\'', include: 'author,tags,fields'}).should.be.true();
apiBrowseStub.calledWith({page: 1, filter: 'author:\'joe\'', include: 'author,tags'}).should.be.true();
apiUserStub.calledOnce.should.be.true();
xmlData.should.match(/<channel><title><!\[CDATA\[Joe Blogs - Test\]\]><\/title>/);
done();