mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-19 15:48:04 +01:00
tests: Remove references to different api routes in helper
This commit is contained in:
@@ -14,15 +14,6 @@ import i18n from '../../common/script/src/i18n';
|
|||||||
i18n.translations = require('../../website/src/libs/i18n.js').translations;
|
i18n.translations = require('../../website/src/libs/i18n.js').translations;
|
||||||
|
|
||||||
const API_TEST_SERVER_PORT = 3003;
|
const API_TEST_SERVER_PORT = 3003;
|
||||||
const API_V = process.env.API_VERSION || 'v2'; // eslint-disable-line no-process-env
|
|
||||||
const ROUTES = {
|
|
||||||
v2: {
|
|
||||||
register: '/register',
|
|
||||||
},
|
|
||||||
v3: {
|
|
||||||
register: '/user/auth/local/register',
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
class ApiUser {
|
class ApiUser {
|
||||||
constructor (options) {
|
constructor (options) {
|
||||||
@@ -116,7 +107,7 @@ export async function generateUser (update = {}) {
|
|||||||
|
|
||||||
let request = _requestMaker({}, 'post');
|
let request = _requestMaker({}, 'post');
|
||||||
|
|
||||||
let user = await request(ROUTES[API_V].register, {
|
let user = await request('/register', {
|
||||||
username,
|
username,
|
||||||
email,
|
email,
|
||||||
password,
|
password,
|
||||||
@@ -257,7 +248,7 @@ export function resetHabiticaDB () {
|
|||||||
function _requestMaker (user, method, additionalSets) {
|
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/${API_V}${route}`)
|
let request = superagent[method](`http://localhost:${API_TEST_SERVER_PORT}/api/v2${route}`)
|
||||||
.accept('application/json');
|
.accept('application/json');
|
||||||
|
|
||||||
if (user && user._id && user.apiToken) {
|
if (user && user._id && user.apiToken) {
|
||||||
@@ -277,22 +268,12 @@ 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({
|
|
||||||
code: err.status,
|
|
||||||
error: err.response.body.error,
|
|
||||||
message: err.response.body.message,
|
|
||||||
});
|
|
||||||
} else if (API_V === 'v2') {
|
|
||||||
return reject({
|
return reject({
|
||||||
code: err.status,
|
code: err.status,
|
||||||
text: err.response.body.err,
|
text: err.response.body.err,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return reject(err);
|
|
||||||
}
|
|
||||||
|
|
||||||
resolve(response.body);
|
resolve(response.body);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user