Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/flagpm

# Conflicts:
#	website/client/store/actions/chat.js

test/api/unit/libs/analyticsService.test.js

@@ -1,5 +1,5 @@
 /* eslint-disable camelcase */
-import analyticsService from '../../../../../website/server/libs/analyticsService';
+import analyticsService from '../../../../website/server/libs/analyticsService';
 import Amplitude from 'amplitude';
 import { Visitor } from 'universal-analytics';
 

test/api/unit/libs/apiError.js

@@ -1,4 +1,4 @@
-import apiError from '../../../../../website/server/libs/apiError';
+import apiError from '../../../../website/server/libs/apiError';
 
 describe('API Messages', () => {
   const message = 'Only public guilds support pagination.';

test/api/unit/libs/baseModel.test.js

@@ -1,4 +1,4 @@
-import baseModel from '../../../../../website/server/libs/baseModel';
+import baseModel from '../../../../website/server/libs/baseModel';
 import mongoose from 'mongoose';
 
 describe('Base model plugin', () => {

test/api/unit/libs/collectionManipulators.test.js

@@ -1,7 +1,7 @@
 import mongoose from 'mongoose';
 import {
   removeFromArray,
-} from '../../../../../website/server/libs/collectionManipulators';
+} from '../../../../website/server/libs/collectionManipulators';
 
 describe('Collection Manipulators', () => {
   describe('removeFromArray', () => {

test/api/unit/libs/cron.test.js

@@ -2,15 +2,15 @@
 import moment from 'moment';
 import nconf from 'nconf';
 import requireAgain from 'require-again';
-import { recoverCron, cron } from '../../../../../website/server/libs/cron';
-import { model as User } from '../../../../../website/server/models/user';
-import * as Tasks from '../../../../../website/server/models/task';
-import common from '../../../../../website/common';
-import analytics from '../../../../../website/server/libs/analyticsService';
+import { recoverCron, cron } from '../../../../website/server/libs/cron';
+import { model as User } from '../../../../website/server/models/user';
+import * as Tasks from '../../../../website/server/models/task';
+import common from '../../../../website/common';
+import analytics from '../../../../website/server/libs/analyticsService';
 
 // const scoreTask = common.ops.scoreTask;
 
-let pathToCronLib = '../../../../../website/server/libs/cron';
+let pathToCronLib = '../../../../website/server/libs/cron';
 
 describe('cron', () => {
   let clock = null;

test/api/unit/libs/email.test.js

@@ -3,9 +3,9 @@ import got from 'got';
 import nconf from 'nconf';
 import nodemailer from 'nodemailer';
 import requireAgain from 'require-again';
-import logger from '../../../../../website/server/libs/logger';
-import { TAVERN_ID } from '../../../../../website/server/models/group';
-import { defer } from '../../../../helpers/api-unit.helper';
+import logger from '../../../../website/server/libs/logger';
+import { TAVERN_ID } from '../../../../website/server/models/group';
+import { defer } from '../../../helpers/api-unit.helper';
 
 function getUser () {
   return {
@@ -33,7 +33,7 @@ function getUser () {
 }
 
 describe('emails', () => {
-  let pathToEmailLib = '../../../../../website/server/libs/email';
+  let pathToEmailLib = '../../../../website/server/libs/email';
 
   describe('sendEmail', () => {
     let sendMailSpy;

test/api/unit/libs/encryption.test.js

@@ -1,7 +1,7 @@
 import {
   encrypt,
   decrypt,
-} from '../../../../../website/server/libs/encryption';
+} from '../../../../website/server/libs/encryption';
 
 describe('encryption', () => {
   it('can encrypt and decrypt', () => {

test/api/unit/libs/errors.test.js

@@ -5,7 +5,7 @@ import {
   BadRequest,
   InternalServerError,
   NotFound,
-} from '../../../../../website/server/libs/errors';
+} from '../../../../website/server/libs/errors';
 
 describe('Custom Errors', () => {
   describe('CustomError', () => {

test/api/unit/libs/i18n.test.js

@@ -2,7 +2,7 @@ import {
   translations,
   localePath,
   langCodes,
-} from '../../../../../website/server/libs/i18n';
+} from '../../../../website/server/libs/i18n';
 import fs from 'fs';
 import path from 'path';
 

test/api/unit/libs/logger.js

@@ -1,8 +1,8 @@
 import winston from 'winston';
-import logger from '../../../../../website/server/libs/logger';
+import logger from '../../../../website/server/libs/logger';
 import {
   NotFound,
-} from '../../../../../website/server/libs//errors';
+} from '../../../../website/server/libs//errors';
 
 describe('logger', () => {
   let logSpy;

test/api/unit/libs/password.test.js

@@ -2,11 +2,11 @@
 
 import {
   encrypt,
-} from '../../../../../website/server/libs/encryption';
+} from '../../../../website/server/libs/encryption';
 import moment from 'moment';
 import {
   generateUser,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../helpers/api-integration/v3';
 import {
   sha1Encrypt as sha1EncryptPassword,
   sha1MakeSalt,
@@ -15,7 +15,7 @@ import {
   compare,
   convertToBcrypt,
   validatePasswordResetCodeAndFindUser,
-} from '../../../../../website/server/libs/password';
+} from '../../../../website/server/libs/password';
 
 describe('Password Utilities', () => {
   describe('compare', () => {

test/api/unit/libs/payments/amazon/cancel.test.js

@@ -2,11 +2,11 @@ import moment from 'moment';
 
 import {
   generateGroup,
-} from '../../../../../../helpers/api-unit.helper.js';
-import { model as User } from '../../../../../../../website/server/models/user';
-import amzLib from '../../../../../../../website/server/libs/payments/amazon';
-import payments from '../../../../../../../website/server/libs/payments/payments';
-import common from '../../../../../../../website/common';
+} from '../../../../../helpers/api-unit.helper.js';
+import { model as User } from '../../../../../../website/server/models/user';
+import amzLib from '../../../../../../website/server/libs/payments/amazon';
+import payments from '../../../../../../website/server/libs/payments/payments';
+import common from '../../../../../../website/common';
 import { createNonLeaderGroupMember } from '../paymentHelpers';
 
 const i18n = common.i18n;

test/api/unit/libs/payments/amazon/checkout.test.js

@@ -1,7 +1,7 @@
-import { model as User } from '../../../../../../../website/server/models/user';
-import amzLib from '../../../../../../../website/server/libs/payments/amazon';
-import payments from '../../../../../../../website/server/libs/payments/payments';
-import common from '../../../../../../../website/common';
+import { model as User } from '../../../../../../website/server/models/user';
+import amzLib from '../../../../../../website/server/libs/payments/amazon';
+import payments from '../../../../../../website/server/libs/payments/payments';
+import common from '../../../../../../website/common';
 
 const i18n = common.i18n;
 

test/api/unit/libs/payments/amazon/subscribe.test.js

@@ -2,12 +2,12 @@ import cc from 'coupon-code';
 
 import {
   generateGroup,
-} from '../../../../../../helpers/api-unit.helper.js';
-import { model as User } from '../../../../../../../website/server/models/user';
-import { model as Coupon } from '../../../../../../../website/server/models/coupon';
-import amzLib from '../../../../../../../website/server/libs/payments/amazon';
-import payments from '../../../../../../../website/server/libs/payments/payments';
-import common from '../../../../../../../website/common';
+} from '../../../../../helpers/api-unit.helper.js';
+import { model as User } from '../../../../../../website/server/models/user';
+import { model as Coupon } from '../../../../../../website/server/models/coupon';
+import amzLib from '../../../../../../website/server/libs/payments/amazon';
+import payments from '../../../../../../website/server/libs/payments/payments';
+import common from '../../../../../../website/common';
 
 const i18n = common.i18n;
 

test/api/unit/libs/payments/amazon/upgrade-groupplan.test.js

@@ -2,11 +2,11 @@ import uuid from 'uuid';
 
 import {
   generateGroup,
-} from '../../../../../../helpers/api-unit.helper.js';
-import { model as User } from '../../../../../../../website/server/models/user';
-import { model as Group } from '../../../../../../../website/server/models/group';
-import amzLib from '../../../../../../../website/server/libs/payments/amazon';
-import payments from '../../../../../../../website/server/libs/payments/payments';
+} from '../../../../../helpers/api-unit.helper.js';
+import { model as User } from '../../../../../../website/server/models/user';
+import { model as Group } from '../../../../../../website/server/models/group';
+import amzLib from '../../../../../../website/server/libs/payments/amazon';
+import payments from '../../../../../../website/server/libs/payments/payments';
 
 describe('#upgradeGroupPlan', () => {
   let spy, data, user, group, uuidString;

test/api/unit/libs/payments/apple.test.js

@@ -1,10 +1,10 @@
 /* eslint-disable camelcase */
-import iapModule from '../../../../../../website/server/libs/inAppPurchases';
-import payments from '../../../../../../website/server/libs/payments/payments';
-import applePayments from '../../../../../../website/server/libs/payments/apple';
-import iap from '../../../../../../website/server/libs/inAppPurchases';
-import {model as User} from '../../../../../../website/server/models/user';
-import common from '../../../../../../website/common';
+import iapModule from '../../../../../website/server/libs/inAppPurchases';
+import payments from '../../../../../website/server/libs/payments/payments';
+import applePayments from '../../../../../website/server/libs/payments/apple';
+import iap from '../../../../../website/server/libs/inAppPurchases';
+import {model as User} from '../../../../../website/server/models/user';
+import common from '../../../../../website/common';
 import moment from 'moment';
 
 const i18n = common.i18n;

test/api/unit/libs/payments/google.test.js

@@ -1,10 +1,10 @@
 /* eslint-disable camelcase */
-import iapModule from '../../../../../../website/server/libs/inAppPurchases';
-import payments from '../../../../../../website/server/libs/payments/payments';
-import googlePayments from '../../../../../../website/server/libs/payments/google';
-import iap from '../../../../../../website/server/libs/inAppPurchases';
-import {model as User} from '../../../../../../website/server/models/user';
-import common from '../../../../../../website/common';
+import iapModule from '../../../../../website/server/libs/inAppPurchases';
+import payments from '../../../../../website/server/libs/payments/payments';
+import googlePayments from '../../../../../website/server/libs/payments/google';
+import iap from '../../../../../website/server/libs/inAppPurchases';
+import {model as User} from '../../../../../website/server/models/user';
+import common from '../../../../../website/common';
 import moment from 'moment';
 
 const i18n = common.i18n;

test/api/unit/libs/payments/group-plans/group-payments-cancel.test.js

@@ -1,13 +1,13 @@
 import moment from 'moment';
 
-import * as sender from '../../../../../../../website/server/libs/email';
-import * as api from '../../../../../../../website/server/libs/payments/payments';
-import { model as User } from '../../../../../../../website/server/models/user';
-import { model as Group } from '../../../../../../../website/server/models/group';
+import * as sender from '../../../../../../website/server/libs/email';
+import * as api from '../../../../../../website/server/libs/payments/payments';
+import { model as User } from '../../../../../../website/server/models/user';
+import { model as Group } from '../../../../../../website/server/models/group';
 import {
   generateGroup,
-} from '../../../../../../helpers/api-unit.helper.js';
-import i18n from '../../../../../../../website/common/script/i18n';
+} from '../../../../../helpers/api-unit.helper.js';
+import i18n from '../../../../../../website/common/script/i18n';
 
 describe('Canceling a subscription for group', () => {
   let plan, group, user, data;

test/api/unit/libs/payments/group-plans/group-payments-create.test.js

@@ -2,16 +2,16 @@ import moment from 'moment';
 import stripeModule from 'stripe';
 import nconf from 'nconf';
 
-import * as sender from '../../../../../../../website/server/libs/email';
-import * as api from '../../../../../../../website/server/libs/payments/payments';
-import amzLib from '../../../../../../../website/server/libs/payments/amazon';
-import paypalPayments from '../../../../../../../website/server/libs/payments/paypal';
-import stripePayments from '../../../../../../../website/server/libs/payments/stripe';
-import { model as User } from '../../../../../../../website/server/models/user';
-import { model as Group } from '../../../../../../../website/server/models/group';
+import * as sender from '../../../../../../website/server/libs/email';
+import * as api from '../../../../../../website/server/libs/payments/payments';
+import amzLib from '../../../../../../website/server/libs/payments/amazon';
+import paypalPayments from '../../../../../../website/server/libs/payments/paypal';
+import stripePayments from '../../../../../../website/server/libs/payments/stripe';
+import { model as User } from '../../../../../../website/server/models/user';
+import { model as Group } from '../../../../../../website/server/models/group';
 import {
   generateGroup,
-} from '../../../../../../helpers/api-unit.helper.js';
+} from '../../../../../helpers/api-unit.helper.js';
 
 describe('Purchasing a group plan for group', () => {
   const EMAIL_TEMPLATE_SUBSCRIPTION_TYPE_GOOGLE = 'Google_subscription';

test/api/unit/libs/payments/paymentHelpers.js

@@ -1,4 +1,4 @@
-import { model as User } from '../../../../../../website/server/models/user';
+import { model as User } from '../../../../../website/server/models/user';
 
 export async function createNonLeaderGroupMember (group) {
   let nonLeader = new User();

test/api/unit/libs/payments/payments.test.js

@@ -1,14 +1,14 @@
 import moment from 'moment';
 
-import * as sender from '../../../../../../website/server/libs/email';
-import * as api from '../../../../../../website/server/libs/payments/payments';
-import analytics from '../../../../../../website/server/libs/analyticsService';
-import notifications from '../../../../../../website/server/libs/pushNotifications';
-import { model as User } from '../../../../../../website/server/models/user';
-import { translate as t } from '../../../../../helpers/api-v3-integration.helper';
+import * as sender from '../../../../../website/server/libs/email';
+import * as api from '../../../../../website/server/libs/payments/payments';
+import analytics from '../../../../../website/server/libs/analyticsService';
+import notifications from '../../../../../website/server/libs/pushNotifications';
+import { model as User } from '../../../../../website/server/models/user';
+import { translate as t } from '../../../../helpers/api-integration/v3';
 import {
   generateGroup,
-} from '../../../../../helpers/api-unit.helper.js';
+} from '../../../../helpers/api-unit.helper.js';
 
 describe('payments/index', () => {
   let user, group, data, plan;

test/api/unit/libs/payments/paypal/checkout-success.test.js

@@ -1,7 +1,7 @@
 /* eslint-disable camelcase */
-import paypalPayments from '../../../../../../../website/server/libs/payments/paypal';
-import payments from '../../../../../../../website/server/libs/payments/payments';
-import { model as User } from '../../../../../../../website/server/models/user';
+import paypalPayments from '../../../../../../website/server/libs/payments/paypal';
+import payments from '../../../../../../website/server/libs/payments/payments';
+import { model as User } from '../../../../../../website/server/models/user';
 
 describe('checkout success', () => {
   const subKey = 'basic_3mo';

test/api/unit/libs/payments/paypal/checkout.test.js

@@ -1,9 +1,9 @@
 /* eslint-disable camelcase */
 import nconf from 'nconf';
 
-import paypalPayments from '../../../../../../../website/server/libs/payments/paypal';
-import { model as User } from '../../../../../../../website/server/models/user';
-import common from '../../../../../../../website/common';
+import paypalPayments from '../../../../../../website/server/libs/payments/paypal';
+import { model as User } from '../../../../../../website/server/models/user';
+import common from '../../../../../../website/common';
 
 const BASE_URL = nconf.get('BASE_URL');
 const i18n = common.i18n;

test/api/unit/libs/payments/paypal/ipn.test.js

@@ -1,10 +1,10 @@
 /* eslint-disable camelcase */
-import paypalPayments from '../../../../../../../website/server/libs/payments/paypal';
-import payments from '../../../../../../../website/server/libs/payments/payments';
+import paypalPayments from '../../../../../../website/server/libs/payments/paypal';
+import payments from '../../../../../../website/server/libs/payments/payments';
 import {
   generateGroup,
-} from '../../../../../../helpers/api-unit.helper.js';
-import { model as User } from '../../../../../../../website/server/models/user';
+} from '../../../../../helpers/api-unit.helper.js';
+import { model as User } from '../../../../../../website/server/models/user';
 
 describe('ipn', () => {
   const subKey = 'basic_3mo';

test/api/unit/libs/payments/paypal/subscribe-cancel.test.js

@@ -1,11 +1,11 @@
 /* eslint-disable camelcase */
-import paypalPayments from '../../../../../../../website/server/libs/payments/paypal';
-import payments from '../../../../../../../website/server/libs/payments/payments';
+import paypalPayments from '../../../../../../website/server/libs/payments/paypal';
+import payments from '../../../../../../website/server/libs/payments/payments';
 import {
   generateGroup,
-} from '../../../../../../helpers/api-unit.helper.js';
-import { model as User } from '../../../../../../../website/server/models/user';
-import common from '../../../../../../../website/common';
+} from '../../../../../helpers/api-unit.helper.js';
+import { model as User } from '../../../../../../website/server/models/user';
+import common from '../../../../../../website/common';
 import { createNonLeaderGroupMember } from '../paymentHelpers';
 
 const i18n = common.i18n;

test/api/unit/libs/payments/paypal/subscribe-success.test.js

@@ -1,11 +1,11 @@
 /* eslint-disable camelcase */
-import paypalPayments from '../../../../../../../website/server/libs/payments/paypal';
-import payments from '../../../../../../../website/server/libs/payments/payments';
+import paypalPayments from '../../../../../../website/server/libs/payments/paypal';
+import payments from '../../../../../../website/server/libs/payments/payments';
 import {
   generateGroup,
-} from '../../../../../../helpers/api-unit.helper.js';
-import { model as User } from '../../../../../../../website/server/models/user';
-import common from '../../../../../../../website/common';
+} from '../../../../../helpers/api-unit.helper.js';
+import { model as User } from '../../../../../../website/server/models/user';
+import common from '../../../../../../website/common';
 
 describe('subscribeSuccess', () => {
   const subKey = 'basic_3mo';

test/api/unit/libs/payments/paypal/subscribe.test.js

@@ -2,9 +2,9 @@
 import moment from 'moment';
 import cc from 'coupon-code';
 
-import paypalPayments from '../../../../../../../website/server/libs/payments/paypal';
-import { model as Coupon } from '../../../../../../../website/server/models/coupon';
-import common from '../../../../../../../website/common';
+import paypalPayments from '../../../../../../website/server/libs/payments/paypal';
+import { model as Coupon } from '../../../../../../website/server/models/coupon';
+import common from '../../../../../../website/common';
 
 const i18n = common.i18n;
 

test/api/unit/libs/payments/stripe/cancel-subscription.test.js

@@ -2,11 +2,11 @@ import stripeModule from 'stripe';
 
 import {
   generateGroup,
-} from '../../../../../../helpers/api-unit.helper.js';
-import { model as User } from '../../../../../../../website/server/models/user';
-import stripePayments from '../../../../../../../website/server/libs/payments/stripe';
-import payments from '../../../../../../../website/server/libs/payments/payments';
-import common from '../../../../../../../website/common';
+} from '../../../../../helpers/api-unit.helper.js';
+import { model as User } from '../../../../../../website/server/models/user';
+import stripePayments from '../../../../../../website/server/libs/payments/stripe';
+import payments from '../../../../../../website/server/libs/payments/payments';
+import common from '../../../../../../website/common';
 
 const i18n = common.i18n;
 

test/api/unit/libs/payments/stripe/checkout-subscription.test.js

@@ -3,12 +3,12 @@ import cc from 'coupon-code';
 
 import {
   generateGroup,
-} from '../../../../../../helpers/api-unit.helper.js';
-import { model as User } from '../../../../../../../website/server/models/user';
-import { model as Coupon } from '../../../../../../../website/server/models/coupon';
-import stripePayments from '../../../../../../../website/server/libs/payments/stripe';
-import payments from '../../../../../../../website/server/libs/payments/payments';
-import common from '../../../../../../../website/common';
+} from '../../../../../helpers/api-unit.helper.js';
+import { model as User } from '../../../../../../website/server/models/user';
+import { model as Coupon } from '../../../../../../website/server/models/coupon';
+import stripePayments from '../../../../../../website/server/libs/payments/stripe';
+import payments from '../../../../../../website/server/libs/payments/payments';
+import common from '../../../../../../website/common';
 
 const i18n = common.i18n;
 

test/api/unit/libs/payments/stripe/checkout.test.js

@@ -1,9 +1,9 @@
 import stripeModule from 'stripe';
 
-import { model as User } from '../../../../../../../website/server/models/user';
-import stripePayments from '../../../../../../../website/server/libs/payments/stripe';
-import payments from '../../../../../../../website/server/libs/payments/payments';
-import common from '../../../../../../../website/common';
+import { model as User } from '../../../../../../website/server/models/user';
+import stripePayments from '../../../../../../website/server/libs/payments/stripe';
+import payments from '../../../../../../website/server/libs/payments/payments';
+import common from '../../../../../../website/common';
 
 const i18n = common.i18n;
 

test/api/unit/libs/payments/stripe/edit-subscription.test.js

@@ -2,10 +2,10 @@ import stripeModule from 'stripe';
 
 import {
   generateGroup,
-} from '../../../../../../helpers/api-unit.helper.js';
-import { model as User } from '../../../../../../../website/server/models/user';
-import stripePayments from '../../../../../../../website/server/libs/payments/stripe';
-import common from '../../../../../../../website/common';
+} from '../../../../../helpers/api-unit.helper.js';
+import { model as User } from '../../../../../../website/server/models/user';
+import stripePayments from '../../../../../../website/server/libs/payments/stripe';
+import common from '../../../../../../website/common';
 
 const i18n = common.i18n;
 

test/api/unit/libs/payments/stripe/handle-webhook.test.js

@@ -2,12 +2,12 @@ import stripeModule from 'stripe';
 
 import {
   generateGroup,
-} from '../../../../../../helpers/api-unit.helper.js';
-import { model as User } from '../../../../../../../website/server/models/user';
-import stripePayments from '../../../../../../../website/server/libs/payments/stripe';
-import payments from '../../../../../../../website/server/libs/payments/payments';
-import common from '../../../../../../../website/common';
-import logger from '../../../../../../../website/server/libs/logger';
+} from '../../../../../helpers/api-unit.helper.js';
+import { model as User } from '../../../../../../website/server/models/user';
+import stripePayments from '../../../../../../website/server/libs/payments/stripe';
+import payments from '../../../../../../website/server/libs/payments/payments';
+import common from '../../../../../../website/common';
+import logger from '../../../../../../website/server/libs/logger';
 import { v4 as uuid } from 'uuid';
 import moment from 'moment';
 

test/api/unit/libs/payments/stripe/upgrade-group-plan.test.js

@@ -2,11 +2,11 @@ import stripeModule from 'stripe';
 
 import {
   generateGroup,
-} from '../../../../../../helpers/api-unit.helper.js';
-import { model as User } from '../../../../../../../website/server/models/user';
-import { model as Group } from '../../../../../../../website/server/models/group';
-import stripePayments from '../../../../../../../website/server/libs/payments/stripe';
-import payments from '../../../../../../../website/server/libs/payments/payments';
+} from '../../../../../helpers/api-unit.helper.js';
+import { model as User } from '../../../../../../website/server/models/user';
+import { model as Group } from '../../../../../../website/server/models/group';
+import stripePayments from '../../../../../../website/server/libs/payments/stripe';
+import payments from '../../../../../../website/server/libs/payments/payments';
 
 describe('Stripe - Upgrade Group Plan', () => {
   const stripe = stripeModule('test');

test/api/unit/libs/preening.test.js

@@ -1,7 +1,7 @@
-import { preenHistory } from '../../../../../website/server/libs/preening';
+import { preenHistory } from '../../../../website/server/libs/preening';
 import moment from 'moment';
 import sinon from 'sinon'; // eslint-disable-line no-shadow
-import { generateHistory } from '../../../../helpers/api-unit.helper.js';
+import { generateHistory } from '../../../helpers/api-unit.helper.js';
 
 describe('preenHistory', () => {
   let clock;

test/api/unit/libs/pushNotifications.js

@@ -1,4 +1,4 @@
-import { model as User } from '../../../../../website/server/models/user';
+import { model as User } from '../../../../website/server/models/user';
 import requireAgain from 'require-again';
 import pushNotify from 'push-notify';
 import nconf from 'nconf';
@@ -7,7 +7,7 @@ import gcmLib from 'node-gcm'; // works with FCM notifications too
 describe('pushNotifications', () => {
   let user;
   let sendPushNotification;
-  let pathToPushNotifications = '../../../../../website/server/libs/pushNotifications';
+  let pathToPushNotifications = '../../../../website/server/libs/pushNotifications';
   let fcmSendSpy;
   let apnSendSpy;
 

test/api/unit/libs/setupNconf.test.js

@@ -1,4 +1,4 @@
-import setupNconf from '../../../../../website/server/libs/setupNconf';
+import setupNconf from '../../../../website/server/libs/setupNconf';
 
 import path from 'path';
 import nconf from 'nconf';

test/api/unit/libs/slack.js

@@ -1,10 +1,11 @@
 /* eslint-disable camelcase */
 import { IncomingWebhook } from '@slack/client';
 import requireAgain from 'require-again';
-import slack from '../../../../../website/server/libs/slack';
-import logger from '../../../../../website/server/libs/logger';
-import { TAVERN_ID } from '../../../../../website/server/models/group';
+import slack from '../../../../website/server/libs/slack';
+import logger from '../../../../website/server/libs/logger';
+import { TAVERN_ID } from '../../../../website/server/models/group';
 import nconf from 'nconf';
+import moment from 'moment';
 
 describe('slack', () => {
   describe('sendFlagNotification', () => {
@@ -45,13 +46,15 @@ describe('slack', () => {
     it('sends a slack webhook', () => {
       slack.sendFlagNotification(data);
 
+      const timestamp = `${moment(data.message.timestamp).utc().format('YYYY-MM-DD HH:mm')} UTC`;
+
       expect(IncomingWebhook.prototype.send).to.be.calledOnce;
       expect(IncomingWebhook.prototype.send).to.be.calledWith({
         text: 'flagger (flagger-id; language: flagger-lang) flagged a group message',
         attachments: [{
           fallback: 'Flag Message',
           color: 'danger',
-          author_name: 'Author - author@example.com - author-id',
+          author_name: `Author - author@example.com - author-id\n${timestamp}`,
           title: 'Flag in Some group - (private guild)',
           title_link: undefined,
           text: 'some text',
@@ -97,9 +100,11 @@ describe('slack', () => {
 
       slack.sendFlagNotification(data);
 
+      const timestamp = `${moment(data.message.timestamp).utc().format('YYYY-MM-DD HH:mm')} UTC`;
+
       expect(IncomingWebhook.prototype.send).to.be.calledWithMatch({
         attachments: [sandbox.match({
-          author_name: 'System Message',
+          author_name: `System Message\n${timestamp}`,
         })],
       });
     });
@@ -107,7 +112,7 @@ describe('slack', () => {
     it('noops if no flagging url is provided', () => {
       sandbox.stub(nconf, 'get').withArgs('SLACK:FLAGGING_URL').returns('');
       sandbox.stub(logger, 'error');
-      let reRequiredSlack = requireAgain('../../../../../website/server/libs/slack');
+      let reRequiredSlack = requireAgain('../../../../website/server/libs/slack');
 
       expect(logger.error).to.be.calledOnce;
 

test/api/unit/libs/taskManager.js

@@ -3,13 +3,13 @@ import {
   getTasks,
   syncableAttrs,
   moveTask,
-} from '../../../../../website/server/libs/taskManager';
-import i18n from '../../../../../website/common/script/i18n';
+} from '../../../../website/server/libs/taskManager';
+import i18n from '../../../../website/common/script/i18n';
 import {
   generateUser,
   generateGroup,
   generateChallenge,
-} from '../../../../helpers/api-unit.helper.js';
+} from '../../../helpers/api-unit.helper.js';
 
 describe('taskManager', () => {
   let user, group, challenge;

test/api/unit/libs/webhooks.test.js

@@ -6,14 +6,14 @@ import {
   taskActivityWebhook,
   questActivityWebhook,
   userActivityWebhook,
-} from '../../../../../website/server/libs/webhook';
+} from '../../../../website/server/libs/webhook';
 import {
   model as User,
-} from '../../../../../website/server/models/user';
+} from '../../../../website/server/models/user';
 import {
   generateUser,
-} from '../../../../helpers/api-unit.helper.js';
-import { defer } from '../../../../helpers/api-unit.helper';
+} from '../../../helpers/api-unit.helper.js';
+import { defer } from '../../../helpers/api-unit.helper';
 
 describe('webhooks', () => {
   let webhooks, user;

test/api/unit/middlewares/analytics.test.js

@@ -3,14 +3,14 @@ import {
   generateRes,
   generateReq,
   generateNext,
-} from '../../../../helpers/api-unit.helper';
-import analyticsService from '../../../../../website/server/libs/analyticsService';
+} from '../../../helpers/api-unit.helper';
+import analyticsService from '../../../../website/server/libs/analyticsService';
 import nconf from 'nconf';
 import requireAgain from 'require-again';
 
 describe('analytics middleware', () => {
   let res, req, next;
-  let pathToAnalyticsMiddleware = '../../../../../website/server/middlewares/analytics';
+  let pathToAnalyticsMiddleware = '../../../../website/server/middlewares/analytics';
 
   beforeEach(() => {
     res = generateRes();

test/api/unit/middlewares/auth.test.js

@@ -1,8 +1,8 @@
 import {
   generateRes,
   generateReq,
-} from '../../../../helpers/api-unit.helper';
-import { authWithHeaders as authWithHeadersFactory } from '../../../../../website/server/middlewares/auth';
+} from '../../../helpers/api-unit.helper';
+import { authWithHeaders as authWithHeadersFactory } from '../../../../website/server/middlewares/auth';
 
 describe('auth middleware', () => {
   let res, req, user;

test/api/unit/middlewares/cors.test.js

@@ -3,8 +3,8 @@ import {
   generateRes,
   generateReq,
   generateNext,
-} from '../../../../helpers/api-unit.helper';
-import cors from '../../../../../website/server/middlewares/cors';
+} from '../../../helpers/api-unit.helper';
+import cors from '../../../../website/server/middlewares/cors';
 
 describe('cors middleware', () => {
   let res, req, next;

test/api/unit/middlewares/cronMiddleware.js

@@ -3,14 +3,14 @@ import {
   generateReq,
   generateTodo,
   generateDaily,
-} from '../../../../helpers/api-unit.helper';
-import cronMiddleware from '../../../../../website/server/middlewares/cron';
+} from '../../../helpers/api-unit.helper';
+import cronMiddleware from '../../../../website/server/middlewares/cron';
 import moment from 'moment';
-import { model as User } from '../../../../../website/server/models/user';
-import { model as Group } from '../../../../../website/server/models/group';
-import * as Tasks from '../../../../../website/server/models/task';
-import analyticsService from '../../../../../website/server/libs/analyticsService';
-import * as cronLib from '../../../../../website/server/libs/cron';
+import { model as User } from '../../../../website/server/models/user';
+import { model as Group } from '../../../../website/server/models/group';
+import * as Tasks from '../../../../website/server/models/task';
+import analyticsService from '../../../../website/server/libs/analyticsService';
+import * as cronLib from '../../../../website/server/libs/cron';
 import { v4 as generateUUID } from 'uuid';
 
 const CRON_TIMEOUT_WAIT = new Date(60 * 60 * 1000).getTime();
@@ -166,8 +166,11 @@ describe('cron middleware', () => {
     await new Promise((resolve, reject) => {
       cronMiddleware(req, res, (err) => {
         if (err) return reject(err);
-        expect(user.stats.hp).to.be.lessThan(hpBefore);
-        resolve();
+        User.findOne({_id: user._id}, function (secondErr, updatedUser) {
+          if (secondErr) return reject(secondErr);
+          expect(updatedUser.stats.hp).to.be.lessThan(hpBefore);
+          resolve();
+        });
       });
     });
   });
@@ -217,8 +220,11 @@ describe('cron middleware', () => {
     await new Promise((resolve, reject) => {
       cronMiddleware(req, res, (err) => {
         if (err) return reject(err);
-        expect(user.stats.hp).to.be.lessThan(hpBefore);
-        resolve();
+        User.findOne({_id: user._id}, function (secondErr, updatedUser) {
+          if (secondErr) return reject(secondErr);
+          expect(updatedUser.stats.hp).to.be.lessThan(hpBefore);
+          resolve();
+        });
       });
     });
   });

test/api/unit/middlewares/ensureAccessRight.test.js

@@ -3,11 +3,11 @@ import {
   generateRes,
   generateReq,
   generateNext,
-} from '../../../../helpers/api-unit.helper';
-import i18n from '../../../../../website/common/script/i18n';
-import { ensureAdmin, ensureSudo } from '../../../../../website/server/middlewares/ensureAccessRight';
-import { NotAuthorized } from '../../../../../website/server/libs/errors';
-import apiError from '../../../../../website/server/libs/apiError';
+} from '../../../helpers/api-unit.helper';
+import i18n from '../../../../website/common/script/i18n';
+import { ensureAdmin, ensureSudo } from '../../../../website/server/middlewares/ensureAccessRight';
+import { NotAuthorized } from '../../../../website/server/libs/errors';
+import apiError from '../../../../website/server/libs/apiError';
 
 describe('ensure access middlewares', () => {
   let res, req, next;

test/api/unit/middlewares/ensureDevelpmentMode.js

@@ -3,9 +3,9 @@ import {
   generateRes,
   generateReq,
   generateNext,
-} from '../../../../helpers/api-unit.helper';
-import ensureDevelpmentMode from '../../../../../website/server/middlewares/ensureDevelpmentMode';
-import { NotFound } from '../../../../../website/server/libs/errors';
+} from '../../../helpers/api-unit.helper';
+import ensureDevelpmentMode from '../../../../website/server/middlewares/ensureDevelpmentMode';
+import { NotFound } from '../../../../website/server/libs/errors';
 import nconf from 'nconf';
 
 describe('developmentMode middleware', () => {

test/api/unit/middlewares/errorHandler.test.js

@@ -2,17 +2,17 @@ import {
   generateRes,
   generateReq,
   generateNext,
-} from '../../../../helpers/api-unit.helper';
+} from '../../../helpers/api-unit.helper';
 
-import errorHandler from '../../../../../website/server/middlewares/errorHandler';
-import responseMiddleware from '../../../../../website/server/middlewares/response';
+import errorHandler from '../../../../website/server/middlewares/errorHandler';
+import responseMiddleware from '../../../../website/server/middlewares/response';
 import {
   getUserLanguage,
   attachTranslateFunction,
-} from '../../../../../website/server/middlewares/language';
+} from '../../../../website/server/middlewares/language';
 
-import { BadRequest } from '../../../../../website/server/libs/errors';
-import logger from '../../../../../website/server/libs/logger';
+import { BadRequest } from '../../../../website/server/libs/errors';
+import logger from '../../../../website/server/libs/logger';
 
 describe('errorHandler', () => {
   let res, req, next;

test/api/unit/middlewares/language.test.js

@@ -2,13 +2,13 @@ import {
   generateRes,
   generateReq,
   generateNext,
-} from '../../../../helpers/api-unit.helper';
+} from '../../../helpers/api-unit.helper';
 import {
   getUserLanguage,
   attachTranslateFunction,
-} from '../../../../../website/server/middlewares/language';
-import common from '../../../../../website/common';
-import { model as User } from '../../../../../website/server/models/user';
+} from '../../../../website/server/middlewares/language';
+import common from '../../../../website/common';
+import { model as User } from '../../../../website/server/models/user';
 
 const i18n = common.i18n;
 

test/api/unit/middlewares/maintenanceMode.test.js

@@ -2,13 +2,13 @@ import {
   generateRes,
   generateReq,
   generateNext,
-} from '../../../../helpers/api-unit.helper';
+} from '../../../helpers/api-unit.helper';
 import nconf from 'nconf';
 import requireAgain from 'require-again';
 
 describe('maintenance mode middleware', () => {
   let res, req, next;
-  let pathToMaintenanceModeMiddleware = '../../../../../website/server/middlewares/maintenanceMode';
+  let pathToMaintenanceModeMiddleware = '../../../../website/server/middlewares/maintenanceMode';
 
   beforeEach(() => {
     res = generateRes();

test/api/unit/middlewares/redirects.js

@@ -2,13 +2,13 @@ import {
   generateRes,
   generateReq,
   generateNext,
-} from '../../../../helpers/api-unit.helper';
+} from '../../../helpers/api-unit.helper';
 import nconf from 'nconf';
 import requireAgain from 'require-again';
 
 describe('redirects middleware', () => {
   let res, req, next;
-  let pathToRedirectsMiddleware = '../../../../../website/server/middlewares/redirects';
+  let pathToRedirectsMiddleware = '../../../../website/server/middlewares/redirects';
 
   beforeEach(() => {
     res = generateRes();

test/api/unit/middlewares/response.js

@@ -2,9 +2,9 @@ import {
   generateRes,
   generateReq,
   generateNext,
-} from '../../../../helpers/api-unit.helper';
-import responseMiddleware from '../../../../../website/server/middlewares/response';
-import packageInfo from '../../../../../package.json';
+} from '../../../helpers/api-unit.helper';
+import responseMiddleware from '../../../../website/server/middlewares/response';
+import packageInfo from '../../../../package.json';
 
 describe('response middleware', () => {
   let res, req, next;

test/api/unit/models/challenge.test.js

@@ -1,8 +1,8 @@
-import { model as Challenge } from '../../../../../website/server/models/challenge';
-import { model as Group } from '../../../../../website/server/models/group';
-import { model as User } from '../../../../../website/server/models/user';
-import * as Tasks from '../../../../../website/server/models/task';
-import common from '../../../../../website/common/';
+import { model as Challenge } from '../../../../website/server/models/challenge';
+import { model as Group } from '../../../../website/server/models/group';
+import { model as User } from '../../../../website/server/models/user';
+import * as Tasks from '../../../../website/server/models/task';
+import common from '../../../../website/common/';
 import { each, find } from 'lodash';
 
 describe('Challenge Model', () => {

test/api/unit/models/group.test.js

@@ -1,23 +1,23 @@
 import moment from 'moment';
 import { v4 as generateUUID } from 'uuid';
 import validator from 'validator';
-import { sleep } from '../../../../helpers/api-unit.helper';
+import { sleep } from '../../../helpers/api-unit.helper';
 import {
   SPAM_MESSAGE_LIMIT,
   SPAM_MIN_EXEMPT_CONTRIB_LEVEL,
   SPAM_WINDOW_LENGTH,
   INVITES_LIMIT,
   model as Group,
-} from '../../../../../website/server/models/group';
-import { model as User } from '../../../../../website/server/models/user';
-import { quests as questScrolls } from '../../../../../website/common/script/content';
+} from '../../../../website/server/models/group';
+import { model as User } from '../../../../website/server/models/user';
+import { quests as questScrolls } from '../../../../website/common/script/content';
 import {
   groupChatReceivedWebhook,
   questActivityWebhook,
-} from '../../../../../website/server/libs/webhook';
-import * as email from '../../../../../website/server/libs/email';
-import { TAVERN_ID } from '../../../../../website/common/script/';
-import shared from '../../../../../website/common';
+} from '../../../../website/server/libs/webhook';
+import * as email from '../../../../website/server/libs/email';
+import { TAVERN_ID } from '../../../../website/common/script/';
+import shared from '../../../../website/common';
 
 describe('Group Model', () => {
   let party, questLeader, participatingMember, nonParticipatingMember, undecidedMember;

test/api/unit/models/group_tasks.test.js

@@ -1,7 +1,7 @@
-import { model as Challenge } from '../../../../../website/server/models/challenge';
-import { model as Group } from '../../../../../website/server/models/group';
-import { model as User } from '../../../../../website/server/models/user';
-import * as Tasks from '../../../../../website/server/models/task';
+import { model as Challenge } from '../../../../website/server/models/challenge';
+import { model as Group } from '../../../../website/server/models/group';
+import { model as User } from '../../../../website/server/models/user';
+import * as Tasks from '../../../../website/server/models/task';
 import { each, find, findIndex } from 'lodash';
 
 describe('Group Task Methods', () => {

test/api/unit/models/task.test.js

@@ -1,10 +1,10 @@
-import { model as Challenge } from '../../../../../website/server/models/challenge';
-import { model as Group } from '../../../../../website/server/models/group';
-import { model as User } from '../../../../../website/server/models/user';
-import * as Tasks from '../../../../../website/server/models/task';
-import { InternalServerError } from '../../../../../website/server/libs/errors';
+import { model as Challenge } from '../../../../website/server/models/challenge';
+import { model as Group } from '../../../../website/server/models/group';
+import { model as User } from '../../../../website/server/models/user';
+import * as Tasks from '../../../../website/server/models/task';
+import { InternalServerError } from '../../../../website/server/libs/errors';
 import { each } from 'lodash';
-import { generateHistory } from '../../../../helpers/api-unit.helper.js';
+import { generateHistory } from '../../../helpers/api-unit.helper.js';
 
 describe('Task Model', () => {
   let guild, leader, challenge, task;

test/api/unit/models/user.test.js

@@ -1,7 +1,7 @@
 import moment from 'moment';
-import { model as User } from '../../../../../website/server/models/user';
-import { model as Group } from '../../../../../website/server/models/group';
-import common from '../../../../../website/common';
+import { model as User } from '../../../../website/server/models/user';
+import { model as Group } from '../../../../website/server/models/group';
+import common from '../../../../website/common';
 
 describe('User Model', () => {
   it('keeps user._tmp when calling .toJSON', () => {

test/api/unit/models/userNotification.test.js

@@ -1,4 +1,4 @@
-import { model as UserNotification } from '../../../../../website/server/models/userNotification';
+import { model as UserNotification } from '../../../../website/server/models/userNotification';
 
 describe('UserNotification Model', () => {
   context('convertNotificationsToSafeJson', () => {

test/api/unit/models/webhook.test.js

@@ -1,7 +1,7 @@
-import { model as Webhook } from '../../../../../website/server/models/webhook';
-import { BadRequest } from '../../../../../website/server/libs/errors';
+import { model as Webhook } from '../../../../website/server/models/webhook';
+import { BadRequest } from '../../../../website/server/libs/errors';
 import { v4 as generateUUID } from 'uuid';
-import apiError from '../../../../../website/server/libs/apiError';
+import apiError from '../../../../website/server/libs/apiError';
 
 describe('Webhook Model', () => {
   context('Instance Methods', () => {

test/api/v3/integration/challenges/DELETE-challenges_challengeId.test.js

@@ -5,7 +5,7 @@ import {
   sleep,
   checkExistence,
   translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';
 
 describe('DELETE /challenges/:challengeId', () => {

test/api/v3/integration/challenges/GET-challenges_challengeId.test.js

@@ -3,7 +3,7 @@ import {
   createAndPopulateGroup,
   generateChallenge,
   translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';
 
 describe('GET /challenges/:challengeId', () => {

test/api/v3/integration/challenges/GET-challenges_challengeId_export_csv.test.js

@@ -4,7 +4,7 @@ import {
   generateChallenge,
   translate as t,
   sleep,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';
 
 describe('GET /challenges/:challengeId/export/csv', () => {

test/api/v3/integration/challenges/GET-challenges_challengeId_members.test.js

@@ -3,7 +3,7 @@ import {
   generateGroup,
   generateChallenge,
   translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';
 
 describe('GET /challenges/:challengeId/members', () => {

test/api/v3/integration/challenges/GET-challenges_challengeId_members_memberId.test.js

@@ -3,7 +3,7 @@ import {
   generateChallenge,
   generateGroup,
   translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';
 
 describe('GET /challenges/:challengeId/members/:memberId', () => {

test/api/v3/integration/challenges/GET-challenges_group_groupid.test.js

@@ -3,7 +3,7 @@ import {
   generateChallenge,
   createAndPopulateGroup,
   translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { TAVERN_ID } from '../../../../../website/common/script/constants';
 
 describe('GET challenges/groups/:groupId', () => {

test/api/v3/integration/challenges/GET-challenges_user.test.js

@@ -2,7 +2,7 @@ import {
   generateUser,
   generateChallenge,
   createAndPopulateGroup,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 
 describe('GET challenges/user', () => {
   context('no official challenges', () => {

test/api/v3/integration/challenges/POST-challenges.test.js

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

test/api/v3/integration/challenges/POST-challenges_challengeId_join.test.js

@@ -3,7 +3,7 @@ import {
   generateChallenge,
   createAndPopulateGroup,
   translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';
 
 describe('POST /challenges/:challengeId/join', () => {

test/api/v3/integration/challenges/POST-challenges_challengeId_leave.test.js

@@ -3,7 +3,7 @@ import {
   generateChallenge,
   createAndPopulateGroup,
   translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';
 
 describe('POST /challenges/:challengeId/leave', () => {

test/api/v3/integration/challenges/POST-challenges_challengeId_winner_winnerId.test.js

@@ -5,7 +5,7 @@ import {
   sleep,
   checkExistence,
   translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';
 
 describe('POST /challenges/:challengeId/winner/:winnerId', () => {

test/api/v3/integration/challenges/POST_challenges_id_clone.test.js

@@ -1,7 +1,7 @@
 import {
   generateUser,
   generateGroup,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 
 describe('POST /challenges/:challengeId/clone', () => {
   it('clones a challenge', async () => {

test/api/v3/integration/challenges/PUT-challenges_challengeId.test.js

@@ -3,7 +3,7 @@ import {
   generateChallenge,
   createAndPopulateGroup,
   translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 
 describe('PUT /challenges/:challengeId', () => {
   let privateGuild, user, nonMember, challenge, member;

test/api/v3/integration/chat/DELETE-chat_id.test.js

@@ -2,7 +2,7 @@ import {
   createAndPopulateGroup,
   generateUser,
   translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';
 
 describe('DELETE /groups/:groupId/chat/:chatId', () => {

test/api/v3/integration/chat/GET-chat.test.js

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

test/api/v3/integration/chat/POST-chat.flag.test.js

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

test/api/v3/integration/chat/POST-chat.like.test.js

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

test/api/v3/integration/chat/POST-chat.test.js

@@ -4,7 +4,7 @@ import {
   translate as t,
   sleep,
   server,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import {
   SPAM_MESSAGE_LIMIT,
   SPAM_MIN_EXEMPT_CONTRIB_LEVEL,

test/api/v3/integration/chat/POST-chat_seen.test.js

@@ -1,7 +1,7 @@
 import {
   createAndPopulateGroup,
   sleep,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 
 describe('POST /groups/:id/chat/seen', () => {
   context('Guild', () => {

test/api/v3/integration/chat/POST-groups_id_chat_id_clear_flags.test.js

@@ -2,7 +2,7 @@ import {
   createAndPopulateGroup,
   generateUser,
   translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import config from '../../../../../config.json';
 import { v4 as generateUUID } from 'uuid';
 

test/api/v3/integration/content/GET-content.test.js

@@ -1,7 +1,7 @@
 import {
   requester,
   translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import i18n from '../../../../../website/common/script/i18n';
 
 describe('GET /content', () => {

test/api/v3/integration/coupons/GET-coupons.test.js

@@ -1,7 +1,7 @@
 import {
   generateUser,
   resetHabiticaDB,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import apiError from '../../../../../website/server/libs/apiError';
 
 describe('GET /coupons/', () => {

test/api/v3/integration/coupons/POST-coupons_enter_code.test.js

@@ -2,7 +2,7 @@ import {
   generateUser,
   translate as t,
   resetHabiticaDB,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 
 describe('POST /coupons/enter/:code', () => {
   let user;

test/api/v3/integration/coupons/POST-coupons_generate_event.test.js

@@ -2,7 +2,7 @@ import {
   generateUser,
   translate as t,
   resetHabiticaDB,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import couponCode from 'coupon-code';
 import apiError from '../../../../../website/server/libs/apiError';
 

test/api/v3/integration/coupons/POST-coupons_validate_code.test.js

@@ -2,7 +2,7 @@ import {
   generateUser,
   requester,
   resetHabiticaDB,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 
 describe('POST /coupons/validate/:code', () => {
   let api = requester();

test/api/v3/integration/dataexport/GET-export_avatar-memberId.html.test.js

@@ -1,7 +1,7 @@
 import {
   generateUser,
   translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';
 
 xdescribe('GET /export/avatar-:memberId.html', () => {

test/api/v3/integration/dataexport/GET-export_history.csv.test.js

@@ -1,6 +1,6 @@
 import {
   generateUser,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import {
   updateDocument,
 } from '../../../../helpers/mongo';

test/api/v3/integration/dataexport/GET-export_inbox.html.test.js

@@ -1,6 +1,6 @@
 import {
   generateUser,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 
 describe('GET /export/inbox.html', () => {
   let user;

test/api/v3/integration/dataexport/GET-export_userdata.json.test.js

@@ -1,6 +1,6 @@
 import {
   generateUser,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 
 describe('GET /export/userdata.json', () => {
   it('should return a valid JSON file with user data', async () => {

test/api/v3/integration/dataexport/GET-export_userdata.xml.test.js

@@ -1,6 +1,6 @@
 import {
   generateUser,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import xml2js from 'xml2js';
 import util from 'util';
 

test/api/v3/integration/debug/POST-debug_addHourglass.test.js

@@ -1,7 +1,7 @@
 import nconf from 'nconf';
 import {
   generateUser,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 
 describe('POST /debug/add-hourglass', () => {
   let userToGetHourGlass;

test/api/v3/integration/debug/POST-debug_addTenGems.test.js

@@ -1,7 +1,7 @@
 import nconf from 'nconf';
 import {
   generateUser,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 
 describe('POST /debug/add-ten-gems', () => {
   let userToGainTenGems;

test/api/v3/integration/debug/POST-debug_make-admin.test.js

@@ -1,7 +1,7 @@
 import nconf from 'nconf';
 import {
   generateUser,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 
 describe('POST /debug/make-admin (pended for v3 prod testing)', () => {
   let user;

test/api/v3/integration/debug/POST-debug_modify-inventory.test.js

@@ -3,7 +3,7 @@
 import nconf from 'nconf';
 import {
   generateUser,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 
 describe('POST /debug/modify-inventory', () => {
   let user, originalItems;

test/api/v3/integration/debug/POST-debug_quest-progress.test.js

@@ -1,7 +1,7 @@
 import nconf from 'nconf';
 import {
   generateUser,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 
 describe('POST /debug/quest-progress', () => {
   let user;

test/api/v3/integration/debug/POST-debug_set-cron.test.js

@@ -1,7 +1,7 @@
 import nconf from 'nconf';
 import {
   generateUser,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 
 describe('POST /debug/set-cron', () => {
   let user;

test/api/v3/integration/emails/GET-email-unsubscribe.test.js

@@ -1,7 +1,7 @@
 import {
   generateUser,
   translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { encrypt } from '../../../../../website/server/libs/encryption';
 import { v4 as generateUUID } from 'uuid';
 

test/api/v3/integration/groups/GET-group-plans.test.js

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

test/api/v3/integration/groups/GET-groups.test.js

@@ -3,7 +3,7 @@ import {
   resetHabiticaDB,
   generateGroup,
   translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import {
   TAVERN_ID,
 } from '../../../../../website/server/models/group';

test/api/v3/integration/groups/GET-groups_groupId_invites.test.js

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

test/api/v3/integration/groups/GET-groups_groupId_members.test.js

@@ -2,7 +2,7 @@ import {
   generateUser,
   generateGroup,
   translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';
 import common from '../../../../../website/common';
 

test/api/v3/integration/groups/GET-groups_id.test.js

@@ -2,7 +2,7 @@ import {
   generateUser,
   createAndPopulateGroup,
   translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';
 
 import {

test/api/v3/integration/groups/POST-group_remove_manager.test.js

@@ -1,7 +1,7 @@
 import {
   createAndPopulateGroup,
   translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { find } from 'lodash';
 
 describe('POST /group/:groupId/remove-manager', () => {