tests(api): Port integration helper to v3 version for groups tests

This commit is contained in:
Blade Barringer
2016-01-13 12:39:23 -06:00
parent 799b3780b1
commit 1f4e58e5cc
9 changed files with 37 additions and 19 deletions

View File

@@ -2,7 +2,7 @@ import {
generateUser, generateUser,
generateGroup, generateGroup,
translate as t, translate as t,
} from '../../../../helpers/api-integration.helper'; } from '../../../../helpers/api-v3-integration.helper';
describe('GET /groups/:groupId/chat', () => { describe('GET /groups/:groupId/chat', () => {
let user; let user;

View File

@@ -1,7 +1,7 @@
import { import {
generateUser, generateUser,
translate as t, translate as t,
} from '../../../../helpers/api-integration.helper'; } from '../../../../helpers/api-v3-integration.helper';
import { find } from 'lodash'; import { find } from 'lodash';
describe('POST /chat/:chatId/flag', () => { describe('POST /chat/:chatId/flag', () => {

View File

@@ -1,7 +1,7 @@
import { import {
generateUser, generateUser,
translate as t, translate as t,
} from '../../../../helpers/api-integration.helper'; } from '../../../../helpers/api-v3-integration.helper';
import { find } from 'lodash'; import { find } from 'lodash';
describe('POST /chat/:chatId/like', () => { describe('POST /chat/:chatId/like', () => {

View File

@@ -1,7 +1,7 @@
import { import {
generateUser, generateUser,
translate as t, translate as t,
} from '../../../../helpers/api-integration.helper'; } from '../../../../helpers/api-v3-integration.helper';
describe('POST /chat', () => { describe('POST /chat', () => {
let user; let user;

View File

@@ -1,7 +1,7 @@
import { import {
generateUser, generateUser,
translate as t, translate as t,
} from '../../../../helpers/api-integration.helper'; } from '../../../../helpers/api-v3-integration.helper';
describe('POST /group', () => { describe('POST /group', () => {
let user; let user;

View File

@@ -1,7 +1,7 @@
import { import {
generateUser, generateUser,
translate as t, translate as t,
} from '../../../../helpers/api-integration.helper'; } from '../../../../helpers/api-v3-integration.helper';
import { v4 as generateUUID } from 'uuid'; import { v4 as generateUUID } from 'uuid';
describe('POST /group/:groupId/join', () => { describe('POST /group/:groupId/join', () => {

View File

@@ -1,7 +1,7 @@
import { import {
generateUser, generateUser,
translate as t, translate as t,
} from '../../../../helpers/api-integration.helper'; } from '../../../../helpers/api-v3-integration.helper';
import { v4 as generateUUID } from 'uuid'; import { v4 as generateUUID } from 'uuid';
const INVITES_LIMIT = 100; const INVITES_LIMIT = 100;

View File

@@ -1,7 +1,7 @@
import { import {
generateUser, generateUser,
translate as t, translate as t,
} from '../../../../helpers/api-integration.helper'; } from '../../../../helpers/api-v3-integration.helper';
describe('PUT /group', () => { describe('PUT /group', () => {
let groupLeader; let groupLeader;

View File

@@ -14,6 +14,15 @@ import i18n from '../../common/script/src/i18n';
i18n.translations = require('../../website/src/libs/api-v3/i18n').translations; i18n.translations = require('../../website/src/libs/api-v3/i18n').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) {
@@ -96,7 +105,7 @@ export function generateUser (update = {}) {
let request = _requestMaker({}, 'post'); let request = _requestMaker({}, 'post');
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
request('/user/auth/local/register', { request(ROUTES[API_V].register, {
username, username,
email, email,
password, password,
@@ -114,15 +123,15 @@ export function generateUser (update = {}) {
// Generates a new group. Requires a user object, which // Generates a new group. Requires a user object, which
// will will become the groups leader. Takes an update // will will become the groups leader. Takes an update
// argument which will update group // argument which will update group
export function generateGroup (leader, update = {}) { export function generateGroup (leader, details = {}, update = {}) {
let request = _requestMaker(leader, 'post'); let request = _requestMaker(leader, 'post');
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
request('/groups').then((group) => { request('/groups', details).then((group) => {
_updateDocument('groups', group, update, () => { _updateDocument('groups', group, update, () => {
resolve(group); resolve(group);
}).catch(reject);
}); });
}).catch(reject);
}); });
} }
@@ -241,7 +250,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/v3${route}`) let request = superagent[method](`http://localhost:${API_TEST_SERVER_PORT}/api/${API_V}${route}`)
.accept('application/json'); .accept('application/json');
if (user && user._id && user.apiToken) { if (user && user._id && user.apiToken) {
@@ -261,11 +270,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);