TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-25 11:55:03 +03:00
Code Issues Projects Releases Wiki Activity

Fix non-idempotent Ghost API helper

Browse Source 
- Add test
- Don't override apiUrl

closes #6239
This commit is contained in:
Fabian Becker 2015-12-18 10:15:24 +01:00 committed by Fabian Becker
parent 48bc031ac1
commit 9899f8d4e7
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/shared/ghost-url.js
View File

@ -30,7 +30,8 @@
url = {
api: function () {
var args = Array.prototype.slice.call(arguments),
queryOptions;
queryOptions,
requestUrl = apiUrl;
if (args.length && typeof args[args.length - 1] === 'object') {
queryOptions = args.pop();
@ -43,11 +44,11 @@
if (args.length) {
args.forEach(function (el) {
apiUrl += el.replace(/^\/|\/$/g, '') + '/';
requestUrl += el.replace(/^\/|\/$/g, '') + '/';
});
}
return apiUrl + generateQueryString(queryOptions);
return requestUrl + generateQueryString(queryOptions);
}
};

16
core/test/unit/ghost_url_spec.js
View File

@ -127,4 +127,20 @@ describe('Ghost Ajax Helper', function () {
rendered.should.match(/include=tags%2Ctests/);
rendered.should.match(/page=2/);
});
it('should be idempotent', function () {
configUtils.set({
url: 'https://testblog.com/blog/'
});
ghostUrl.init({
clientId: 'ghost-frontend',
clientSecret: 'notasecret',
url: configUtils.config.apiUrl()
});
var rendered = ghostUrl.url.api('posts', {limit: 3}),
rendered2 = ghostUrl.url.api('posts', {limit: 3});
rendered.should.equal(rendered2);
});
});