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

tasks/gulp-eslint.js

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

test/common/user.fns.ultimateGear.test.js

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

test/helpers/api-integration.helper.js

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

test/helpers/api-unit.helper.js

@@ -1,24 +1,25 @@
 import '../../website/src/libs/api-v3/i18n';
 import { defaultsDeep as defaults } from 'lodash';
-import { model as User } from '../../website/src/models/user'
-import { model as Group } from '../../website/src/models/group'
+import { model as User } from '../../website/src/models/user';
+import { model as Group } from '../../website/src/models/group';
 
 afterEach(() => {
   sandbox.restore();
 });
 
-export function generateUser(options={}) {
+export function generateUser (options = {}) {
   return new User(options).toObject();
 }
 
-export function generateGroup(options={}) {
+export function generateGroup (options = {}) {
   return new Group(options).toObject();
 }
 
-export function generateRes(options={}) {
+export function generateRes (options = {}) {
   let defaultRes = {
     send: sandbox.stub(),
     status: sandbox.stub().returnsThis(),
+    sendStatus: sandbox.stub().returnsThis(),
     json: sandbox.stub(),
     locals: {
       user: generateUser(options.localsUser),
@@ -29,7 +30,7 @@ export function generateRes(options={}) {
   return defaults(options, defaultRes);
 }
 
-export function generateReq(options={}) {
+export function generateReq (options = {}) {
   let defaultReq = {
     body: {},
     query: {},
@@ -39,6 +40,6 @@ export function generateReq(options={}) {
   return defaults(options, defaultReq);
 }
 
-export function generateNext(func) {
+export function generateNext (func) {
   return func || sandbox.stub();
 }