krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 07:07:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update requester to take in additional set parameters.

Browse Source
This commit is contained in:
Blade Barringer
2015-11-04 17:40:10 -06:00
parent 7f189bebba
commit 8618716ca4
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/helpers/api-integration.helper.js
View File

@@ -16,12 +16,12 @@ const API_TEST_SERVER_PORT = 3003;
// Sets up an abject that can make all REST requests // Sets up an abject that can make all REST requests
// If a user is passed in, the uuid and api token of // If a user is passed in, the uuid and api token of
// the user are used to make the requests // the user are used to make the requests
export function requester(user={}) { export function requester(user={}, additionalSets) {
return { return {
get: _requestMaker(user, 'get'), get: _requestMaker(user, 'get', additionalSets),
post: _requestMaker(user, 'post'), post: _requestMaker(user, 'post', additionalSets),
put: _requestMaker(user, 'put'), put: _requestMaker(user, 'put', additionalSets),
del: _requestMaker(user, 'del'), del: _requestMaker(user, 'del', additionalSets),
} }
}; };
@@ -207,18 +207,22 @@ export function resetHabiticaDB() {
}); });
} }
function _requestMaker(user, method) { function _requestMaker(user, method, additionalSets) {
return (route, send, query) => { return (route, send, query) => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let request = superagent[method](`http://localhost:${API_TEST_SERVER_PORT}/api/v2${route}`) let request = superagent[method](`http://localhost:${API_TEST_SERVER_PORT}/api/v2${route}`)
.accept('application/json'); .accept('application/json');
if (user._id && user.apiToken) { if (user && user._id && user.apiToken) {
request request
.set('x-api-user', user._id) .set('x-api-user', user._id)
.set('x-api-key', user.apiToken); .set('x-api-key', user.apiToken);
} }
if (additionalSets) {
request.set(additionalSets);
}
request request
.query(query) .query(query)
.send(send) .send(send)