TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-28 22:43:30 +03:00
Code Issues Projects Releases Wiki Activity

deps: supertest@1.1.0

Browse Source 
Closes #6449
- supertest now includes a `.then()` method and as a
  result, only one of either .then or .end may be called on
  a request object.
This commit is contained in:
Jason Williams 2016-02-07 13:10:27 -06:00
parent bda942e20a
commit 2528ce5304
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/test/functional/routes/api/public_api_spec.js
View File

@ -25,7 +25,7 @@ describe('Public API', function () {
return testUtils.doAuth(request, 'posts', 'tags'); return testUtils.doAuth(request, 'posts', 'tags');
}).then(function (token) { }).then(function (token) {
// enable public API // enable public API
return request.put(testUtils.API.getApiQuery('settings/')) request.put(testUtils.API.getApiQuery('settings/'))
.set('Authorization', 'Bearer ' + token) .set('Authorization', 'Bearer ' + token)
.send(publicAPIaccessSetting) .send(publicAPIaccessSetting)
.expect('Content-Type', /json/) .expect('Content-Type', /json/)

8
core/test/utils/index.js
View File

@ -537,13 +537,9 @@ login = function login(request) {
password: user.password, password: user.password,
client_id: 'ghost-admin', client_id: 'ghost-admin',
client_secret: 'not_available' client_secret: 'not_available'
}).end(function (err, res) { }).then(function then(res) {
if (err) {
return reject(err);
}
resolve(res.body.access_token); resolve(res.body.access_token);
}); }, reject);
}); });
}; };

2
package.json
View File

@ -99,7 +99,7 @@
"rimraf-then": "^1.0.0", "rimraf-then": "^1.0.0",
"should": "6.0.3", "should": "6.0.3",
"sinon": "1.14.1", "sinon": "1.14.1",
"supertest": "1.0.1", "supertest": "1.1.0",
"testem": "0.8.3", "testem": "0.8.3",
"top-gh-contribs": "2.0.2" "top-gh-contribs": "2.0.2"
} }