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

Merge branch 'api-v3' into api-v3-user

Browse Source
This commit is contained in:
Blade Barringer
2015-11-21 09:20:44 -06:00
parent 5c33a404fb b3e9872f59
commit a54db44406
4 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tasks/gulp-eslint.js
View File

@@ -61,6 +61,7 @@ gulp.task('lint:tests', () => {
'expect': true, 'expect': true,
'_': true, '_': true,
'sinon': true, 'sinon': true,
'sandbox': true,
}, },
plugins: [ 'mocha' ], plugins: [ 'mocha' ],
}; };

7
test/common/user.fns.ultimateGear.test.js
View File

@@ -1,5 +1,8 @@
var shared = require('../../common/script/index.js'); /* eslint-disable camelcase */
shared.i18n.translations = require('../../website/src/libs/api-v2/i18n.js').translations
let shared = require('../../common/script/index.js');
shared.i18n.translations = require('../../website/src/libs/i18n.js').translations;
require('./test_helper'); require('./test_helper');

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

@@ -219,7 +219,7 @@ export function resetHabiticaDB () {
} }
function _requestMaker (user, method, additionalSets) { function _requestMaker (user, method, additionalSets) {
const API_V = process.env.API_VERSION || 'v2' const API_V = process.env.API_VERSION || 'v2'; // eslint-disable-line no-process-env
return (route, send, query) => { return (route, send, query) => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@@ -243,11 +243,20 @@ function _requestMaker(user, method, additionalSets) {
if (err) { if (err) {
if (!err.response) return reject(err); if (!err.response) return reject(err);
if (API_V === 'v3') {
return reject({ return reject({
code: err.status, code: err.status,
error: err.response.body.error, error: err.response.body.error,
message: err.response.body.message, message: err.response.body.message,
}); });
} else if (API_V === 'v2') {
return reject({
code: err.status,
text: err.response.body.err,
});
}
return reject(err);
} }
resolve(response.body); resolve(response.body);

5
test/helpers/api-unit.helper.js
View File

@@ -1,7 +1,7 @@
import '../../website/src/libs/api-v3/i18n'; import '../../website/src/libs/api-v3/i18n';
import { defaultsDeep as defaults } from 'lodash'; import { defaultsDeep as defaults } from 'lodash';
import { model as User } from '../../website/src/models/user' import { model as User } from '../../website/src/models/user';
import { model as Group } from '../../website/src/models/group' import { model as Group } from '../../website/src/models/group';
afterEach(() => { afterEach(() => {
sandbox.restore(); sandbox.restore();
@@ -19,6 +19,7 @@ export function generateRes(options={}) {
let defaultRes = { let defaultRes = {
send: sandbox.stub(), send: sandbox.stub(),
status: sandbox.stub().returnsThis(), status: sandbox.stub().returnsThis(),
sendStatus: sandbox.stub().returnsThis(),
json: sandbox.stub(), json: sandbox.stub(),
locals: { locals: {
user: generateUser(options.localsUser), user: generateUser(options.localsUser),