Merge branch 'develop' into flag_messages_in_api

test/api/v2/README.md

@@ -19,15 +19,15 @@ $ npm install -g gulp
 To run the api tests, make sure the mongo db is up and running and then type this on the command line:
 
 ```bash
-$ gulp test:api
+$ gulp test:api-v2
 ```
 
 It may take a little while to get going, since it requires the web server to start up before the tests can run.
 
-You can also run a watch command for the api tests. This will allow the tests to re-run automatically when you make changes in the `/test/api/` or `/website/src/` directories.
+You can also run a watch command for the api tests. This will allow the tests to re-run automatically when you make changes in the `/test/api/v2/`.
 
 ```bash
-$ gulp test:api:watch
+$ gulp test:api-v2:watch
 ```
 
 One caveat. If you have a severe syntax error in your files, the tests may fail to run, but they won't alert you that they are not running. If you ever find your test hanging for a while, run this to get the stackstrace. Once you've fixed the problem, you can resume running the watch comand.

test/api/v2/groups/GET-groups.test.js

@@ -3,7 +3,7 @@ import {
   generateUser,
   resetHabiticaDB,
   requester,
-} from '../../helpers/api.helper';
+} from '../../../helpers/api-integration.helper';
 
 describe('GET /groups', () => {
   const NUMBER_OF_PUBLIC_GUILDS = 3;

test/api/v2/groups/GET-groups_id.test.js

@@ -3,7 +3,7 @@ import {
   generateUser,
   requester,
   translate as t,
-} from '../../helpers/api.helper';
+} from '../../../helpers/api-integration.helper';
 import {
   find,
   each

test/api/v2/groups/POST-groups.test.js

@@ -3,7 +3,7 @@ import {
   generateUser,
   requester,
   translate as t,
-} from '../../helpers/api.helper';
+} from '../../../helpers/api-integration.helper';
 
 describe('POST /groups', () => {
 

test/api/v2/groups/POST-groups_id.test.js

@@ -3,7 +3,7 @@ import {
   generateUser,
   requester,
   translate as t,
-} from '../../helpers/api.helper';
+} from '../../../helpers/api-integration.helper';
 
 describe('POST /groups/:id', () => {
 

test/api/v2/groups/POST-groups_id_join.test.js

@@ -3,7 +3,7 @@ import {
   generateUser,
   requester,
   translate as t,
-} from '../../helpers/api.helper';
+} from '../../../helpers/api-integration.helper';
 import { each, find } from 'lodash';
 
 describe('POST /groups/:id/join', () => {

test/api/v2/groups/POST-groups_id_leave.test.js

@@ -4,7 +4,7 @@ import {
   generateUser,
   requester,
   translate as t,
-} from '../../helpers/api.helper';
+} from '../../../helpers/api-integration.helper';
 import { find } from 'lodash';
 
 describe('POST /groups/:id/leave', () => {

test/api/v2/groups/POST-groups_id_removeMember.test.js

@@ -4,7 +4,7 @@ import {
   generateUser,
   requester,
   translate as t,
-} from '../../helpers/api.helper';
+} from '../../../helpers/api-integration.helper';
 
 describe('POST /groups/:id/removeMember', () => {
 

test/api/v2/groups/chat/DELETE-groups_id_chat.test.js

@@ -3,7 +3,7 @@ import {
   generateUser,
   requester,
   translate as t,
-} from '../../../helpers/api.helper';
+} from '../../../../helpers/api-integration.helper';
 
 describe('DELETE /groups/:id/chat', () => {
   let api, group, message, user;

test/api/v2/groups/chat/GET-groups_id_chat.test.js

@@ -3,7 +3,7 @@ import {
   generateUser,
   requester,
   translate as t,
-} from '../../../helpers/api.helper';
+} from '../../../../helpers/api-integration.helper';
 
 describe('GET /groups/:id/chat', () => {
 

test/api/v2/groups/chat/POST-groups_id_chat.test.js

@@ -3,7 +3,7 @@ import {
   generateUser,
   requester,
   translate as t,
-} from '../../../helpers/api.helper';
+} from '../../../../helpers/api-integration.helper';
 
 describe('POST /groups/:id/chat', () => {
 

test/api/v2/groups/chat/POST-groups_id_chat_id_flag.test.js

@@ -3,7 +3,7 @@ import {
   generateUser,
   requester,
   translate as t,
-} from '../../../helpers/api.helper';
+} from '../../../../helpers/api-integration.helper';
 
 describe('POST /groups/:id/chat/:id/flag', () => {
 

test/api/v2/groups/chat/POST-groups_id_chat_id_like.test.js

@@ -3,7 +3,7 @@ import {
   generateUser,
   requester,
   translate as t,
-} from '../../../helpers/api.helper';
+} from '../../../../helpers/api-integration.helper';
 
 describe('POST /groups/:id/chat/:id/like', () => {
 

test/api/v2/register/POST-register.test.js

@@ -2,7 +2,7 @@ import {
   generateUser,
   requester,
   translate as t,
-} from '../../helpers/api.helper';
+} from '../../../helpers/api-integration.helper';
 import {v4 as generateRandomUserName} from 'uuid';
 
 describe('POST /register', () => {

test/api/v2/status/GET-status.test.js

@@ -1,4 +1,4 @@
-import {requester} from '../../helpers/api.helper';
+import {requester} from '../../../helpers/api-integration.helper';
 
 describe('Status', () => {
 

test/api/v2/user/DELETE-user.test.js

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

test/api/v2/user/GET-user.test.js

@@ -1,7 +1,7 @@
 import {
   generateUser,
   requester,
-} from '../../helpers/api.helper';
+} from '../../../helpers/api-integration.helper';
 
 describe('GET /user', () => {
   let user;

test/api/v2/user/GET-user_tags.test.js

@@ -1,7 +1,7 @@
 import {
   generateUser,
   requester,
-} from '../../helpers/api.helper';
+} from '../../../helpers/api-integration.helper';
 
 describe('GET /user/tags', () => {
   let api, user;

test/api/v2/user/GET-user_tags_id.test.js

@@ -2,7 +2,7 @@ import {
   generateUser,
   requester,
   translate as t,
-} from '../../helpers/api.helper';
+} from '../../../helpers/api-integration.helper';
 
 describe('GET /user/tags/id', () => {
   let api, user;

test/api/v2/user/PUT-user.test.js

@@ -2,7 +2,7 @@ import {
   generateUser,
   requester,
   translate as t,
-} from '../../helpers/api.helper';
+} from '../../../helpers/api-integration.helper';
 
 import { each } from 'lodash';
 

test/api/v2/user/anonymized/GET-user_anonymized.test.js

@@ -1,7 +1,7 @@
 import {
   generateUser,
   requester,
-} from '../../../helpers/api.helper';
+} from '../../../../helpers/api-integration.helper';
 import { each } from 'lodash';
 
 describe('GET /user/anonymized', () => {

test/api/v2/user/batch-update/POST-user_batch-update.test.js

@@ -2,7 +2,7 @@ import {
   generateUser,
   requester,
   translate as t,
-} from '../../../helpers/api.helper';
+} from '../../../../helpers/api-integration.helper';
 
 import { each } from 'lodash';
 

test/api/v2/user/pushDevice/POST-pushDevice.test.js

@@ -1,7 +1,7 @@
 import {
   generateUser,
   requester,
-} from '../../../helpers/api.helper';
+} from '../../../../helpers/api-integration.helper';
 
 describe('POST /user/pushDevice', () => {
   let api;

test/api/v2/user/tasks/DELETE-tasks_id.test.js

@@ -2,7 +2,7 @@ import {
   generateUser,
   requester,
   translate as t,
-} from '../../../helpers/api.helper';
+} from '../../../../helpers/api-integration.helper';
 
 describe('DELETE /user/tasks/:id', () => {
   let api, user, task;

test/api/v2/user/tasks/GET-tasks.test.js

@@ -2,7 +2,7 @@ import {
   generateUser,
   requester,
   translate as t,
-} from '../../../helpers/api.helper';
+} from '../../../../helpers/api-integration.helper';
 
 describe('GET /user/tasks/', () => {
   let api, user;

test/api/v2/user/tasks/GET-tasks_id.test.js

@@ -2,7 +2,7 @@ import {
   generateUser,
   requester,
   translate as t,
-} from '../../../helpers/api.helper';
+} from '../../../../helpers/api-integration.helper';
 
 describe('GET /user/tasks/:id', () => {
   let api, user, task;

test/api/v2/user/tasks/POST-tasks.test.js

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

test/api/v2/user/tasks/PUT-tasks_id.test.js

@@ -2,7 +2,7 @@ import {
   generateUser,
   requester,
   translate as t,
-} from '../../../helpers/api.helper';
+} from '../../../../helpers/api-integration.helper';
 
 describe('PUT /user/tasks/:id', () => {
   let api, user, task;