4.144.1

.github/workflows/test.yml

@@ -22,7 +22,6 @@ jobs:
         npm ci
       env:
         CI: true
-        NODE_ENV: test
     - run: npm run lint-no-fix
   apidoc:
     runs-on: ubuntu-latest
@@ -43,7 +42,6 @@ jobs:
         npm ci
       env:
         CI: true
-        NODE_ENV: test
     - run: npm run apidoc
   sanity:
     runs-on: ubuntu-latest
@@ -64,7 +62,6 @@ jobs:
         npm ci
       env:
         CI: true
-        NODE_ENV: test
     - run: npm run test:sanity
   
   common:
@@ -86,7 +83,6 @@ jobs:
         npm ci
       env:
         CI: true
-        NODE_ENV: test
     - run: npm run test:common
   content:
     runs-on: ubuntu-latest
@@ -107,7 +103,6 @@ jobs:
         npm ci
       env:
         CI: true
-        NODE_ENV: test
     - run: npm run test:content
   
   api-unit:
@@ -115,7 +110,6 @@ jobs:
     strategy:
       matrix:
         node-version: [12.x]
-        mongodb-version: [4.2]
     steps:
     - uses: actions/checkout@v1
       with:
@@ -124,18 +118,13 @@ jobs:
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-    - name: Start MongoDB ${{ matrix.mongodb-version }} Replica Set
-      uses: supercharge/mongodb-github-action@1.3.0
-      with:
-        mongodb-version: ${{ matrix.mongodb-version }}
-        mongodb-replica-set: rs
+    - run: sudo docker run --name mongo -d -p 27017:27017 mongo
     - run: cp config.json.example config.json
     - name: npm install
       run: |
         npm ci
       env:
         CI: true
-        NODE_ENV: test
     - run: npm run test:api:unit
       env:
         REQUIRES_SERVER=true: true
@@ -144,7 +133,6 @@ jobs:
     strategy:
       matrix:
         node-version: [12.x]
-        mongodb-version: [4.2]
     steps:
     - uses: actions/checkout@v1
       with:
@@ -153,18 +141,13 @@ jobs:
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-    - name: Start MongoDB ${{ matrix.mongodb-version }} Replica Set
-      uses: supercharge/mongodb-github-action@1.3.0
-      with:
-        mongodb-version: ${{ matrix.mongodb-version }}
-        mongodb-replica-set: rs
+    - run: sudo docker run --name mongo -d -p 27017:27017 mongo
     - run: cp config.json.example config.json
     - name: npm install
       run: |
         npm ci
       env:
         CI: true
-        NODE_ENV: test
     - run: npm run test:api-v3:integration
       env:
         REQUIRES_SERVER=true: true
@@ -173,7 +156,6 @@ jobs:
     strategy:
       matrix:
         node-version: [12.x]
-        mongodb-version: [4.2]
     steps:
     - uses: actions/checkout@v1
       with:
@@ -182,18 +164,13 @@ jobs:
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-    - name: Start MongoDB ${{ matrix.mongodb-version }} Replica Set
-      uses: supercharge/mongodb-github-action@1.3.0
-      with:
-        mongodb-version: ${{ matrix.mongodb-version }}
-        mongodb-replica-set: rs
+    - run: sudo docker run --name mongo -d -p 27017:27017 mongo
     - run: cp config.json.example config.json
     - name: npm install
       run: |
         npm ci
       env:
         CI: true
-        NODE_ENV: test
     - run: npm run test:api-v4:integration
       env:
         REQUIRES_SERVER=true: true
@@ -217,6 +194,5 @@ jobs:
         npm ci
       env:
         CI: true
-        NODE_ENV: test
     - run: npm run test:unit
       working-directory: ./website/client

.gitignore

@@ -38,12 +38,7 @@ yarn.lock
 .elasticbeanstalk/*
 !.elasticbeanstalk/*.cfg.yml
 !.elasticbeanstalk/*.global.yml
-
 /.vscode
 
 # webstorm fake webpack for path intellisense
 webpack.webstorm.config
-
-# mongodb replica set for local dev
-mongodb-*.tgz
-/mongodb-data

apidoc.json

@@ -2,10 +2,6 @@
   "name": "Habitica V3 API Documentation",
   "title": "Habitica",
   "url": "https://habitica.com",
-  "header": {
-    "title": "Introduction",
-    "filename": "apidoc/header.md"
-  },
   "template": {
     "withCompare": false
   }

apidoc/header.md

@@ -1,5 +0,0 @@
-# Introduction
-
-This webpage includes the documentation for version 3 of the [Habitica](https://habitica.com) API.
-
-If you're developing a 3rd party tool that uses the Habitica API you should read the [Guidance for Comrades](https://habitica.fandom.com/wiki/Guidance_for_Comrades) and in particular the section called [Rules for Third-Party Tools](https://habitica.fandom.com/wiki/Guidance_for_Comrades#Rules_for_Third-Party_Tools) which includes suggestions on how to best use the API and the rules to follow when interacting with it. 

config.json.example

@@ -32,8 +32,7 @@
   "LOGGLY_SUBDOMAIN": "example-subdomain",
   "LOGGLY_TOKEN": "example-token",
   "MAINTENANCE_MODE": "false",
-  "NODE_DB_URI": "mongodb://localhost:27017/habitica-dev?replicaSet=rs",
-  "TEST_DB_URI": "mongodb://localhost:27017/habitica-test?replicaSet=rs",
+  "NODE_DB_URI": "mongodb://localhost:27017/habitrpg",
   "MONGODB_POOL_SIZE": "10",
   "NODE_ENV": "development",
   "PATH": "bin:node_modules/.bin:/usr/local/bin:/usr/bin:/bin",
@@ -71,6 +70,7 @@
   "SLACK_URL": "https://hooks.slack.com/services/some-url",
   "STRIPE_API_KEY": "aaaabbbbccccddddeeeeffff00001111",
   "STRIPE_PUB_KEY": "22223333444455556666777788889999",
+  "TEST_DB_URI": "mongodb://localhost:27017/habitrpg_test",
   "TRANSIFEX_SLACK_CHANNEL": "transifex",
   "WEB_CONCURRENCY": 1,
   "SKIP_SSL_CHECK_KEY": "key",
@@ -80,9 +80,5 @@
   "APPLE_AUTH_CLIENT_ID": "",
   "APPLE_AUTH_KEY_ID": "",
   "BLOCKED_IPS": "",
-  "LOG_AMPLITUDE_EVENTS": "false",
-  "RATE_LIMITER_ENABLED": "false",
-  "REDIS_HOST": "aaabbbcccdddeeefff",
-  "REDIS_PORT": "1234",
-  "REDIS_PASSWORD": "12345678"
+  "LOG_AMPLITUDE_EVENTS": "false"
 }

gulp/gulp-build.js

@@ -1,12 +1,5 @@
-/* eslint-disable no-console */
-
 import gulp from 'gulp';
-import path from 'path';
 import babel from 'gulp-babel';
-import os from 'os';
-import fs from 'fs';
-import spawn from 'cross-spawn'; // eslint-disable-line import/no-extraneous-dependencies
-import clean from 'rimraf';
 
 gulp.task('build:babel:server', () => gulp.src('website/server/**/*.js')
   .pipe(babel())
@@ -31,67 +24,10 @@ gulp.task('build:prod', gulp.series(
   done => done(),
 ));
 
-// Due to this issue https://github.com/vkarpov15/run-rs/issues/45
-// When used on windows `run-rs` must first be run without the `--keep` option
-// in order to be setup correctly, afterwards it can be used.
-
-const MONGO_PATH = path.join(__dirname, '/../mongodb-data/');
-
-gulp.task('build:prepare-mongo', async () => {
-  if (fs.existsSync(MONGO_PATH)) {
-    // console.log('MongoDB data folder exists, skipping setup.');
-    return;
-  }
-
-  if (os.platform() !== 'win32') {
-    // console.log('Not on Windows, skipping MongoDB setup.');
-    return;
-  }
-
-  console.log('MongoDB data folder is missing, setting up.'); // eslint-disable-line no-console
-
-  // use run-rs without --keep, kill it as soon as the replica set starts
-  const runRsProcess = spawn('run-rs', ['-v', '4.2.8', '-l', 'ubuntu1804', '--dbpath', 'mongodb-data', '--number', '1', '--quiet']);
-
-  for await (const chunk of runRsProcess.stdout) {
-    const stringChunk = chunk.toString();
-    console.log(stringChunk); // eslint-disable-line no-console
-    // kills the process after the replica set is setup
-    if (stringChunk.includes('Started replica set')) {
-      console.log('MongoDB setup correctly.'); // eslint-disable-line no-console
-      runRsProcess.kill();
-    }
-  }
-
-  let error = '';
-  for await (const chunk of runRsProcess.stderr) {
-    const stringChunk = chunk.toString();
-    error += stringChunk;
-  }
-
-  const exitCode = await new Promise(resolve => {
-    runRsProcess.on('close', resolve);
-  });
-
-  if (exitCode || error.length > 0) {
-    // remove any leftover files
-    clean.sync(MONGO_PATH);
-
-    throw new Error(`Error running run-rs: ${error}`);
-  }
-});
-
-gulp.task('build:dev', gulp.series(
-  'build:prepare-mongo',
-  done => done(),
-));
-
 const buildArgs = [];
 
 if (process.env.NODE_ENV === 'production') { // eslint-disable-line no-process-env
   buildArgs.push('build:prod');
-} else if (process.env.NODE_ENV !== 'test') { // eslint-disable-line no-process-env
-  buildArgs.push('build:dev');
 }
 
 gulp.task('build', gulp.series(buildArgs, done => {

gulp/gulp-console.js

@@ -3,10 +3,6 @@ import nconf from 'nconf';
 import repl from 'repl';
 import gulp from 'gulp';
 import logger from '../website/server/libs/logger';
-import {
-  getDevelopmentConnectionUrl,
-  getDefaultConnectionOptions,
-} from '../website/server/libs/mongodb';
 
 // Add additional properties to the repl's context
 const improveRepl = context => {
@@ -30,14 +26,13 @@ const improveRepl = context => {
   context.Group = require('../website/server/models/group').model; // eslint-disable-line global-require
   context.User = require('../website/server/models/user').model; // eslint-disable-line global-require
 
-  const IS_PROD = nconf.get('NODE_ENV') === 'production';
-  const NODE_DB_URI = nconf.get('NODE_DB_URI');
-
-  const mongooseOptions = getDefaultConnectionOptions();
-  const connectionUrl = IS_PROD ? NODE_DB_URI : getDevelopmentConnectionUrl(NODE_DB_URI);
-
+  const isProd = nconf.get('NODE_ENV') === 'production';
+  const mongooseOptions = !isProd ? {} : {
+    keepAlive: 1,
+    connectTimeoutMS: 30000,
+  };
   mongoose.connect(
-    connectionUrl,
+    nconf.get('NODE_DB_URI'),
     mongooseOptions,
     err => {
       if (err) throw err;

gulp/gulp-tests.js

@@ -3,11 +3,9 @@ import { exec } from 'child_process';
 import gulp from 'gulp';
 import os from 'os';
 import nconf from 'nconf';
-import { pipe } from './taskHelper';
 import {
-  getDevelopmentConnectionUrl,
-  getDefaultConnectionOptions,
-} from '../website/server/libs/mongodb';
+  pipe,
+} from './taskHelper';
 
 // TODO rewrite
 
@@ -19,16 +17,15 @@ const TEST_DB_URI = nconf.get('TEST_DB_URI');
 const SANITY_TEST_COMMAND = 'npm run test:sanity';
 const COMMON_TEST_COMMAND = 'npm run test:common';
 const CONTENT_TEST_COMMAND = 'npm run test:content';
-const LIMIT_MAX_BUFFER_OPTIONS = { maxBuffer: 1024 * 500 };
+const CONTENT_OPTIONS = { maxBuffer: 1024 * 500 };
 
-/* Helper method for reporting test summary */
+/* Helper methods for reporting test summary */
 const testResults = [];
 const testCount = (stdout, regexp) => {
   const match = stdout.match(regexp);
   return parseInt(match && (match[1] || 0), 10);
 };
 
-/* Helper methods to correctly run child test processes */
 const testBin = (string, additionalEnvVariables = '') => {
   if (os.platform() === 'win32') {
     if (additionalEnvVariables !== '') {
@@ -40,15 +37,6 @@ const testBin = (string, additionalEnvVariables = '') => {
   return `NODE_ENV=test ${additionalEnvVariables} ${string}`;
 };
 
-function runInChildProcess (command, options = {}, envVariables = '') {
-  return done => pipe(exec(testBin(command, envVariables), options, done));
-}
-
-function integrationTestCommand (testDir, coverageDir) {
-  return `istanbul cover --dir coverage/${coverageDir} --report lcovonly node_modules/mocha/bin/_mocha -- ${testDir} --recursive --require ./test/helpers/start-server`;
-}
-
-/* Test task definitions */
 gulp.task('test:nodemon', gulp.series(done => {
   process.env.PORT = TEST_SERVER_PORT; // eslint-disable-line no-process-env
   process.env.NODE_DB_URI = TEST_DB_URI; // eslint-disable-line no-process-env
@@ -56,10 +44,7 @@ gulp.task('test:nodemon', gulp.series(done => {
 }, 'nodemon'));
 
 gulp.task('test:prepare:mongo', cb => {
-  const mongooseOptions = getDefaultConnectionOptions();
-  const connectionUrl = getDevelopmentConnectionUrl(TEST_DB_URI);
-
-  mongoose.connect(connectionUrl, mongooseOptions, err => {
+  mongoose.connect(TEST_DB_URI, err => {
     if (err) return cb(`Unable to connect to mongo database. Are you sure it's running? \n\n${err}`);
     return mongoose.connection.dropDatabase(err2 => {
       if (err2) return cb(err2);
@@ -90,9 +75,31 @@ gulp.task('test:prepare', gulp.series(
   done => done(),
 ));
 
-gulp.task('test:sanity', runInChildProcess(SANITY_TEST_COMMAND));
+gulp.task('test:sanity', cb => {
+  const runner = exec(
+    testBin(SANITY_TEST_COMMAND),
+    err => {
+      if (err) {
+        process.exit(1);
+      }
+      cb();
+    },
+  );
+  pipe(runner);
+});
 
-gulp.task('test:common', gulp.series('test:prepare:build', runInChildProcess(COMMON_TEST_COMMAND)));
+gulp.task('test:common', gulp.series('test:prepare:build', cb => {
+  const runner = exec(
+    testBin(COMMON_TEST_COMMAND),
+    err => {
+      if (err) {
+        process.exit(1);
+      }
+      cb();
+    },
+  );
+  pipe(runner);
+}));
 
 gulp.task('test:common:clean', cb => {
   pipe(exec(testBin(COMMON_TEST_COMMAND), () => cb()));
@@ -116,11 +123,22 @@ gulp.task('test:common:safe', gulp.series('test:prepare:build', cb => {
   pipe(runner);
 }));
 
-gulp.task('test:content', gulp.series('test:prepare:build',
-  runInChildProcess(CONTENT_TEST_COMMAND, LIMIT_MAX_BUFFER_OPTIONS)));
+gulp.task('test:content', gulp.series('test:prepare:build', cb => {
+  const runner = exec(
+    testBin(CONTENT_TEST_COMMAND),
+    CONTENT_OPTIONS,
+    err => {
+      if (err) {
+        process.exit(1);
+      }
+      cb();
+    },
+  );
+  pipe(runner);
+}));
 
 gulp.task('test:content:clean', cb => {
-  pipe(exec(testBin(CONTENT_TEST_COMMAND), LIMIT_MAX_BUFFER_OPTIONS, () => cb()));
+  pipe(exec(testBin(CONTENT_TEST_COMMAND), CONTENT_OPTIONS, () => cb()));
 });
 
 gulp.task('test:content:watch', gulp.series('test:content:clean', () => gulp.watch(['common/script/content/**', 'test/**'], gulp.series('test:content:clean', done => done()))));
@@ -128,7 +146,7 @@ gulp.task('test:content:watch', gulp.series('test:content:clean', () => gulp.wat
 gulp.task('test:content:safe', gulp.series('test:prepare:build', cb => {
   const runner = exec(
     testBin(CONTENT_TEST_COMMAND),
-    LIMIT_MAX_BUFFER_OPTIONS,
+    CONTENT_OPTIONS,
     (err, stdout) => { // eslint-disable-line handle-callback-err
       testResults.push({
         suite: 'Content Specs\t',
@@ -142,51 +160,82 @@ gulp.task('test:content:safe', gulp.series('test:prepare:build', cb => {
   pipe(runner);
 }));
 
-gulp.task('test:api:unit:run',
-  runInChildProcess(integrationTestCommand('test/api/unit', 'coverage/api-unit')));
+gulp.task('test:api:unit', done => {
+  const runner = exec(
+    testBin('istanbul cover --dir coverage/api-unit node_modules/mocha/bin/_mocha -- test/api/unit --recursive --require ./test/helpers/start-server'),
+    err => {
+      if (err) {
+        process.exit(1);
+      }
+      done();
+    },
+  );
 
-gulp.task('test:api:unit:watch', () => gulp.watch(['website/server/libs/*', 'test/api/unit/**/*', 'website/server/controllers/**/*'], gulp.series('test:api:unit:run', done => done())));
+  pipe(runner);
+});
 
-gulp.task('test:api-v3:integration', gulp.series('test:prepare:mongo',
-  runInChildProcess(
-    integrationTestCommand('test/api/v3/integration', 'coverage/api-v3-integration'),
-    LIMIT_MAX_BUFFER_OPTIONS,
-  )));
+gulp.task('test:api:unit:watch', () => gulp.watch(['website/server/libs/*', 'test/api/unit/**/*', 'website/server/controllers/**/*'], gulp.series('test:api:unit', done => done())));
+
+gulp.task('test:api-v3:integration', done => {
+  const runner = exec(
+    testBin('istanbul cover --dir coverage/api-v3-integration --report lcovonly node_modules/mocha/bin/_mocha -- test/api/v3/integration --recursive --require ./test/helpers/start-server'),
+    { maxBuffer: 500 * 1024 },
+    err => {
+      if (err) {
+        process.exit(1);
+      }
+      done();
+    },
+  );
+
+  pipe(runner);
+});
 
 gulp.task('test:api-v3:integration:watch', () => gulp.watch([
   'website/server/controllers/api-v3/**/*', 'common/script/ops/*', 'website/server/libs/*.js',
   'test/api/v3/integration/**/*',
 ], gulp.series('test:api-v3:integration', done => done())));
 
-gulp.task('test:api-v3:integration:separate-server', runInChildProcess(
-  'mocha test/api/v3/integration --recursive --require ./test/helpers/start-server',
-  LIMIT_MAX_BUFFER_OPTIONS,
-  'LOAD_SERVER=0',
-));
+gulp.task('test:api-v3:integration:separate-server', done => {
+  const runner = exec(
+    testBin('mocha test/api/v3/integration --recursive --require ./test/helpers/start-server', 'LOAD_SERVER=0'),
+    { maxBuffer: 500 * 1024 },
+    err => done(err),
+  );
 
-gulp.task('test:api-v4:integration', gulp.series('test:prepare:mongo',
-  runInChildProcess(
-    integrationTestCommand('test/api/v4', 'api-v4-integration'),
-    LIMIT_MAX_BUFFER_OPTIONS,
-  )));
+  pipe(runner);
+});
 
-gulp.task('test:api-v4:integration:separate-server', runInChildProcess(
-  'mocha test/api/v4 --recursive --require ./test/helpers/start-server',
-  LIMIT_MAX_BUFFER_OPTIONS,
-  'LOAD_SERVER=0',
-));
+gulp.task('test:api-v4:integration', done => {
+  const runner = exec(
+    testBin('istanbul cover --dir coverage/api-v4-integration --report lcovonly node_modules/mocha/bin/_mocha -- test/api/v4 --recursive --require ./test/helpers/start-server'),
+    { maxBuffer: 500 * 1024 },
+    err => {
+      if (err) {
+        process.exit(1);
+      }
+      done();
+    },
+  );
 
-gulp.task('test:api:unit', gulp.series(
-  'test:prepare:mongo',
-  'test:api:unit:run',
-  done => done(),
-));
+  pipe(runner);
+});
+
+gulp.task('test:api-v4:integration:separate-server', done => {
+  const runner = exec(
+    testBin('mocha test/api/v4 --recursive --require ./test/helpers/start-server', 'LOAD_SERVER=0'),
+    { maxBuffer: 500 * 1024 },
+    err => done(err),
+  );
+
+  pipe(runner);
+});
 
 gulp.task('test', gulp.series(
   'test:sanity',
   'test:content',
   'test:common',
-  'test:api:unit:run',
+  'test:api:unit',
   'test:api-v3:integration',
   'test:api-v4:integration',
   done => done(),

gulp/gulp-transifex-test.js

@@ -12,6 +12,7 @@ const SLACK_CONFIG = {
 const LOCALES = './website/common/locales/';
 const ENGLISH_LOCALE = `${LOCALES}en/`;
 
+
 function getArrayOfLanguages () {
   const languages = fs.readdirSync(LOCALES);
   languages.shift(); // Remove README.md from array of languages

migrations/archive/2020/20200218_pet_color_achievements.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-const MIGRATION_NAME = '20201020_pet_color_achievements';
+const MIGRATION_NAME = '20200218_pet_color_achievements';
 import { model as User } from '../../../website/server/models/user';
 
 const progressCount = 1000;
@@ -14,31 +14,31 @@ async function updateUser (user) {
 
   if (user && user.items && user.items.pets) {
     const pets = user.items.pets;
-    if (pets['Wolf-Golden'] > 0
-      && pets['TigerCub-Skeleton'] > 0
-      && pets['PandaCub-Skeleton'] > 0
-      && pets['LionCub-Skeleton'] > 0
-      && pets['Fox-Skeleton'] > 0
-      && pets['FlyingPig-Skeleton'] > 0
-      && pets['Dragon-Skeleton'] > 0
-      && pets['Cactus-Skeleton'] > 0
-      && pets['BearCub-Skeleton'] > 0) {
-        set['achievements.boneCollector'] = true;
+    if (pets['Wolf-CottonCandyPink'] > 0
+      && pets['TigerCub-CottonCandyPink'] > 0
+      && pets['PandaCub-CottonCandyPink'] > 0
+      && pets['LionCub-CottonCandyPink'] > 0
+      && pets['Fox-CottonCandyPink'] > 0
+      && pets['FlyingPig-CottonCandyPink'] > 0
+      && pets['Dragon-CottonCandyPink'] > 0
+      && pets['Cactus-CottonCandyPink'] > 0
+      && pets['BearCub-CottonCandyPink'] > 0) {
+        set['achievements.tickledPink'] = true;
       }
   }
 
   if (user && user.items && user.items.mounts) {
     const mounts = user.items.mounts;
-    if (mounts['Wolf-Skeleton']
-      && mounts['TigerCub-Skeleton']
-      && mounts['PandaCub-Skeleton']
-      && mounts['LionCub-Skeleton']
-      && mounts['Fox-Skeleton']
-      && mounts['FlyingPig-Skeleton']
-      && mounts['Dragon-Skeleton']
-      && mounts['Cactus-Skeleton']
-      && mounts['BearCub-Skeleton'] ) {
-        set['achievements.skeletonCrew'] = true;
+    if (mounts['Wolf-CottonCandyPink']
+      && mounts['TigerCub-CottonCandyPink']
+      && mounts['PandaCub-CottonCandyPink']
+      && mounts['LionCub-CottonCandyPink']
+      && mounts['Fox-CottonCandyPink']
+      && mounts['FlyingPig-CottonCandyPink']
+      && mounts['Dragon-CottonCandyPink']
+      && mounts['Cactus-CottonCandyPink']
+      && mounts['BearCub-CottonCandyPink'] ) {
+        set['achievements.rosyOutlook'] = true;
       }
   }
 
@@ -50,7 +50,7 @@ async function updateUser (user) {
 module.exports = async function processUsers () {
   let query = {
     migration: { $ne: MIGRATION_NAME },
-    'auth.timestamps.loggedin': { $gt: new Date('2020-10-01') },
+    'auth.timestamps.loggedin': { $gt: new Date('2020-02-01') },
   };
 
   const fields = {

migrations/archive/2020/20200721_summer_splash_orcas.js

@@ -1,59 +0,0 @@
-/* eslint-disable no-console */
-const MIGRATION_NAME = '20200721_summer_splash_orcas';
-
-import { model as User } from '../../../website/server/models/user';
-
-const progressCount = 1000;
-let count = 0;
-
-async function updateUser (user) {
-  count++;
-
-  let set;
-
-  if (user && user.items && user.items.pets && typeof user.items.pets['Orca-Base'] !== 'undefined') {
-    set = { migration: MIGRATION_NAME };
-  } else if (user && user.items && user.items.mounts && typeof user.items.mounts['Orca-Base'] !== 'undefined') {
-    set = { migration: MIGRATION_NAME, 'items.pets.Orca-Base': 5 };
-  } else {
-    set = { migration: MIGRATION_NAME, 'items.mounts.Orca-Base': true };
-  }
-
-  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
-
-  return await User.update({ _id: user._id }, { $set: set }).exec();
-}
-
-export default async function processUsers () {
-  let query = {
-    migration: {$ne: MIGRATION_NAME},
-    'auth.timestamps.loggedin': {$gt: new Date('2020-06-21')},
-  };
-
-  const fields = {
-    _id: 1,
-    items: 1,
-  };
-
-  while (true) { // eslint-disable-line no-constant-condition
-    const users = await User // eslint-disable-line no-await-in-loop
-      .find(query)
-      .limit(250)
-      .sort({_id: 1})
-      .select(fields)
-      .lean()
-      .exec();
-
-    if (users.length === 0) {
-      console.warn('All appropriate users found and modified.');
-      console.warn(`\n${count} users processed\n`);
-      break;
-    } else {
-      query._id = {
-        $gt: users[users.length - 1],
-      };
-    }
-
-    await Promise.all(users.map(updateUser)); // eslint-disable-line no-await-in-loop
-  }
-};

migrations/archive/2020/20200731_naming_day.js

@@ -1,87 +0,0 @@
-/* eslint-disable no-console */
-const MIGRATION_NAME = '20200731_naming_day';
-import { v4 as uuid } from 'uuid';
-
-import { model as User } from '../../../website/server/models/user';
-
-const progressCount = 1000;
-let count = 0;
-
-async function updateUser (user) {
-  count++;
-
-  let set;
-  let push;
-  const inc = {
-    'items.food.Cake_Base': 1,
-    'items.food.Cake_CottonCandyBlue': 1,
-    'items.food.Cake_CottonCandyPink': 1,
-    'items.food.Cake_Desert': 1,
-    'items.food.Cake_Golden': 1,
-    'items.food.Cake_Red': 1,
-    'items.food.Cake_Shade': 1,
-    'items.food.Cake_Skeleton': 1,
-    'items.food.Cake_White': 1,
-    'items.food.Cake_Zombie': 1,
-    'achievements.habiticaDays': 1,
-  };
-
-  if (user && user.items && user.items.gear && user.items.gear.owned && typeof user.items.gear.owned.back_special_namingDay2020 !== 'undefined') {
-    set = { migration: MIGRATION_NAME };
-  } else if (user && user.items && user.items.gear && user.items.gear.owned && typeof user.items.gear.owned.body_special_namingDay2018 !== 'undefined') {
-    set = { migration: MIGRATION_NAME, 'items.gear.owned.back_special_namingDay2020': false };
-    push = { pinnedItems: { type: 'marketGear', path: 'gear.flat.back_special_namingDay2020', _id: uuid() }};
-  } else if (user && user.items && user.items.gear && user.items.gear.owned && typeof user.items.gear.owned.head_special_namingDay2017 !== 'undefined') {
-    set = { migration: MIGRATION_NAME, 'items.gear.owned.body_special_namingDay2018': false };
-    push = { pinnedItems: { type: 'marketGear', path: 'gear.flat.body_special_namingDay2018', _id: uuid() }};
-  } else if (user && user.items && user.items.pets && typeof user.items.pets['Gryphon-RoyalPurple'] !== 'undefined') {
-    set = { migration: MIGRATION_NAME, 'items.gear.owned.head_special_namingDay2017': false };
-    push = { pinnedItems: { type: 'marketGear', path: 'gear.flat.head_special_namingDay2017', _id: uuid() }};
-  } else if (user && user.items && user.items.mounts && typeof user.items.mounts['Gryphon-RoyalPurple'] !== 'undefined') {
-    set = { migration: MIGRATION_NAME, 'items.pets.Gryphon-RoyalPurple': 5 };
-  } else {
-    set = { migration: MIGRATION_NAME, 'items.mounts.Gryphon-RoyalPurple': true };
-  }
-
-  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
-
-  if (push) {
-    return await User.update({ _id: user._id }, { $set: set, $inc: inc, $push: push }).exec();
-  } else {
-    return await User.update({ _id: user._id }, { $set: set, $inc: inc }).exec();
-  }
-}
-
-export default async function processUsers () {
-  let query = {
-    migration: { $ne: MIGRATION_NAME },
-    'auth.timestamps.loggedin': { $gt: new Date('2020-07-01') },
-  };
-
-  const fields = {
-    _id: 1,
-    items: 1,
-  };
-
-  while (true) { // eslint-disable-line no-constant-condition
-    const users = await User // eslint-disable-line no-await-in-loop
-      .find(query)
-      .limit(250)
-      .sort({_id: 1})
-      .select(fields)
-      .lean()
-      .exec();
-
-    if (users.length === 0) {
-      console.warn('All appropriate users found and modified.');
-      console.warn(`\n${count} users processed\n`);
-      break;
-    } else {
-      query._id = {
-        $gt: users[users.length - 1]._id,
-      };
-    }
-
-    await Promise.all(users.map(updateUser)); // eslint-disable-line no-await-in-loop
-  }
-};

migrations/archive/2020/20200818_pet_color_achievements.js

@@ -1,82 +0,0 @@
-/* eslint-disable no-console */
-const MIGRATION_NAME = '20200818_pet_color_achievements';
-import { model as User } from '../../../website/server/models/user';
-
-const progressCount = 1000;
-let count = 0;
-
-async function updateUser (user) {
-  count++;
-
-  const set = {
-    migration: MIGRATION_NAME,
-  };
-
-  if (user && user.items && user.items.pets) {
-    const pets = user.items.pets;
-    if (pets['Wolf-Golden'] > 0
-      && pets['TigerCub-Golden'] > 0
-      && pets['PandaCub-Golden'] > 0
-      && pets['LionCub-Golden'] > 0
-      && pets['Fox-Golden'] > 0
-      && pets['FlyingPig-Golden'] > 0
-      && pets['Dragon-Golden'] > 0
-      && pets['Cactus-Golden'] > 0
-      && pets['BearCub-Golden'] > 0) {
-        set['achievements.goodAsGold'] = true;
-      }
-  }
-
-  if (user && user.items && user.items.mounts) {
-    const mounts = user.items.mounts;
-    if (mounts['Wolf-Golden']
-      && mounts['TigerCub-Golden']
-      && mounts['PandaCub-Golden']
-      && mounts['LionCub-Golden']
-      && mounts['Fox-Golden']
-      && mounts['FlyingPig-Golden']
-      && mounts['Dragon-Golden']
-      && mounts['Cactus-Golden']
-      && mounts['BearCub-Golden'] ) {
-        set['achievements.allThatGlitters'] = true;
-      }
-  }
-
-  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
-
-  return await User.update({ _id: user._id }, { $set: set }).exec();
-}
-
-module.exports = async function processUsers () {
-  let query = {
-    migration: { $ne: MIGRATION_NAME },
-    'auth.timestamps.loggedin': { $gt: new Date('2020-08-01') },
-  };
-
-  const fields = {
-    _id: 1,
-    items: 1,
-  };
-
-  while (true) { // eslint-disable-line no-constant-condition
-    const users = await User // eslint-disable-line no-await-in-loop
-      .find(query)
-      .limit(250)
-      .sort({_id: 1})
-      .select(fields)
-      .lean()
-      .exec();
-
-    if (users.length === 0) {
-      console.warn('All appropriate users found and modified.');
-      console.warn(`\n${count} users processed\n`);
-      break;
-    } else {
-      query._id = {
-        $gt: users[users.length - 1]._id,
-      };
-    }
-
-    await Promise.all(users.map(updateUser)); // eslint-disable-line no-await-in-loop
-  }
-};

migrations/archive/2020/20201029_habitoween_ladder.js

@@ -1,84 +0,0 @@
-/*
- * Award Habitoween ladder items to participants in this month's Habitoween festivities
- */
-/* eslint-disable no-console */
-
-const MIGRATION_NAME = '20201029_habitoween_ladder'; // Update when running in future years
-
-import { model as User } from '../../../website/server/models/user';
-
-const progressCount = 1000;
-let count = 0;
-
-async function updateUser (user) {
-  count++;
-
-  const set = {};
-  const inc = {
-    'items.food.Candy_Skeleton': 1,
-    'items.food.Candy_Base': 1,
-    'items.food.Candy_CottonCandyBlue': 1,
-    'items.food.Candy_CottonCandyPink': 1,
-    'items.food.Candy_Shade': 1,
-    'items.food.Candy_White': 1,
-    'items.food.Candy_Golden': 1,
-    'items.food.Candy_Zombie': 1,
-    'items.food.Candy_Desert': 1,
-    'items.food.Candy_Red': 1,
-  };
-
-  set.migration = MIGRATION_NAME;
-
-  if (user && user.items && user.items.mounts && user.items.mounts['JackOLantern-Glow']) {
-    set['items.pets.JackOLantern-RoyalPurple'] = 5;
-  } else if (user && user.items && user.items.pets && user.items.pets['JackOLantern-Glow']) {
-    set['items.mounts.JackOLantern-Glow'] = true;
-  } else if (user && user.items && user.items.mounts && user.items.mounts['JackOLantern-Ghost']) {
-    set['items.pets.JackOLantern-Glow'] = 5;
-  } else if (user && user.items && user.items.pets && user.items.pets['JackOLantern-Ghost']) {
-    set['items.mounts.JackOLantern-Ghost'] = true;
-  } else if (user && user.items && user.items.mounts && user.items.mounts['JackOLantern-Base']) {
-    set['items.pets.JackOLantern-Ghost'] = 5;
-  } else if (user && user.items && user.items.pets && user.items.pets['JackOLantern-Base']) {
-    set['items.mounts.JackOLantern-Base'] = true;
-  } else {
-    set['items.pets.JackOLantern-Base'] = 5;
-  }
-
-  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
-  return await User.update({_id: user._id}, {$inc: inc, $set: set}).exec();
-}
-
-module.exports = async function processUsers () {
-  let query = {
-    migration: {$ne: MIGRATION_NAME},
-    'auth.timestamps.loggedin': {$gt: new Date('2020-10-01')},
-  };
-
-  const fields = {
-    _id: 1,
-    items: 1,
-  };
-
-  while (true) { // eslint-disable-line no-constant-condition
-    const users = await User // eslint-disable-line no-await-in-loop
-      .find(query)
-      .limit(250)
-      .sort({_id: 1})
-      .select(fields)
-      .lean()
-      .exec();
-
-    if (users.length === 0) {
-      console.warn('All appropriate users found and modified.');
-      console.warn(`\n${count} users processed\n`);
-      break;
-    } else {
-      query._id = {
-        $gt: users[users.length - 1],
-      };
-    }
-
-    await Promise.all(users.map(updateUser)); // eslint-disable-line no-await-in-loop
-  }
-};

migrations/archive/2020/20201102_fix_habitoween.js

@@ -1,58 +0,0 @@
-/*
- * Fix JackOLantern-Base for users that signed up recently
- */
-/* eslint-disable no-console */
-
-const MIGRATION_NAME = '20201102_fix_habitoween'; // Update when running in future years
-
-import { model as User } from '../../../website/server/models/user';
-
-const progressCount = 1000;
-let count = 0;
-
-async function updateUser (user) {
-  count++;
-
-  const set = {};
-
-  set.migration = MIGRATION_NAME;
-  set['items.pets.JackOLantern-Base'] = 5;
-
-  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
-  return await User.update({_id: user._id}, {$inc: inc, $set: set}).exec();
-}
-
-module.exports = async function processUsers () {
-  let query = {
-    migration: {$ne: MIGRATION_NAME},
-    'auth.timestamps.created': {$gt: new Date('2020-10-26')},
-    'items.pets.JackOLantern-Base': true,
-  };
-
-  const fields = {
-    _id: 1,
-    items: 1,
-  };
-
-  while (true) { // eslint-disable-line no-constant-condition
-    const users = await User // eslint-disable-line no-await-in-loop
-      .find(query)
-      .limit(250)
-      .sort({_id: 1})
-      .select(fields)
-      .lean()
-      .exec();
-
-    if (users.length === 0) {
-      console.warn('All appropriate users found and modified.');
-      console.warn(`\n${count} users processed\n`);
-      break;
-    } else {
-      query._id = {
-        $gt: users[users.length - 1],
-      };
-    }
-
-    await Promise.all(users.map(updateUser)); // eslint-disable-line no-await-in-loop
-  }
-};

migrations/archive/2020/20201103_drop_cap_ab_tweaks.js

@@ -1,62 +0,0 @@
-/*
- * All web users should be enrolled in the Drop Cap AB Test
- */
-/* eslint-disable no-console */
-
-const MIGRATION_NAME = '20201103_drop_cap_ab_tweaks';
-
-import { model as User } from '../../../website/server/models/user';
-
-const progressCount = 1000;
-let count = 0;
-
-async function updateUser (user) {
-  count++;
-
-  const set = {};
-
-  set.migration = MIGRATION_NAME;
-
-  const testGroup = Math.random();
-  // Enroll 100% of users, splitting them 50/50
-  const value = testGroup <= 0.50 ? 'drop-cap-notif-enabled' : 'drop-cap-notif-disabled';
-  set['_ABtests.dropCapNotif'] = value;
-
-  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
-  return await User.update({_id: user._id}, {$set: set}).exec();
-}
-
-module.exports = async function processUsers () {
-  let query = {
-    migration: {$ne: MIGRATION_NAME},
-    'auth.timestamps.loggedin': {$gt: new Date('2020-10-10')},
-    '_ABtests.dropCapNotif': 'drop-cap-notif-not-enrolled',
-  };
-
-  const fields = {
-    _id: 1,
-    _ABtests: 1,
-  };
-
-  while (true) { // eslint-disable-line no-constant-condition
-    const users = await User // eslint-disable-line no-await-in-loop
-      .find(query)
-      .limit(250)
-      .sort({_id: 1})
-      .select(fields)
-      .lean()
-      .exec();
-
-    if (users.length === 0) {
-      console.warn('All appropriate users found and modified.');
-      console.warn(`\n${count} users processed\n`);
-      break;
-    } else {
-      query._id = {
-        $gt: users[users.length - 1],
-      };
-    }
-
-    await Promise.all(users.map(updateUser)); // eslint-disable-line no-await-in-loop
-  }
-};

migrations/command-line/duplicatedTasksFindAndRemove.js

@@ -32,11 +32,13 @@
  *
  */
 
+
 // CONFIGURATION:
 // - Change the uuid below to be the user's uuid.
 // - Change ALL instances of "todos" to "habits"/"dailys"/"rewards" as
 //   needed. Do not miss any of them!
 
+
 const uuid = '30fb2640-7121-4968-ace5-f385e60ea6c5';
 
 db.users.aggregate([

migrations/groups/migrate-chat.js

@@ -2,6 +2,7 @@
 // @authorName = 'TheHollidayInn'; // in case script author needs to know when their ...
 // @authorUuid = ''; // ... own data is done
 
+
 /*
  * This migration moves chat off of groups and into their own model
  */
@@ -37,6 +38,7 @@ async function moveGroupChatToModel (skip = 0) {
     return chatpromises;
   });
 
+
   const reducedPromises = promises.reduce((acc, curr) => {
     acc = acc.concat(curr); // eslint-disable-line no-param-reassign
     return acc;

migrations/groups/reconcile-group-plan-members.js

@@ -45,7 +45,7 @@ async function fixGroupPlanMembers () {
     pause();
     groupPlanCount += 1;
 
-    const canonicalMemberCount = await dbUsers.countDocuments(
+    const canonicalMemberCount = await dbUsers.count(
       {
         $or:
           [

migrations/restock_armoire_for_users_that_need_it.js

@@ -25,6 +25,7 @@ const monk = require('monk'); // eslint-disable-line import/no-extraneous-depend
 
 const dbUsers = monk(connectionString).get('users', { castIds: false });
 
+
 function processUsers (lastId) {
   // specify a query to limit the affected users (empty for all users):
   const query = {
@@ -85,6 +86,7 @@ function updateUser (user) {
 
   const set = { migration: migrationName, 'flags.armoireEmpty': false };
 
+
   if (user.flags.armoireEmpty) {
     // this user believes their armoire has no more items in it
     if (

migrations/restore-profile-data.js

@@ -121,4 +121,5 @@ function exiting (code, msg) {
   process.exit(code);
 }
 
+
 processUsers();

migrations/users/remove-social-users-extra-data.js

@@ -9,6 +9,7 @@ const authorUuid = 'ed4c688c-6652-4a92-9d03-a5a79844174a'; // ... own data is do
  */
 const connectionString = 'mongodb://localhost:27017/habitrpg?auto_reconnect=true'; // FOR TEST DATABASE
 
+
 const dbUsers = monk(connectionString).get('users', { castIds: false });
 
 function processUsers (lastId) {

migrations/users/tag-challenge-field-string2bool.js

@@ -1,73 +0,0 @@
-import { model as User } from '../../website/server/models/user';
-
-const MIGRATION_NAME = 'tag-challenge-field-string2bool';
-
-const progressCount = 1000;
-let count = 0;
-
-export default async function processUsers () {
-  const query = {
-    migration: { $ne: MIGRATION_NAME },
-    tags: {
-      $elemMatch: {
-        challenge: {
-          $exists: true,
-          $type: 'string',
-        },
-      },
-    },
-  };
-
-  while (true) { // eslint-disable-line no-constant-condition
-    // eslint-disable-next-line no-await-in-loop
-    const users = await User.find(query)
-      .sort({ _id: 1 })
-      .limit(250)
-      .select({ _id: 1, tags: 1 })
-      .lean()
-      .exec();
-
-    if (users.length === 0) {
-      console.warn('All appropriate users found and modified.');
-      console.warn(`\n${count} users processed\n`);
-      break;
-    } else {
-      query._id = {
-        $gt: users[users.length - 1],
-      };
-    }
-
-    await Promise.all(users.map(updateUser)); // eslint-disable-line no-await-in-loop
-  }
-}
-
-async function updateUser (user) {
-  count += 1;
-  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
-  let requiresUpdate = false;
-
-  if (user && user.tags) {
-    user.tags.forEach(tag => {
-      if (tag && typeof tag.challenge === 'string') {
-        requiresUpdate = true;
-        if (tag.challenge === 'true') {
-          tag.challenge = true;
-        } else if (tag.challenge === 'false') {
-          tag.challenge = false;
-        } else {
-          tag.challenge = null;
-        }
-      }
-    });
-  }
-
-  if (requiresUpdate) {
-    const set = {
-      migration: MIGRATION_NAME,
-      tags: user.tags,
-    };
-    return User.update({ _id: user._id }, { $set: set }).exec();
-  }
-
-  return null;
-}

package.json

@@ -1,26 +1,26 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.169.0",
+  "version": "4.144.1",
   "main": "./website/server/index.js",
   "dependencies": {
-    "@babel/core": "^7.12.3",
-    "@babel/preset-env": "^7.12.1",
-    "@babel/register": "^7.12.1",
-    "@google-cloud/trace-agent": "^5.1.1",
+    "@babel/core": "^7.10.2",
+    "@babel/preset-env": "^7.10.2",
+    "@babel/register": "^7.10.1",
+    "@google-cloud/trace-agent": "^5.0.0",
     "@slack/client": "^4.12.0",
     "accepts": "^1.3.5",
     "amazon-payments": "^0.2.8",
     "amplitude": "^3.5.0",
-    "apidoc": "^0.25.0",
+    "apidoc": "^0.17.5",
     "apn": "^2.2.0",
     "apple-auth": "^1.0.6",
-    "bcrypt": "^5.0.0",
+    "bcrypt": "^3.0.8",
     "body-parser": "^1.18.3",
     "compression": "^1.7.4",
     "cookie-session": "^1.4.0",
     "coupon-code": "^0.4.5",
-    "csv-stringify": "^5.5.1",
+    "csv-stringify": "^5.5.0",
     "cwait": "^1.1.1",
     "domain-middleware": "~0.1.0",
     "eslint": "^6.8.0",
@@ -30,51 +30,48 @@
     "express-basic-auth": "^1.1.5",
     "express-validator": "^5.2.0",
     "glob": "^7.1.6",
-    "got": "^11.8.0",
+    "got": "^10.7.0",
     "gulp": "^4.0.0",
     "gulp-babel": "^8.0.0",
-    "gulp-imagemin": "^7.1.0",
+    "gulp-imagemin": "^6.2.0",
     "gulp-nodemon": "^2.5.0",
     "gulp.spritesmith": "^6.9.0",
-    "habitica-markdown": "^3.0.0",
-    "helmet": "^3.23.3",
-    "image-size": "^0.9.3",
+    "habitica-markdown": "^2.0.0",
+    "helmet": "^3.22.0",
+    "image-size": "^0.8.3",
     "in-app-purchase": "^1.11.3",
     "js2xmlparser": "^4.0.1",
     "jsonwebtoken": "^8.5.1",
-    "jwks-rsa": "^1.11.0",
-    "lodash": "^4.17.20",
+    "jwks-rsa": "^1.8.0",
+    "lodash": "^4.17.15",
     "merge-stream": "^2.0.0",
     "method-override": "^3.0.0",
-    "moment": "^2.29.1",
+    "moment": "^2.26.0",
     "moment-recur": "^1.0.7",
-    "mongoose": "^5.10.11",
+    "mongoose": "^5.9.18",
     "morgan": "^1.10.0",
     "nconf": "^0.10.0",
-    "node-gcm": "^1.0.3",
+    "node-gcm": "^1.0.2",
     "on-headers": "^1.0.2",
     "passport": "^0.4.1",
     "passport-facebook": "^3.0.0",
-    "passport-google-oauth2": "^0.2.0",
     "passport-google-oauth20": "1.0.0",
+    "paypal-ipn": "3.0.0",
     "paypal-rest-sdk": "^1.8.1",
-    "pp-ipn": "^1.1.0",
     "ps-tree": "^1.0.0",
-    "rate-limiter-flexible": "^2.1.13",
-    "redis": "^3.0.2",
-    "regenerator-runtime": "^0.13.7",
+    "regenerator-runtime": "^0.13.5",
     "remove-markdown": "^0.3.0",
     "rimraf": "^3.0.2",
     "short-uuid": "^3.0.0",
     "stripe": "^7.15.0",
-    "superagent": "^6.1.0",
-    "universal-analytics": "^0.4.23",
+    "superagent": "^5.2.2",
+    "universal-analytics": "^0.4.17",
     "useragent": "^2.1.9",
-    "uuid": "^8.3.1",
-    "validator": "^13.1.17",
+    "uuid": "^3.4.0",
+    "validator": "^11.0.0",
     "vinyl-buffer": "^1.0.1",
-    "winston": "^3.3.3",
-    "winston-loggly-bulk": "^3.1.1",
+    "winston": "^3.2.1",
+    "winston-loggly-bulk": "^3.1.0",
     "xml2js": "^0.4.23"
   },
   "private": true,
@@ -104,24 +101,20 @@
     "client:unit": "cd website/client && npm run test:unit",
     "start": "gulp nodemon",
     "debug": "gulp nodemon --inspect",
-    "mongo:dev": "run-rs -v 4.2.8 -l ubuntu1804 --keep --dbpath mongodb-data --number 1 --quiet",
     "postinstall": "gulp build && cd website/client && npm install",
     "apidoc": "gulp apidoc"
   },
   "devDependencies": {
-    "axios": "^0.21.0",
+    "axios": "^0.19.2",
     "chai": "^4.1.2",
     "chai-as-promised": "^7.1.1",
-    "chai-moment": "^0.1.0",
-    "chalk": "^4.1.0",
-    "cross-spawn": "^7.0.3",
+    "chalk": "^3.0.0",
     "expect.js": "^0.3.1",
     "istanbul": "^1.1.0-alpha.1",
     "mocha": "^5.1.1",
-    "monk": "^7.3.2",
+    "monk": "^7.3.0",
     "require-again": "^2.0.0",
-    "run-rs": "^0.6.2",
-    "sinon": "^9.2.1",
+    "sinon": "^7.2.4",
     "sinon-chai": "^3.5.0",
     "sinon-stub-promise": "^4.0.0"
   },

scripts/gdpr-delete-users.js

@@ -31,22 +31,20 @@ async function deleteAmplitudeData (userId, email) {
       console.log(`${userId} (${email}) Amplitude response: ${response.status} ${response.statusText}`);
     }
   }
-  await new Promise(resolve => setTimeout(resolve, 1000));
 }
 
 async function deleteHabiticaData (user, email) {
   const truncatedEmail = email.slice(0, email.indexOf('@'));
-  const set = {
-    'auth.blocked': false,
-    'auth.local.hashed_password': '$2a$10$QDnNh1j1yMPnTXDEOV38xOePEWFd4X8DSYwAM8XTmqmacG5X0DKjW',
-    'auth.local.passwordHashMethod': 'bcrypt',
-  };
-  if (!user.auth.local.email) set['auth.local.email'] = `${truncatedEmail}-gdpr@example.com`;
   await User.update(
     { _id: user._id },
-    { $set: set },
+    {
+      $set: {
+        'auth.local.email': user.auth.local.email ? email : `${truncatedEmail}@example.com`,
+        'auth.local.hashed_password': '$2a$10$QDnNh1j1yMPnTXDEOV38xOePEWFd4X8DSYwAM8XTmqmacG5X0DKjW',
+        'auth.local.passwordHashMethod': 'bcrypt',
+      },
+    },
   );
-  await new Promise(resolve => setTimeout(resolve, 1000));
   const response = await axios.delete(
     `${BASE_URL}/api/v3/user`,
     {
@@ -80,7 +78,6 @@ async function processEmailAddress (email) {
 
   const socialUsers = await User.find(
     {
-      'auth.local.email': { $not: emailRegex },
       $or: [
         { 'auth.facebook.emails.value': email },
         { 'auth.google.emails.value': email },

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

@@ -56,6 +56,7 @@ describe('Base model plugin', () => {
     expect(sanitized).not.to.have.property('usuallySettable');
   });
 
+
   it('can make fields private', () => {
     schema.plugin(baseModel, {
       private: ['amPrivate'],

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

@@ -42,13 +42,13 @@ describe('cron', () => {
   });
 
   it('updates user.preferences.timezoneOffsetAtLastCron', () => {
-    const timezoneUtcOffsetFromUserPrefs = -1;
+    const timezoneOffsetFromUserPrefs = 1;
 
     cron({
-      user, tasksByType, daysMissed, analytics, timezoneUtcOffsetFromUserPrefs,
+      user, tasksByType, daysMissed, analytics, timezoneOffsetFromUserPrefs,
     });
 
-    expect(user.preferences.timezoneOffsetAtLastCron).to.equal(1);
+    expect(user.preferences.timezoneOffsetAtLastCron).to.equal(timezoneOffsetFromUserPrefs);
   });
 
   it('resets user.items.lastDrop.count', () => {
@@ -240,7 +240,7 @@ describe('cron', () => {
       user1.purchased.plan.consecutive.gemCapExtra = 0;
 
       it('does not increment consecutive benefits after the first month', () => {
-        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(1, 'months')
+        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(1, 'months')
           .add(2, 'days')
           .toDate());
         // Add 1 month to simulate what happens a month after the subscription was created.
@@ -256,7 +256,7 @@ describe('cron', () => {
       });
 
       it('does not increment consecutive benefits after the second month', () => {
-        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(2, 'months')
+        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(2, 'months')
           .add(2, 'days')
           .toDate());
         // Add 1 month to simulate what happens a month after the subscription was created.
@@ -272,7 +272,7 @@ describe('cron', () => {
       });
 
       it('increments consecutive benefits after the third month', () => {
-        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(3, 'months')
+        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(3, 'months')
           .add(2, 'days')
           .toDate());
         // Add 1 month to simulate what happens a month after the subscription was created.
@@ -288,7 +288,7 @@ describe('cron', () => {
       });
 
       it('does not increment consecutive benefits after the fourth month', () => {
-        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(4, 'months')
+        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(4, 'months')
           .add(2, 'days')
           .toDate());
         // Add 1 month to simulate what happens a month after the subscription was created.
@@ -304,7 +304,7 @@ describe('cron', () => {
       });
 
       it('increments consecutive benefits correctly if user has been absent with continuous subscription', () => {
-        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(10, 'months')
+        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(10, 'months')
           .add(2, 'days')
           .toDate());
         cron({
@@ -339,7 +339,7 @@ describe('cron', () => {
       user3.purchased.plan.consecutive.gemCapExtra = 5;
 
       it('does not increment consecutive benefits in the first month of the first paid period that they already have benefits for', () => {
-        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(1, 'months')
+        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(1, 'months')
           .add(2, 'days')
           .toDate());
         cron({
@@ -352,7 +352,7 @@ describe('cron', () => {
       });
 
       it('does not increment consecutive benefits in the middle of the period that they already have benefits for', () => {
-        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(2, 'months')
+        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(2, 'months')
           .add(2, 'days')
           .toDate());
         cron({
@@ -365,7 +365,7 @@ describe('cron', () => {
       });
 
       it('does not increment consecutive benefits in the final month of the period that they already have benefits for', () => {
-        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(3, 'months')
+        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(3, 'months')
           .add(2, 'days')
           .toDate());
         cron({
@@ -378,7 +378,7 @@ describe('cron', () => {
       });
 
       it('increments consecutive benefits the month after the second paid period has started', () => {
-        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(4, 'months')
+        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(4, 'months')
           .add(2, 'days')
           .toDate());
         cron({
@@ -391,7 +391,7 @@ describe('cron', () => {
       });
 
       it('does not increment consecutive benefits in the second month of the second period that they already have benefits for', () => {
-        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(5, 'months')
+        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(5, 'months')
           .add(2, 'days')
           .toDate());
         cron({
@@ -404,7 +404,7 @@ describe('cron', () => {
       });
 
       it('does not increment consecutive benefits in the final month of the second period that they already have benefits for', () => {
-        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(6, 'months')
+        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(6, 'months')
           .add(2, 'days')
           .toDate());
         cron({
@@ -417,7 +417,7 @@ describe('cron', () => {
       });
 
       it('increments consecutive benefits the month after the third paid period has started', () => {
-        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(7, 'months')
+        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(7, 'months')
           .add(2, 'days')
           .toDate());
         cron({
@@ -430,7 +430,7 @@ describe('cron', () => {
       });
 
       it('increments consecutive benefits correctly if user has been absent with continuous subscription', () => {
-        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(10, 'months')
+        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(10, 'months')
           .add(2, 'days')
           .toDate());
         cron({
@@ -465,7 +465,7 @@ describe('cron', () => {
       user6.purchased.plan.consecutive.gemCapExtra = 10;
 
       it('does not increment consecutive benefits in the first month of the first paid period that they already have benefits for', () => {
-        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(1, 'months')
+        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(1, 'months')
           .add(2, 'days')
           .toDate());
         cron({
@@ -478,7 +478,7 @@ describe('cron', () => {
       });
 
       it('does not increment consecutive benefits in the final month of the period that they already have benefits for', () => {
-        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(6, 'months')
+        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(6, 'months')
           .add(2, 'days')
           .toDate());
         cron({
@@ -491,7 +491,7 @@ describe('cron', () => {
       });
 
       it('increments consecutive benefits the month after the second paid period has started', () => {
-        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(7, 'months')
+        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(7, 'months')
           .add(2, 'days')
           .toDate());
         cron({
@@ -504,7 +504,7 @@ describe('cron', () => {
       });
 
       it('increments consecutive benefits the month after the third paid period has started', () => {
-        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(13, 'months')
+        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(13, 'months')
           .add(2, 'days')
           .toDate());
         cron({
@@ -517,7 +517,7 @@ describe('cron', () => {
       });
 
       it('increments consecutive benefits correctly if user has been absent with continuous subscription', () => {
-        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(19, 'months')
+        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(19, 'months')
           .add(2, 'days')
           .toDate());
         cron({
@@ -552,7 +552,7 @@ describe('cron', () => {
       user12.purchased.plan.consecutive.gemCapExtra = 20;
 
       it('does not increment consecutive benefits in the first month of the first paid period that they already have benefits for', () => {
-        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(1, 'months')
+        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(1, 'months')
           .add(2, 'days')
           .toDate());
         cron({
@@ -565,7 +565,7 @@ describe('cron', () => {
       });
 
       it('does not increment consecutive benefits in the final month of the period that they already have benefits for', () => {
-        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(12, 'months')
+        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(12, 'months')
           .add(2, 'days')
           .toDate());
         cron({
@@ -578,7 +578,7 @@ describe('cron', () => {
       });
 
       it('increments consecutive benefits the month after the second paid period has started', () => {
-        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(13, 'months')
+        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(13, 'months')
           .add(2, 'days')
           .toDate());
         cron({
@@ -591,7 +591,7 @@ describe('cron', () => {
       });
 
       it('increments consecutive benefits the month after the third paid period has started', () => {
-        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(25, 'months')
+        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(25, 'months')
           .add(2, 'days')
           .toDate());
         cron({
@@ -604,7 +604,7 @@ describe('cron', () => {
       });
 
       it('increments consecutive benefits correctly if user has been absent with continuous subscription', () => {
-        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(37, 'months')
+        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(37, 'months')
           .add(2, 'days')
           .toDate());
         cron({
@@ -641,7 +641,7 @@ describe('cron', () => {
       user3g.purchased.plan.consecutive.gemCapExtra = 5;
 
       it('does not increment consecutive benefits in the first month of the gift subscription', () => {
-        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(1, 'months')
+        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(1, 'months')
           .add(2, 'days')
           .toDate());
         cron({
@@ -654,7 +654,7 @@ describe('cron', () => {
       });
 
       it('does not increment consecutive benefits in the second month of the gift subscription', () => {
-        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(2, 'months')
+        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(2, 'months')
           .add(2, 'days')
           .toDate());
         cron({
@@ -667,7 +667,7 @@ describe('cron', () => {
       });
 
       it('does not increment consecutive benefits in the third month of the gift subscription', () => {
-        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(3, 'months')
+        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(3, 'months')
           .add(2, 'days')
           .toDate());
         cron({
@@ -680,7 +680,7 @@ describe('cron', () => {
       });
 
       it('does not increment consecutive benefits in the month after the gift subscription has ended', () => {
-        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(4, 'months')
+        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(4, 'months')
           .add(2, 'days')
           .toDate());
         cron({
@@ -717,7 +717,7 @@ describe('cron', () => {
       user6x.purchased.plan.consecutive.gemCapExtra = 15;
 
       it('increments consecutive benefits in the first month since the fix for #4819 goes live', () => {
-        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(1, 'months')
+        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(1, 'months')
           .add(2, 'days')
           .toDate());
         cron({
@@ -730,7 +730,7 @@ describe('cron', () => {
       });
 
       it('does not increment consecutive benefits in the second month after the fix goes live', () => {
-        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(2, 'months')
+        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(2, 'months')
           .add(2, 'days')
           .toDate());
         cron({
@@ -743,7 +743,7 @@ describe('cron', () => {
       });
 
       it('does not increment consecutive benefits in the third month after the fix goes live', () => {
-        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(3, 'months')
+        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(3, 'months')
           .add(2, 'days')
           .toDate());
         cron({
@@ -756,7 +756,7 @@ describe('cron', () => {
       });
 
       it('increments consecutive benefits in the seventh month after the fix goes live', () => {
-        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(7, 'months')
+        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(7, 'months')
           .add(2, 'days')
           .toDate());
         cron({

test/api/unit/libs/highlightMentions.test.js

@@ -171,32 +171,28 @@ describe('highlightMentions', () => {
   it('github issue 12118, method crashes when square brackets are used', async () => {
     const text = '[test]';
 
-    const result = await highlightMentions(text);
+    let err;
 
-    expect(result[0]).to.equal(text);
+    try {
+      await highlightMentions(text);
+    } catch (e) {
+      err = e;
+    }
+
+    expect(err).to.be.undefined;
   });
 
   it('github issue 12138, method crashes when regex chars are used in code block', async () => {
     const text = '`[test]`';
 
-    const result = await highlightMentions(text);
+    let err;
 
-    expect(result[0]).to.equal(text);
-  });
+    try {
+      await highlightMentions(text);
+    } catch (e) {
+      err = e;
+    }
 
-  it('github issue 12586, method crashes when empty link is used', async () => {
-    const text = '[]()';
-
-    const result = await highlightMentions(text);
-
-    expect(result[0]).to.equal(text);
-  });
-
-  it('github issue 12586, method crashes when link without title is used', async () => {
-    const text = '[](www.google.com)';
-
-    const result = await highlightMentions(text);
-
-    expect(result[0]).to.equal(text);
+    expect(err).to.be.undefined;
   });
 });

test/api/unit/libs/mongodb.js

@@ -1,50 +0,0 @@
-import os from 'os';
-import nconf from 'nconf';
-import requireAgain from 'require-again';
-
-const pathToMongoLib = '../../../../website/server/libs/mongodb';
-
-describe('mongodb', () => {
-  afterEach(() => {
-    sandbox.restore();
-  });
-
-  describe('getDevelopmentConnectionUrl', () => {
-    it('returns the original connection url if not on windows', () => {
-      sandbox.stub(os, 'platform').returns('linux');
-      const mongoLibOverride = requireAgain(pathToMongoLib);
-
-      const originalString = 'mongodb://localhost:3030';
-      const string = mongoLibOverride.getDevelopmentConnectionUrl(originalString);
-      expect(string).to.equal(originalString);
-    });
-
-    it('replaces localhost with hostname on windows', () => {
-      sandbox.stub(os, 'platform').returns('win32');
-      sandbox.stub(os, 'hostname').returns('hostname');
-      const mongoLibOverride = requireAgain(pathToMongoLib);
-
-      const originalString = 'mongodb://localhost:3030';
-      const string = mongoLibOverride.getDevelopmentConnectionUrl(originalString);
-      expect(string).to.equal('mongodb://hostname:3030');
-    });
-  });
-
-  describe('getDefaultConnectionOptions', () => {
-    it('returns development config when IS_PROD is false', () => {
-      sandbox.stub(nconf, 'get').withArgs('IS_PROD').returns(false);
-      const mongoLibOverride = requireAgain(pathToMongoLib);
-
-      const options = mongoLibOverride.getDefaultConnectionOptions();
-      expect(options).to.have.all.keys(['useNewUrlParser', 'useUnifiedTopology']);
-    });
-
-    it('returns production config when IS_PROD is true', () => {
-      sandbox.stub(nconf, 'get').withArgs('IS_PROD').returns(true);
-      const mongoLibOverride = requireAgain(pathToMongoLib);
-
-      const options = mongoLibOverride.getDefaultConnectionOptions();
-      expect(options).to.have.all.keys(['useNewUrlParser', 'useUnifiedTopology', 'keepAlive', 'keepAliveInitialDelay']);
-    });
-  });
-});

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

@@ -2,14 +2,13 @@ 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 apiError from '../../../../../../website/server/libs/apiError';
 
 const { i18n } = common;
 
 describe('Amazon Payments - Checkout', () => {
   const subKey = 'basic_3mo';
   let user; let orderReferenceId; let
-    headers; const gemsBlockKey = '21gems'; const gemsBlock = common.content.gems[gemsBlockKey];
+    headers;
   let setOrderReferenceDetailsSpy;
   let confirmOrderReferenceSpy;
   let authorizeSpy;
@@ -17,7 +16,7 @@ describe('Amazon Payments - Checkout', () => {
 
   let paymentBuyGemsStub;
   let paymentCreateSubscritionStub;
-  let amount = gemsBlock.price / 100;
+  let amount = 5;
 
   function expectOrderReferenceSpy () {
     expect(setOrderReferenceDetailsSpy).to.be.calledOnce;
@@ -108,20 +107,13 @@ describe('Amazon Payments - Checkout', () => {
       paymentMethod,
       headers,
     };
-    if (gift) {
-      expectedArgs.gift = gift;
-      expectedArgs.gemsBlock = undefined;
-    } else {
-      expectedArgs.gemsBlock = gemsBlock;
-    }
+    if (gift) expectedArgs.gift = gift;
     expect(paymentBuyGemsStub).to.be.calledWith(expectedArgs);
   }
 
   it('should purchase gems', async () => {
     sinon.stub(user, 'canGetGems').resolves(true);
-    await amzLib.checkout({
-      user, orderReferenceId, headers, gemsBlock: gemsBlockKey,
-    });
+    await amzLib.checkout({ user, orderReferenceId, headers });
 
     expectBuyGemsStub(amzLib.constants.PAYMENT_METHOD);
     expectAmazonStubs();
@@ -152,9 +144,7 @@ describe('Amazon Payments - Checkout', () => {
 
   it('should error if user cannot get gems gems', async () => {
     sinon.stub(user, 'canGetGems').resolves(false);
-    await expect(amzLib.checkout({
-      user, orderReferenceId, headers, gemsBlock: gemsBlockKey,
-    }))
+    await expect(amzLib.checkout({ user, orderReferenceId, headers }))
       .to.eventually.be.rejected.and.to.eql({
         httpCode: 401,
         message: i18n.t('groupPolicyCannotGetGems'),
@@ -163,17 +153,6 @@ describe('Amazon Payments - Checkout', () => {
     user.canGetGems.restore();
   });
 
-  it('should error if gems block is not valid', async () => {
-    await expect(amzLib.checkout({
-      user, orderReferenceId, headers, gemsBlock: 'invalid',
-    }))
-      .to.eventually.be.rejected.and.to.eql({
-        httpCode: 400,
-        message: apiError('invalidGemsBlock'),
-        name: 'BadRequest',
-      });
-  });
-
   it('should gift gems', async () => {
     const receivingUser = new User();
     await receivingUser.save();
@@ -216,7 +195,6 @@ describe('Amazon Payments - Checkout', () => {
       paymentMethod: amzLib.constants.PAYMENT_METHOD_GIFT,
       headers,
       gift,
-      gemsBlock: undefined,
     });
     expectAmazonStubs();
   });

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

@@ -1,3 +1,5 @@
+import uuid from 'uuid';
+
 import {
   generateGroup,
 } from '../../../../../helpers/api-unit.helper';
@@ -5,7 +7,6 @@ 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';
-import common from '../../../../../../website/common';
 
 describe('#upgradeGroupPlan', () => {
   let spy; let data; let user; let group; let
@@ -31,19 +32,16 @@ describe('#upgradeGroupPlan', () => {
     group = generateGroup({
       name: 'test group',
       type: 'guild',
-      privacy: 'private',
+      privacy: 'public',
       leader: user._id,
     });
     await group.save();
 
-    user.guilds.push(group._id);
-    await user.save();
-
     spy = sinon.stub(amzLib, 'authorizeOnBillingAgreement');
     spy.resolves([]);
 
     uuidString = 'uuid-v4';
-    sinon.stub(common, 'uuid').returns(uuidString);
+    sinon.stub(uuid, 'v4').returns(uuidString);
 
     data.groupId = group._id;
     data.sub.quantity = 3;
@@ -51,7 +49,7 @@ describe('#upgradeGroupPlan', () => {
 
   afterEach(() => {
     amzLib.authorizeOnBillingAgreement.restore();
-    common.uuid.restore();
+    uuid.v4.restore();
   });
 
   it('charges for a new member', async () => {

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

@@ -5,6 +5,7 @@ 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 { mockFindById, restoreFindById } from '../../../../helpers/mongoose.helper';
 
 const { i18n } = common;
 
@@ -83,7 +84,7 @@ describe('Apple Payments', () => {
       user.canGetGems.restore();
     });
 
-    it('errors if gemsBlock does not exist', async () => {
+    it('errors if amount does not exist', async () => {
       sinon.stub(user, 'canGetGems').resolves(true);
       iapGetPurchaseDataStub.restore();
       iapGetPurchaseDataStub = sinon.stub(iap, 'getPurchaseData')
@@ -105,23 +106,23 @@ describe('Apple Payments', () => {
     const gemsCanPurchase = [
       {
         productId: 'com.habitrpg.ios.Habitica.4gems',
-        gemsBlock: '4gems',
+        amount: 1,
       },
       {
         productId: 'com.habitrpg.ios.Habitica.20gems',
-        gemsBlock: '21gems',
+        amount: 5.25,
       },
       {
         productId: 'com.habitrpg.ios.Habitica.21gems',
-        gemsBlock: '21gems',
+        amount: 5.25,
       },
       {
         productId: 'com.habitrpg.ios.Habitica.42gems',
-        gemsBlock: '42gems',
+        amount: 10.5,
       },
       {
         productId: 'com.habitrpg.ios.Habitica.84gems',
-        gemsBlock: '84gems',
+        amount: 21,
       },
     ];
 
@@ -148,9 +149,8 @@ describe('Apple Payments', () => {
         expect(paymentBuyGemsStub).to.be.calledWith({
           user,
           paymentMethod: applePayments.constants.PAYMENT_METHOD_APPLE,
-          gemsBlock: common.content.gems[gemTest.gemsBlock],
+          amount: gemTest.amount,
           headers,
-          gift: undefined,
         });
         expect(user.canGetGems).to.be.calledOnce;
         user.canGetGems.restore();
@@ -161,6 +161,8 @@ describe('Apple Payments', () => {
       const receivingUser = new User();
       await receivingUser.save();
 
+      mockFindById(receivingUser);
+
       iapGetPurchaseDataStub.restore();
       iapGetPurchaseDataStub = sinon.stub(iap, 'getPurchaseData')
         .returns([{
@@ -182,17 +184,12 @@ describe('Apple Payments', () => {
 
       expect(paymentBuyGemsStub).to.be.calledOnce;
       expect(paymentBuyGemsStub).to.be.calledWith({
-        user,
+        user: receivingUser,
         paymentMethod: applePayments.constants.PAYMENT_METHOD_APPLE,
+        amount: gemsCanPurchase[0].amount,
         headers,
-        gift: {
-          type: 'gems',
-          gems: { amount: 4 },
-          member: sinon.match({ _id: receivingUser._id }),
-          uuid: receivingUser._id,
-        },
-        gemsBlock: common.content.gems['4gems'],
       });
+      restoreFindById();
     });
   });
 

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

@@ -1,14 +0,0 @@
-import common from '../../../../../website/common';
-import { getGemsBlock } from '../../../../../website/server/libs/payments/gems';
-
-describe('payments/gems', () => {
-  describe('#getGemsBlock', () => {
-    it('throws an error if the gem block key is invalid', () => {
-      expect(() => getGemsBlock('invalid')).to.throw;
-    });
-
-    it('returns the gem block for the given key', () => {
-      expect(getGemsBlock('21gems')).to.equal(common.content.gems['21gems']);
-    });
-  });
-});

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

@@ -5,6 +5,7 @@ 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 { mockFindById, restoreFindById } from '../../../../helpers/mongoose.helper';
 
 const { i18n } = common;
 
@@ -13,7 +14,7 @@ describe('Google Payments', () => {
 
   describe('verifyGemPurchase', () => {
     let sku; let user; let token; let receipt; let signature; let
-      headers; const gemsBlock = common.content.gems['21gems'];
+      headers;
     let iapSetupStub; let iapValidateStub; let iapIsValidatedStub; let
       paymentBuyGemsStub;
 
@@ -102,9 +103,8 @@ describe('Google Payments', () => {
       expect(paymentBuyGemsStub).to.be.calledWith({
         user,
         paymentMethod: googlePayments.constants.PAYMENT_METHOD_GOOGLE,
-        gemsBlock,
+        amount: 5.25,
         headers,
-        gift: undefined,
       });
       expect(user.canGetGems).to.be.calledOnce;
       user.canGetGems.restore();
@@ -114,6 +114,8 @@ describe('Google Payments', () => {
       const receivingUser = new User();
       await receivingUser.save();
 
+      mockFindById(receivingUser);
+
       const gift = { uuid: receivingUser._id };
       await googlePayments.verifyGemPurchase({
         user, gift, receipt, signature, headers,
@@ -130,17 +132,12 @@ describe('Google Payments', () => {
 
       expect(paymentBuyGemsStub).to.be.calledOnce;
       expect(paymentBuyGemsStub).to.be.calledWith({
-        user,
+        user: receivingUser,
         paymentMethod: googlePayments.constants.PAYMENT_METHOD_GOOGLE,
-        gemsBlock,
+        amount: 5.25,
         headers,
-        gift: {
-          type: 'gems',
-          gems: { amount: 21 },
-          member: sinon.match({ _id: receivingUser._id }),
-          uuid: receivingUser._id,
-        },
       });
+      restoreFindById();
     });
   });
 

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

@@ -21,14 +21,11 @@ describe('Canceling a subscription for group', () => {
     group = generateGroup({
       name: 'test group',
       type: 'guild',
-      privacy: 'private',
+      privacy: 'public',
       leader: user._id,
     });
     await group.save();
 
-    user.guilds.push(group._id);
-    await user.save();
-
     data = {
       user,
       sub: {
@@ -144,8 +141,6 @@ describe('Canceling a subscription for group', () => {
 
   it('prevents non group leader from managing subscription', async () => {
     const groupMember = new User();
-    groupMember.guilds.push(group._id);
-    await groupMember.save();
     data.user = groupMember;
     data.groupId = group._id;
 
@@ -167,9 +162,7 @@ describe('Canceling a subscription for group', () => {
 
     let updatedGroup = await Group.findById(group._id).exec();
     const newLeader = new User();
-    newLeader.profile.name = 'newLeader';
     updatedGroup.leader = newLeader._id;
-    await newLeader.save();
     await updatedGroup.save();
 
     await api.cancelSubscription(data);
@@ -192,6 +185,8 @@ describe('Canceling a subscription for group', () => {
         'user-agent': '',
       },
     };
+    user.guilds.push(group._id);
+    await user.save();
     expect(group.purchased.plan.planId).to.not.exist;
     data.groupId = group._id;
     await api.createSubscription(data);
@@ -216,15 +211,10 @@ describe('Canceling a subscription for group', () => {
     await api.createSubscription(data);
     await api.cancelSubscription(data);
 
-    expect(sender.sendTxn).to.be.have.callCount(6);
-    const recipientCall = sender.sendTxn.getCalls().find(call => {
-      const isRecipient = call.args[0]._id === recipient._id;
-      const isGroupMemberCancel = call.args[1] === 'group-member-cancel';
-      return isRecipient && isGroupMemberCancel;
-    });
-    expect(recipientCall.args[0]._id).to.equal(recipient._id);
-    expect(recipientCall.args[1]).to.equal('group-member-cancel');
-    expect(recipientCall.args[2]).to.eql([
+    expect(sender.sendTxn).to.be.have.callCount(4);
+    expect(sender.sendTxn.thirdCall.args[0]._id).to.equal(recipient._id);
+    expect(sender.sendTxn.thirdCall.args[1]).to.equal('group-member-cancel');
+    expect(sender.sendTxn.thirdCall.args[2]).to.eql([
       { name: 'LEADER', content: user.profile.name },
       { name: 'GROUP_NAME', content: group.name },
     ]);
@@ -256,6 +246,8 @@ describe('Canceling a subscription for group', () => {
     recipient.guilds.push(group._id);
     await recipient.save();
 
+    user.guilds.push(group._id);
+    await user.save();
     data.groupId = group._id;
 
     await api.createSubscription(data);
@@ -267,13 +259,11 @@ describe('Canceling a subscription for group', () => {
     const group2 = generateGroup({
       name: 'test group2',
       type: 'guild',
-      privacy: 'private',
+      privacy: 'public',
       leader: user._id,
     });
     data.groupId = group2._id;
     await group2.save();
-    user.guilds.push(group2._id);
-    await user.save();
     recipient.guilds.push(group2._id);
     await recipient.save();
 
@@ -295,6 +285,8 @@ describe('Canceling a subscription for group', () => {
   });
 
   it('does cancel a leader subscription with two cancelled group plans', async () => {
+    user.guilds.push(group._id);
+    await user.save();
     data.groupId = group._id;
 
     await api.createSubscription(data);
@@ -306,7 +298,7 @@ describe('Canceling a subscription for group', () => {
     const group2 = generateGroup({
       name: 'test group2',
       type: 'guild',
-      privacy: 'private',
+      privacy: 'public',
       leader: user._id,
     });
     user.guilds.push(group2._id);

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

@@ -12,7 +12,6 @@ import { model as Group } from '../../../../../../website/server/models/group';
 import {
   generateGroup,
 } from '../../../../../helpers/api-unit.helper';
-import i18n from '../../../../../../website/common/script/i18n';
 
 describe('Purchasing a group plan for group', () => {
   const EMAIL_TEMPLATE_SUBSCRIPTION_TYPE_GOOGLE = 'Google_subscription';
@@ -34,14 +33,11 @@ describe('Purchasing a group plan for group', () => {
     group = generateGroup({
       name: groupName,
       type: 'guild',
-      privacy: 'private',
+      privacy: 'public',
       leader: user._id,
     });
     await group.save();
 
-    user.guilds.push(group._id);
-    await user.save();
-
     data = {
       user,
       sub: {
@@ -116,30 +112,6 @@ describe('Purchasing a group plan for group', () => {
     expect(updatedGroup.purchased.plan.dateCreated).to.exist;
   });
 
-  it('does not create a group plan for a public guild', async () => {
-    const publicGroup = generateGroup({
-      name: groupName,
-      type: 'guild',
-      privacy: 'public',
-      leader: user._id,
-    });
-    await publicGroup.save();
-
-    expect(publicGroup.purchased.plan.planId).to.not.exist;
-    data.groupId = publicGroup._id;
-
-    await expect(api.createSubscription(data))
-      .to.eventually.be.rejected.and.to.eql({
-        httpCode: 401,
-        name: 'NotAuthorized',
-        message: i18n.t('onlyPrivateGuildsCanUpgrade'),
-      });
-
-    const updatedGroup = await Group.findById(publicGroup._id).exec();
-
-    expect(updatedGroup.purchased.plan.planId).to.not.exist;
-  });
-
   it('sends an email', async () => {
     expect(group.purchased.plan.planId).to.not.exist;
     data.groupId = group._id;
@@ -176,6 +148,8 @@ describe('Purchasing a group plan for group', () => {
   });
 
   it('grants all members of a group a subscription', async () => {
+    user.guilds.push(group._id);
+    await user.save();
     expect(group.purchased.plan.planId).to.not.exist;
     data.groupId = group._id;
 
@@ -205,28 +179,17 @@ describe('Purchasing a group plan for group', () => {
 
     await api.createSubscription(data);
 
-    expect(sender.sendTxn).to.be.calledThrice;
-    const recipientCall = sender.sendTxn.getCalls().find(call => {
-      const isRecipient = call.args[0]._id === recipient._id;
-      const isJoin = call.args[1] === 'group-member-join';
-      return isRecipient && isJoin;
-    });
-    expect(recipientCall.args[0]._id).to.equal(recipient._id);
-    expect(recipientCall.args[1]).to.equal('group-member-join');
-    expect(recipientCall.args[2]).to.eql([
+    expect(sender.sendTxn).to.be.calledTwice;
+    expect(sender.sendTxn.firstCall.args[0]._id).to.equal(recipient._id);
+    expect(sender.sendTxn.firstCall.args[1]).to.equal('group-member-join');
+    expect(sender.sendTxn.firstCall.args[2]).to.eql([
       { name: 'LEADER', content: user.profile.name },
       { name: 'GROUP_NAME', content: group.name },
       { name: 'PREVIOUS_SUBSCRIPTION_TYPE', content: EMAIL_TEMPLATE_SUBSCRIPTION_TYPE_NONE },
     ]);
-
     // confirm that the other email sent is appropriate:
-    const leaderCall = sender.sendTxn.getCalls().find(call => {
-      const isLeader = call.args[0]._id === group.leader;
-      const isSubscriptionBegin = call.args[1] === 'group-subscription-begins';
-      return isLeader && isSubscriptionBegin;
-    });
-    expect(leaderCall.args[0]._id).to.equal(group.leader);
-    expect(leaderCall.args[1]).to.equal('group-subscription-begins');
+    expect(sender.sendTxn.secondCall.args[0]._id).to.equal(group.leader);
+    expect(sender.sendTxn.secondCall.args[1]).to.equal('group-subscription-begins');
   });
 
   it('sends one email to subscribed member of group, stating subscription is cancelled (Stripe)', async () => {
@@ -242,28 +205,17 @@ describe('Purchasing a group plan for group', () => {
 
     await api.createSubscription(data);
 
-    expect(sender.sendTxn).to.be.calledThrice;
-    const recipientCall = sender.sendTxn.getCalls().find(call => {
-      const isRecipient = call.args[0]._id === recipient._id;
-      const isJoin = call.args[1] === 'group-member-join';
-      return isRecipient && isJoin;
-    });
-    expect(recipientCall.args[0]._id).to.equal(recipient._id);
-    expect(recipientCall.args[1]).to.equal('group-member-join');
-    expect(recipientCall.args[2]).to.eql([
+    expect(sender.sendTxn).to.be.calledTwice;
+    expect(sender.sendTxn.firstCall.args[0]._id).to.equal(recipient._id);
+    expect(sender.sendTxn.firstCall.args[1]).to.equal('group-member-join');
+    expect(sender.sendTxn.firstCall.args[2]).to.eql([
       { name: 'LEADER', content: user.profile.name },
       { name: 'GROUP_NAME', content: group.name },
       { name: 'PREVIOUS_SUBSCRIPTION_TYPE', content: EMAIL_TEMPLATE_SUBSCRIPTION_TYPE_NORMAL },
     ]);
-
     // confirm that the other email sent is not a cancel-subscription email:
-    const leaderCall = sender.sendTxn.getCalls().find(call => {
-      const isLeader = call.args[0]._id === group.leader;
-      const isSubscriptionBegin = call.args[1] === 'group-subscription-begins';
-      return isLeader && isSubscriptionBegin;
-    });
-    expect(leaderCall.args[0]._id).to.equal(group.leader);
-    expect(leaderCall.args[1]).to.equal('group-subscription-begins');
+    expect(sender.sendTxn.secondCall.args[0]._id).to.equal(group.leader);
+    expect(sender.sendTxn.secondCall.args[1]).to.equal('group-subscription-begins');
   });
 
   it('sends one email to subscribed member of group, stating subscription is cancelled (Amazon)', async () => {
@@ -286,28 +238,17 @@ describe('Purchasing a group plan for group', () => {
 
     await api.createSubscription(data);
 
-    expect(sender.sendTxn).to.be.calledThrice;
-    const recipientCall = sender.sendTxn.getCalls().find(call => {
-      const isRecipient = call.args[0]._id === recipient._id;
-      const isJoin = call.args[1] === 'group-member-join';
-      return isRecipient && isJoin;
-    });
-    expect(recipientCall.args[0]._id).to.equal(recipient._id);
-    expect(recipientCall.args[1]).to.equal('group-member-join');
-    expect(recipientCall.args[2]).to.eql([
+    expect(sender.sendTxn).to.be.calledTwice;
+    expect(sender.sendTxn.firstCall.args[0]._id).to.equal(recipient._id);
+    expect(sender.sendTxn.firstCall.args[1]).to.equal('group-member-join');
+    expect(sender.sendTxn.firstCall.args[2]).to.eql([
       { name: 'LEADER', content: user.profile.name },
       { name: 'GROUP_NAME', content: group.name },
       { name: 'PREVIOUS_SUBSCRIPTION_TYPE', content: EMAIL_TEMPLATE_SUBSCRIPTION_TYPE_NORMAL },
     ]);
-
     // confirm that the other email sent is not a cancel-subscription email:
-    const leaderCall = sender.sendTxn.getCalls().find(call => {
-      const isLeader = call.args[0]._id === group.leader;
-      const isSubscriptionBegin = call.args[1] === 'group-subscription-begins';
-      return isLeader && isSubscriptionBegin;
-    });
-    expect(leaderCall.args[0]._id).to.equal(group.leader);
-    expect(leaderCall.args[1]).to.equal('group-subscription-begins');
+    expect(sender.sendTxn.secondCall.args[0]._id).to.equal(group.leader);
+    expect(sender.sendTxn.secondCall.args[1]).to.equal('group-subscription-begins');
 
     amzLib.getBillingAgreementDetails.restore();
   });
@@ -334,28 +275,17 @@ describe('Purchasing a group plan for group', () => {
 
     await api.createSubscription(data);
 
-    expect(sender.sendTxn).to.be.calledThrice;
-    const recipientCall = sender.sendTxn.getCalls().find(call => {
-      const isRecipient = call.args[0]._id === recipient._id;
-      const isJoin = call.args[1] === 'group-member-join';
-      return isRecipient && isJoin;
-    });
-    expect(recipientCall.args[0]._id).to.equal(recipient._id);
-    expect(recipientCall.args[1]).to.equal('group-member-join');
-    expect(recipientCall.args[2]).to.eql([
+    expect(sender.sendTxn).to.be.calledTwice;
+    expect(sender.sendTxn.firstCall.args[0]._id).to.equal(recipient._id);
+    expect(sender.sendTxn.firstCall.args[1]).to.equal('group-member-join');
+    expect(sender.sendTxn.firstCall.args[2]).to.eql([
       { name: 'LEADER', content: user.profile.name },
       { name: 'GROUP_NAME', content: group.name },
       { name: 'PREVIOUS_SUBSCRIPTION_TYPE', content: EMAIL_TEMPLATE_SUBSCRIPTION_TYPE_NORMAL },
     ]);
-
     // confirm that the other email sent is not a cancel-subscription email:
-    const leaderCall = sender.sendTxn.getCalls().find(call => {
-      const isLeader = call.args[0]._id === group.leader;
-      const isSubscriptionBegin = call.args[1] === 'group-subscription-begins';
-      return isLeader && isSubscriptionBegin;
-    });
-    expect(leaderCall.args[0]._id).to.equal(group.leader);
-    expect(leaderCall.args[1]).to.equal('group-subscription-begins');
+    expect(sender.sendTxn.secondCall.args[0]._id).to.equal(group.leader);
+    expect(sender.sendTxn.secondCall.args[1]).to.equal('group-subscription-begins');
 
     paypalPayments.paypalBillingAgreementGet.restore();
     paypalPayments.paypalBillingAgreementCancel.restore();
@@ -372,6 +302,8 @@ describe('Purchasing a group plan for group', () => {
     recipient.guilds.push(group._id);
     await recipient.save();
 
+    user.guilds.push(group._id);
+    await user.save();
     data.groupId = group._id;
 
     await api.createSubscription(data);
@@ -424,6 +356,8 @@ describe('Purchasing a group plan for group', () => {
     recipient.guilds.push(group._id);
     await recipient.save();
 
+    user.guilds.push(group._id);
+    await user.save();
     data.groupId = group._id;
 
     await api.createSubscription(data);
@@ -485,6 +419,8 @@ describe('Purchasing a group plan for group', () => {
 
     data.gift = undefined;
 
+    user.guilds.push(group._id);
+    await user.save();
     data.groupId = group._id;
 
     await api.createSubscription(data);
@@ -519,6 +455,8 @@ describe('Purchasing a group plan for group', () => {
 
     data.gift = undefined;
 
+    user.guilds.push(group._id);
+    await user.save();
     data.groupId = group._id;
 
     await api.createSubscription(data);
@@ -545,6 +483,8 @@ describe('Purchasing a group plan for group', () => {
     recipient.guilds.push(group._id);
     await recipient.save();
 
+    user.guilds.push(group._id);
+    await user.save();
     data.groupId = group._id;
 
     await api.createSubscription(data);
@@ -571,6 +511,8 @@ describe('Purchasing a group plan for group', () => {
 
     await recipient.save();
 
+    user.guilds.push(group._id);
+    await user.save();
     data.groupId = group._id;
 
     await api.createSubscription(data);
@@ -599,6 +541,8 @@ describe('Purchasing a group plan for group', () => {
 
     await recipient.save();
 
+    user.guilds.push(group._id);
+    await user.save();
     data.groupId = group._id;
 
     await api.createSubscription(data);
@@ -622,6 +566,8 @@ describe('Purchasing a group plan for group', () => {
     recipient.guilds.push(group._id);
     await recipient.save();
 
+    user.guilds.push(group._id);
+    await user.save();
     data.groupId = group._id;
 
     await recipient.cancelSubscription();
@@ -643,6 +589,8 @@ describe('Purchasing a group plan for group', () => {
     recipient.guilds.push(group._id);
     await recipient.save();
 
+    user.guilds.push(group._id);
+    await user.save();
     data.groupId = group._id;
 
     await recipient.cancelSubscription();
@@ -663,6 +611,8 @@ describe('Purchasing a group plan for group', () => {
     recipient.guilds.push(group._id);
     await recipient.save();
 
+    user.guilds.push(group._id);
+    await user.save();
     data.groupId = group._id;
 
     await api.createSubscription(data);
@@ -682,6 +632,8 @@ describe('Purchasing a group plan for group', () => {
     recipient.guilds.push(group._id);
     await recipient.save();
 
+    user.guilds.push(group._id);
+    await user.save();
     data.groupId = group._id;
 
     await api.createSubscription(data);
@@ -701,6 +653,8 @@ describe('Purchasing a group plan for group', () => {
     recipient.guilds.push(group._id);
     await recipient.save();
 
+    user.guilds.push(group._id);
+    await user.save();
     data.groupId = group._id;
 
     await api.createSubscription(data);
@@ -734,6 +688,8 @@ describe('Purchasing a group plan for group', () => {
     recipient.guilds.push(group._id);
     await recipient.save();
 
+    user.guilds.push(group._id);
+    await user.save();
     data.groupId = group._id;
 
     await api.createSubscription(data);
@@ -757,6 +713,8 @@ describe('Purchasing a group plan for group', () => {
     recipient.guilds.push(group._id);
     await recipient.save();
 
+    user.guilds.push(group._id);
+    await user.save();
     data.groupId = group._id;
 
     await api.createSubscription(data);
@@ -768,15 +726,13 @@ describe('Purchasing a group plan for group', () => {
     const group2 = generateGroup({
       name: 'test group2',
       type: 'guild',
-      privacy: 'private',
+      privacy: 'public',
       leader: user._id,
     });
     data.groupId = group2._id;
     await group2.save();
     recipient.guilds.push(group2._id);
     await recipient.save();
-    user.guilds.push(group2._id);
-    await user.save();
 
     await api.createSubscription(data);
 
@@ -801,6 +757,8 @@ describe('Purchasing a group plan for group', () => {
     recipient.guilds.push(group._id);
     await recipient.save();
 
+    user.guilds.push(group._id);
+    await user.save();
     data.groupId = group._id;
 
     await api.createSubscription(data);
@@ -812,22 +770,17 @@ describe('Purchasing a group plan for group', () => {
     const group2 = generateGroup({
       name: 'test group2',
       type: 'guild',
-      privacy: 'private',
+      privacy: 'public',
       leader: user._id,
     });
     data.groupId = group2._id;
     await group2.save();
     recipient.guilds.push(group2._id);
     await recipient.save();
-    user.guilds.push(group2._id);
-    await user.save();
 
     await api.createSubscription(data);
 
     const updatedGroup = await Group.findById(group._id).exec();
-    updatedGroup.memberCount = 2;
-    await updatedGroup.save();
-
     await updatedGroup.leave(recipient);
 
     updatedUser = await User.findById(recipient._id).exec();
@@ -853,6 +806,8 @@ describe('Purchasing a group plan for group', () => {
     recipient.guilds.push(group._id);
     await recipient.save();
 
+    user.guilds.push(group._id);
+    await user.save();
     data.groupId = group._id;
 
     await api.createSubscription(data);
@@ -880,6 +835,8 @@ describe('Purchasing a group plan for group', () => {
     recipient.guilds.push(group._id);
     await recipient.save();
 
+    user.guilds.push(group._id);
+    await user.save();
     data.groupId = group._id;
 
     await api.createSubscription(data);
@@ -907,6 +864,8 @@ describe('Purchasing a group plan for group', () => {
     recipient.guilds.push(group._id);
     await recipient.save();
 
+    user.guilds.push(group._id);
+    await user.save();
     data.groupId = group._id;
 
     await api.createSubscription(data);
@@ -935,6 +894,8 @@ describe('Purchasing a group plan for group', () => {
     recipient.guilds.push(group._id);
     await recipient.save();
 
+    user.guilds.push(group._id);
+    await user.save();
     data.groupId = group._id;
 
     await api.createSubscription(data);

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

@@ -1,7 +1,6 @@
 import moment from 'moment';
 
 import * as sender from '../../../../../website/server/libs/email';
-import common from '../../../../../website/common';
 import api from '../../../../../website/server/libs/payments/payments';
 import * as analytics from '../../../../../website/server/libs/analyticsService';
 import * as notifications from '../../../../../website/server/libs/pushNotifications';
@@ -10,7 +9,6 @@ import { translate as t } from '../../../../helpers/api-integration/v3';
 import {
   generateGroup,
 } from '../../../../helpers/api-unit.helper';
-import * as worldState from '../../../../../website/server/libs/worldState';
 
 describe('payments/index', () => {
   let user; let group; let data; let
@@ -248,7 +246,6 @@ describe('payments/index', () => {
           quantity: 1,
           gift: true,
           purchaseValue: 15,
-          firstPurchase: true,
           headers: {
             'x-client': 'habitica-web',
             'user-agent': '',
@@ -346,7 +343,6 @@ describe('payments/index', () => {
           quantity: 1,
           gift: false,
           purchaseValue: 15,
-          firstPurchase: true,
           headers: {
             'x-client': 'habitica-web',
             'user-agent': '',
@@ -423,22 +419,10 @@ describe('payments/index', () => {
     });
 
     context('Mystery Items', () => {
-      let clock;
-      const mayMysteryItem = 'armor_mystery_201605';
-
-      beforeEach(() => {
-        const mayMysteryItemTimeframe = new Date(2016, 4, 31); // May 31st 2016
-        clock = sinon.useFakeTimers({
-          now: mayMysteryItemTimeframe,
-          toFake: ['Date'],
-        });
-      });
-
-      afterEach(() => {
-        if (clock) clock.restore();
-      });
-
       it('awards mystery items when within the timeframe for a mystery item', async () => {
+        const mayMysteryItemTimeframe = 1464725113000; // May 31st 2016
+        const fakeClock = sinon.useFakeTimers(mayMysteryItemTimeframe);
+
         data = { paymentMethod: 'PaymentMethod', user, sub: { key: 'basic_3mo' } };
 
         const oldNotificationsCount = user.notifications.length;
@@ -451,9 +435,14 @@ describe('payments/index', () => {
         expect(user.purchased.plan.mysteryItems).to.include('head_mystery_201605');
         expect(user.notifications.length).to.equal(oldNotificationsCount + 1);
         expect(user.notifications[0].type).to.equal('NEW_MYSTERY_ITEMS');
+
+        fakeClock.restore();
       });
 
       it('does not award mystery item when user already owns the item', async () => {
+        const mayMysteryItemTimeframe = 1464725113000; // May 31st 2016
+        const fakeClock = sinon.useFakeTimers(mayMysteryItemTimeframe);
+        const mayMysteryItem = 'armor_mystery_201605';
         user.items.gear.owned[mayMysteryItem] = true;
 
         data = { paymentMethod: 'PaymentMethod', user, sub: { key: 'basic_3mo' } };
@@ -462,9 +451,14 @@ describe('payments/index', () => {
 
         expect(user.purchased.plan.mysteryItems).to.have.a.lengthOf(1);
         expect(user.purchased.plan.mysteryItems).to.include('head_mystery_201605');
+
+        fakeClock.restore();
       });
 
       it('does not award mystery item when user already has the item in the mystery box', async () => {
+        const mayMysteryItemTimeframe = 1464725113000; // May 31st 2016
+        const fakeClock = sinon.useFakeTimers(mayMysteryItemTimeframe);
+        const mayMysteryItem = 'armor_mystery_201605';
         user.purchased.plan.mysteryItems = [mayMysteryItem];
 
         sandbox.spy(user.purchased.plan.mysteryItems, 'push');
@@ -474,6 +468,8 @@ describe('payments/index', () => {
 
         expect(user.purchased.plan.mysteryItems.push).to.be.calledOnce;
         expect(user.purchased.plan.mysteryItems.push).to.be.calledWith('head_mystery_201605');
+
+        fakeClock.restore();
       });
     });
   });
@@ -559,7 +555,6 @@ describe('payments/index', () => {
     beforeEach(() => {
       data = {
         user,
-        gemsBlock: common.content.gems['21gems'],
         paymentMethod: 'payment',
         headers: {
           'x-client': 'habitica-web',
@@ -569,6 +564,22 @@ describe('payments/index', () => {
     });
 
     context('Self Purchase', () => {
+      it('amount property defaults to 5', async () => {
+        expect(user.balance).to.eql(0);
+
+        await api.buyGems(data);
+
+        expect(user.balance).to.eql(5);
+      });
+
+      it('can set amount that is purchased', async () => {
+        data.amount = 13;
+
+        await api.buyGems(data);
+
+        expect(user.balance).to.eql(13);
+      });
+
       it('sends a donation email', async () => {
         await api.buyGems(data);
 
@@ -577,51 +588,6 @@ describe('payments/index', () => {
       });
     });
 
-    context('No Active Promotion', () => {
-      beforeEach(() => {
-        sinon.stub(worldState, 'getCurrentEvent').returns(null);
-      });
-
-      afterEach(() => {
-        worldState.getCurrentEvent.restore();
-      });
-
-      it('does not apply a discount', async () => {
-        const balanceBefore = user.balance;
-
-        await api.buyGems(data);
-
-        const balanceAfter = user.balance;
-        const balanceDiff = balanceAfter - balanceBefore;
-
-        expect(balanceDiff * 4).to.eql(21);
-      });
-    });
-
-    context('Active Promotion', () => {
-      beforeEach(() => {
-        sinon.stub(worldState, 'getCurrentEvent').returns({
-          ...common.content.events.fall2020,
-          event: 'fall2020',
-        });
-      });
-
-      afterEach(() => {
-        worldState.getCurrentEvent.restore();
-      });
-
-      it('applies a discount', async () => {
-        const balanceBefore = user.balance;
-
-        await api.buyGems(data);
-
-        const balanceAfter = user.balance;
-        const balanceDiff = balanceAfter - balanceBefore;
-
-        expect(balanceDiff * 4).to.eql(30);
-      });
-    });
-
     context('Gift', () => {
       let recipient;
 

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

@@ -2,13 +2,11 @@
 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 common from '../../../../../../website/common';
 
-describe('paypal - checkout success', () => {
+describe('checkout success', () => {
   const subKey = 'basic_3mo';
   let user; let gift; let customerId; let
     paymentId;
-  const gemsBlockKey = '21gems'; const gemsBlock = common.content.gems[gemsBlockKey];
   let paypalPaymentExecuteStub; let paymentBuyGemsStub; let
     paymentsCreateSubscritionStub;
 
@@ -30,7 +28,7 @@ describe('paypal - checkout success', () => {
 
   it('purchases gems', async () => {
     await paypalPayments.checkoutSuccess({
-      user, gift, paymentId, customerId, gemsBlock: gemsBlockKey,
+      user, gift, paymentId, customerId,
     });
 
     expect(paypalPaymentExecuteStub).to.be.calledOnce;
@@ -40,7 +38,6 @@ describe('paypal - checkout success', () => {
       user,
       customerId,
       paymentMethod: 'Paypal',
-      gemsBlock,
     });
   });
 

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

@@ -4,14 +4,12 @@ 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 apiError from '../../../../../../website/server/libs/apiError';
 
 const BASE_URL = nconf.get('BASE_URL');
 const { i18n } = common;
 
-describe('paypal - checkout', () => {
+describe('checkout', () => {
   const subKey = 'basic_3mo';
-  const gemsBlockKey = '21gems';
   let paypalPaymentCreateStub;
   let approvalHerf;
 
@@ -55,10 +53,10 @@ describe('paypal - checkout', () => {
   });
 
   it('creates a link for gem purchases', async () => {
-    const link = await paypalPayments.checkout({ user: new User(), gemsBlock: gemsBlockKey });
+    const link = await paypalPayments.checkout({ user: new User() });
 
     expect(paypalPaymentCreateStub).to.be.calledOnce;
-    expect(paypalPaymentCreateStub).to.be.calledWith(getPaypalCreateOptions('Habitica Gems', 4.99));
+    expect(paypalPaymentCreateStub).to.be.calledWith(getPaypalCreateOptions('Habitica Gems', 5.00));
     expect(link).to.eql(approvalHerf);
   });
 
@@ -85,23 +83,11 @@ describe('paypal - checkout', () => {
     const user = new User();
     sinon.stub(user, 'canGetGems').resolves(false);
 
-    await expect(paypalPayments.checkout({ user, gemsBlock: gemsBlockKey }))
-      .to.eventually.be.rejected.and.to.eql({
-        httpCode: 401,
-        message: i18n.t('groupPolicyCannotGetGems'),
-        name: 'NotAuthorized',
-      });
-  });
-
-  it('should error if the gems block is not valid', async () => {
-    const user = new User();
-
-    await expect(paypalPayments.checkout({ user, gemsBlock: 'invalid' }))
-      .to.eventually.be.rejected.and.to.eql({
-        httpCode: 400,
-        message: apiError('invalidGemsBlock'),
-        name: 'BadRequest',
-      });
+    await expect(paypalPayments.checkout({ user })).to.eventually.be.rejected.and.to.eql({
+      httpCode: 401,
+      message: i18n.t('groupPolicyCannotGetGems'),
+      name: 'NotAuthorized',
+    });
   });
 
   it('creates a link for gifting gems', async () => {

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

@@ -6,7 +6,7 @@ import {
 } from '../../../../../helpers/api-unit.helper';
 import { model as User } from '../../../../../../website/server/models/user';
 
-describe('paypal - ipn', () => {
+describe('ipn', () => {
   const subKey = 'basic_3mo';
   let user; let group; let txn_type; let userPaymentId; let
     groupPaymentId;

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

@@ -10,7 +10,7 @@ import { createNonLeaderGroupMember } from '../paymentHelpers';
 
 const { i18n } = common;
 
-describe('paypal - subscribeCancel', () => {
+describe('subscribeCancel', () => {
   const subKey = 'basic_3mo';
   let user; let group; let groupId; let customerId; let groupCustomerId; let
     nextBillingDate;

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

@@ -7,7 +7,7 @@ import {
 import { model as User } from '../../../../../../website/server/models/user';
 import common from '../../../../../../website/common';
 
-describe('paypal - subscribeSuccess', () => {
+describe('subscribeSuccess', () => {
   const subKey = 'basic_3mo';
   let user; let group; let block; let groupId; let token; let headers; let
     customerId;

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

@@ -8,7 +8,7 @@ import common from '../../../../../../website/common';
 
 const { i18n } = common;
 
-describe('paypal - subscribe', () => {
+describe('subscribe', () => {
   const subKey = 'basic_3mo';
   let coupon; let sub; let
     approvalHerf;

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

@@ -4,7 +4,7 @@ import api from '../../../../../../website/server/libs/payments/payments';
 
 const groupPlanId = api.constants.GROUP_PLAN_CUSTOMER_ID;
 
-describe('stripe - #calculateSubscriptionTerminationDate', () => {
+describe('#calculateSubscriptionTerminationDate', () => {
   let plan;
   let nextBill;
 

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

@@ -10,7 +10,7 @@ import common from '../../../../../../website/common';
 
 const { i18n } = common;
 
-describe('stripe - cancel subscription', () => {
+describe('cancel subscription', () => {
   const subKey = 'basic_3mo';
   const stripe = stripeModule('test');
   let user; let groupId; let

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

@@ -12,7 +12,7 @@ import common from '../../../../../../website/common';
 
 const { i18n } = common;
 
-describe('stripe - checkout with subscription', () => {
+describe('checkout with subscription', () => {
   const subKey = 'basic_3mo';
   const stripe = stripeModule('test');
   let user; let group; let data; let gift; let sub;

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

@@ -4,17 +4,16 @@ 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 apiError from '../../../../../../website/server/libs/apiError';
 
 const { i18n } = common;
 
-describe('stripe - checkout', () => {
+describe('checkout', () => {
   const subKey = 'basic_3mo';
   const stripe = stripeModule('test');
   let stripeChargeStub; let paymentBuyGemsStub; let
     paymentCreateSubscritionStub;
   let user; let gift; let groupId; let email; let headers; let coupon; let customerIdResponse; let
-    token; const gemsBlockKey = '21gems'; const gemsBlock = common.content.gems[gemsBlockKey];
+    token;
 
   beforeEach(() => {
     user = new User();
@@ -90,7 +89,6 @@ describe('stripe - checkout', () => {
     await expect(stripePayments.checkout({
       token,
       user,
-      gemsBlock: gemsBlockKey,
       gift,
       groupId,
       email,
@@ -103,25 +101,6 @@ describe('stripe - checkout', () => {
     });
   });
 
-  it('should error if the gems block is invalid', async () => {
-    gift = undefined;
-
-    await expect(stripePayments.checkout({
-      token,
-      user,
-      gemsBlock: 'invalid',
-      gift,
-      groupId,
-      email,
-      headers,
-      coupon,
-    }, stripe)).to.eventually.be.rejected.and.to.eql({
-      httpCode: 400,
-      message: apiError('invalidGemsBlock'),
-      name: 'BadRequest',
-    });
-  });
-
   it('should purchase gems', async () => {
     gift = undefined;
     sinon.stub(user, 'canGetGems').resolves(true);
@@ -129,7 +108,6 @@ describe('stripe - checkout', () => {
     await stripePayments.checkout({
       token,
       user,
-      gemsBlock: gemsBlockKey,
       gift,
       groupId,
       email,
@@ -139,7 +117,7 @@ describe('stripe - checkout', () => {
 
     expect(stripeChargeStub).to.be.calledOnce;
     expect(stripeChargeStub).to.be.calledWith({
-      amount: 499,
+      amount: 500,
       currency: 'usd',
       card: token,
     });
@@ -150,7 +128,6 @@ describe('stripe - checkout', () => {
       customerId: customerIdResponse,
       paymentMethod: 'Stripe',
       gift,
-      gemsBlock,
     });
     expect(user.canGetGems).to.be.calledOnce;
     user.canGetGems.restore();
@@ -190,7 +167,6 @@ describe('stripe - checkout', () => {
       customerId: customerIdResponse,
       paymentMethod: 'Gift',
       gift,
-      gemsBlock: undefined,
     });
   });
 
@@ -229,7 +205,6 @@ describe('stripe - checkout', () => {
       customerId: customerIdResponse,
       paymentMethod: 'Gift',
       gift,
-      gemsBlock: undefined,
     });
   });
 });

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

@@ -9,7 +9,7 @@ import common from '../../../../../../website/common';
 
 const { i18n } = common;
 
-describe('stripe - edit subscription', () => {
+describe('edit subscription', () => {
   const subKey = 'basic_3mo';
   const stripe = stripeModule('test');
   let user; let groupId; let group; let

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

@@ -33,14 +33,11 @@ describe('Stripe - Upgrade Group Plan', () => {
     group = generateGroup({
       name: 'test group',
       type: 'guild',
-      privacy: 'private',
+      privacy: 'public',
       leader: user._id,
     });
     await group.save();
 
-    user.guilds.push(group._id);
-    await user.save();
-
     spy = sinon.stub(stripe.subscriptions, 'update');
     spy.resolves([]);
     data.groupId = group._id;

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

@@ -9,7 +9,7 @@ describe('preenHistory', () => {
   beforeEach(() => {
     // Replace system clocks so we can get predictable results
     clock = sinon.useFakeTimers({
-      now: Number(moment('2013-10-20').utcOffset(0).startOf('day').toDate()),
+      now: Number(moment('2013-10-20').zone(0).startOf('day').toDate()),
       toFake: ['Date'],
     });
   });

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

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

test/api/unit/libs/xmlMarshaller.test.js

@@ -1,44 +0,0 @@
-import * as xmlMarshaller from '../../../../website/server/libs/xmlMarshaller';
-
-describe('xml marshaller marshalls user data', () => {
-  const minimumUser = {
-    pinnedItems: [],
-    unpinnedItems: [],
-    inbox: {},
-  };
-
-  function userDataWith (fields) {
-    return { ...minimumUser, ...fields };
-  }
-
-  it('maps the newMessages field to have id as a value in a list.', () => {
-    const userData = userDataWith({
-      newMessages: {
-        '283171a5-422c-4991-bc78-95b1b5b51629': {
-          name: 'The Language Hackers',
-          value: true,
-        },
-        '283171a6-422c-4991-bc78-95b1b5b51629': {
-          name: 'The Bug Hackers',
-          value: false,
-        },
-      },
-    });
-
-    const xml = xmlMarshaller.marshallUserData(userData);
-
-    expect(xml).to.equal(`<user>
-    <inbox/>
-    <newMessages>
-        <id>283171a5-422c-4991-bc78-95b1b5b51629</id>
-        <name>The Language Hackers</name>
-        <value>true</value>
-    </newMessages>
-    <newMessages>
-        <id>283171a6-422c-4991-bc78-95b1b5b51629</id>
-        <name>The Bug Hackers</name>
-        <value>false</value>
-    </newMessages>
-</user>`);
-  });
-});

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

@@ -21,8 +21,7 @@ describe('cors middleware', () => {
     expect(res.set).to.have.been.calledWith({
       'Access-Control-Allow-Origin': '*',
       'Access-Control-Allow-Methods': 'OPTIONS,GET,POST,PUT,HEAD,DELETE',
-      'Access-Control-Allow-Headers': 'Authorization,Content-Type,Accept,Content-Encoding,X-Requested-With,x-api-user,x-api-key,x-client',
-      'Access-Control-Expose-Headers': 'X-RateLimit-Limit,X-RateLimit-Remaining,X-RateLimit-Reset,Retry-After',
+      'Access-Control-Allow-Headers': 'Content-Type,Accept,Content-Encoding,X-Requested-With,x-api-user,x-api-key,x-client',
     });
     expect(res.sendStatus).to.not.have.been.called;
     expect(next).to.have.been.calledOnce;
@@ -34,8 +33,7 @@ describe('cors middleware', () => {
     expect(res.set).to.have.been.calledWith({
       'Access-Control-Allow-Origin': '*',
       'Access-Control-Allow-Methods': 'OPTIONS,GET,POST,PUT,HEAD,DELETE',
-      'Access-Control-Allow-Headers': 'Authorization,Content-Type,Accept,Content-Encoding,X-Requested-With,x-api-user,x-api-key,x-client',
-      'Access-Control-Expose-Headers': 'X-RateLimit-Limit,X-RateLimit-Remaining,X-RateLimit-Reset,Retry-After',
+      'Access-Control-Allow-Headers': 'Content-Type,Accept,Content-Encoding,X-Requested-With,x-api-user,x-api-key,x-client',
     });
     expect(res.sendStatus).to.have.been.calledWith(200);
     expect(next).to.not.have.been.called;

test/api/unit/middlewares/cronMiddleware.js

@@ -293,90 +293,4 @@ describe('cron middleware', () => {
       });
     });
   });
-
-  context('Drop Cap A/B Test', async () => {
-    it('enrolls web users', async () => {
-      user.lastCron = moment(new Date()).subtract({ days: 2 });
-      await user.save();
-      req.headers['x-client'] = 'habitica-web';
-
-      await new Promise((resolve, reject) => {
-        cronMiddleware(req, res, async err => {
-          if (err) return reject(err);
-          user = await User.findById(user._id).exec();
-          expect(user._ABtests.dropCapNotif).to.be.a.string;
-
-          return resolve();
-        });
-      });
-    });
-
-    it('enables the new notification for 50% of users', async () => {
-      sandbox.stub(Math, 'random').returns(0.5);
-      user.lastCron = moment(new Date()).subtract({ days: 2 });
-      await user.save();
-      req.headers['x-client'] = 'habitica-web';
-
-      await new Promise((resolve, reject) => {
-        cronMiddleware(req, res, async err => {
-          if (err) return reject(err);
-          user = await User.findById(user._id).exec();
-          expect(user._ABtests.dropCapNotif).to.be.equal('drop-cap-notif-enabled');
-
-          return resolve();
-        });
-      });
-    });
-
-    it('disables the new notification for 50% of users', async () => {
-      sandbox.stub(Math, 'random').returns(0.51);
-      user.lastCron = moment(new Date()).subtract({ days: 2 });
-      await user.save();
-      req.headers['x-client'] = 'habitica-web';
-
-      await new Promise((resolve, reject) => {
-        cronMiddleware(req, res, async err => {
-          if (err) return reject(err);
-          user = await User.findById(user._id).exec();
-          expect(user._ABtests.dropCapNotif).to.be.equal('drop-cap-notif-disabled');
-
-          return resolve();
-        });
-      });
-    });
-
-    it('does not affect subscribers', async () => {
-      sandbox.stub(Math, 'random').returns(0.2);
-      user.lastCron = moment(new Date()).subtract({ days: 2 });
-      await user.save();
-      req.headers['x-client'] = 'habitica-web';
-      sandbox.stub(User.prototype, 'isSubscribed').returns(true);
-
-      await new Promise((resolve, reject) => {
-        cronMiddleware(req, res, async err => {
-          if (err) return reject(err);
-          user = await User.findById(user._id).exec();
-          expect(user._ABtests.dropCapNotif).to.not.exist;
-
-          return resolve();
-        });
-      });
-    });
-
-    it('does not affect mobile users', async () => {
-      user.lastCron = moment(new Date()).subtract({ days: 2 });
-      await user.save();
-      req.headers['x-client'] = 'habitica-ios';
-
-      await new Promise((resolve, reject) => {
-        cronMiddleware(req, res, async err => {
-          if (err) return reject(err);
-          user = await User.findById(user._id).exec();
-          expect(user._ABtests.dropCapNotif).to.not.exist;
-
-          return resolve();
-        });
-      });
-    });
-  });
 });

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

@@ -5,7 +5,7 @@ import {
   generateNext,
 } from '../../../helpers/api-unit.helper';
 import i18n from '../../../../website/common/script/i18n';
-import { ensureAdmin, ensureSudo, ensureNewsPoster } from '../../../../website/server/middlewares/ensureAccessRight';
+import { ensureAdmin, ensureSudo } from '../../../../website/server/middlewares/ensureAccessRight';
 import { NotAuthorized } from '../../../../website/server/libs/errors';
 import apiError from '../../../../website/server/libs/apiError';
 
@@ -40,27 +40,6 @@ describe('ensure access middlewares', () => {
     });
   });
 
-  context('ensure newsPoster', () => {
-    it('returns not authorized when user is not a newsPoster', () => {
-      res.locals = { user: { contributor: { newsPoster: false } } };
-
-      ensureNewsPoster(req, res, next);
-
-      const calledWith = next.getCall(0).args;
-      expect(calledWith[0].message).to.equal(apiError('noNewsPosterAccess'));
-      expect(calledWith[0] instanceof NotAuthorized).to.equal(true);
-    });
-
-    it('passes when user is a newsPoster', () => {
-      res.locals = { user: { contributor: { newsPoster: true } } };
-
-      ensureNewsPoster(req, res, next);
-
-      expect(next).to.be.calledOnce;
-      expect(next.args[0]).to.be.empty;
-    });
-  });
-
   context('ensure sudo', () => {
     it('returns not authorized when user is not a sudo user', () => {
       res.locals = { user: { contributor: { sudo: false } } };

test/api/unit/middlewares/ipBlocker.test.js

@@ -57,7 +57,7 @@ describe('ipBlocker middleware', () => {
   });
 
   it('does not throw when the ip does not match', () => {
-    req.ip = '192.168.1.1';
+    req.headers['x-forwarded-for'] = '192.168.1.1';
     sandbox.stub(nconf, 'get').withArgs('BLOCKED_IPS').returns('192.168.1.2');
     const attachIpBlocker = requireAgain(pathToIpBlocker).default;
     attachIpBlocker(req, res, next);
@@ -65,12 +65,30 @@ describe('ipBlocker middleware', () => {
     checkErrorNotThrown(next);
   });
 
-  it('throws when the ip is blocked', () => {
-    req.ip = '192.168.1.1';
+  it('throws when a matching ip exist in x-forwarded-for', () => {
+    req.headers['x-forwarded-for'] = '192.168.1.1';
     sandbox.stub(nconf, 'get').withArgs('BLOCKED_IPS').returns('192.168.1.1');
     const attachIpBlocker = requireAgain(pathToIpBlocker).default;
     attachIpBlocker(req, res, next);
 
     checkErrorThrown(next);
   });
+
+  it('trims ips in x-forwarded-for', () => {
+    req.headers['x-forwarded-for'] = '192.168.1.1';
+    sandbox.stub(nconf, 'get').withArgs('BLOCKED_IPS').returns(',  192.168.1.1 ,   192.168.1.4, ');
+    const attachIpBlocker = requireAgain(pathToIpBlocker).default;
+    attachIpBlocker(req, res, next);
+
+    checkErrorThrown(next);
+  });
+
+  it('works when multiple ips are passed in x-forwarded-for', () => {
+    req.headers['x-forwarded-for'] = '192.168.1.4';
+    sandbox.stub(nconf, 'get').withArgs('BLOCKED_IPS').returns('192.168.1.1, 192.168.1.4, 192.168.1.3');
+    const attachIpBlocker = requireAgain(pathToIpBlocker).default;
+    attachIpBlocker(req, res, next);
+
+    checkErrorThrown(next);
+  });
 });

test/api/unit/middlewares/rateLimiter.test.js

@@ -1,141 +0,0 @@
-import nconf from 'nconf';
-import { RateLimiterMemory } from 'rate-limiter-flexible';
-import requireAgain from 'require-again';
-import {
-  generateRes,
-  generateReq,
-  generateNext,
-} from '../../../helpers/api-unit.helper';
-import { TooManyRequests } from '../../../../website/server/libs/errors';
-import apiError from '../../../../website/server/libs/apiError';
-import logger from '../../../../website/server/libs/logger';
-
-describe('rateLimiter middleware', () => {
-  const pathToRateLimiter = '../../../../website/server/middlewares/rateLimiter';
-
-  let res; let req; let next; let nconfGetStub;
-
-  beforeEach(() => {
-    nconfGetStub = sandbox.stub(nconf, 'get');
-
-    nconfGetStub.withArgs('NODE_ENV').returns('test');
-    nconfGetStub.withArgs('IS_TEST').returns(true);
-
-    res = generateRes();
-    req = generateReq();
-    next = generateNext();
-  });
-
-  afterEach(() => {
-    sandbox.restore();
-  });
-
-  it('is disabled when the env var is not defined', () => {
-    nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns(undefined);
-    const attachRateLimiter = requireAgain(pathToRateLimiter).default;
-    attachRateLimiter(req, res, next);
-
-    expect(next).to.have.been.calledOnce;
-    const calledWith = next.getCall(0).args;
-    expect(typeof calledWith[0] === 'undefined').to.equal(true);
-    expect(res.set).to.not.have.been.called;
-  });
-
-  it('is disabled when the env var is an not "true"', () => {
-    nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns('false');
-    const attachRateLimiter = requireAgain(pathToRateLimiter).default;
-    attachRateLimiter(req, res, next);
-
-    expect(next).to.have.been.calledOnce;
-    const calledWith = next.getCall(0).args;
-    expect(typeof calledWith[0] === 'undefined').to.equal(true);
-    expect(res.set).to.not.have.been.called;
-  });
-
-  it('does not throw when there are available points', async () => {
-    nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns('true');
-    const attachRateLimiter = requireAgain(pathToRateLimiter).default;
-    await attachRateLimiter(req, res, next);
-
-    expect(next).to.have.been.calledOnce;
-    const calledWith = next.getCall(0).args;
-    expect(typeof calledWith[0] === 'undefined').to.equal(true);
-
-    expect(res.set).to.have.been.calledOnce;
-    expect(res.set).to.have.been.calledWithMatch({
-      'X-RateLimit-Limit': 30,
-      'X-RateLimit-Remaining': 29,
-      'X-RateLimit-Reset': sinon.match(Date),
-    });
-  });
-
-  it('does not throw when an unknown error is thrown by the rate limiter', async () => {
-    nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns('true');
-    sandbox.stub(logger, 'error');
-    sandbox.stub(RateLimiterMemory.prototype, 'consume')
-      .returns(Promise.reject(new Error('Unknown error.')));
-
-    const attachRateLimiter = requireAgain(pathToRateLimiter).default;
-    await attachRateLimiter(req, res, next);
-
-    expect(next).to.have.been.calledOnce;
-    const calledWith = next.getCall(0).args;
-    expect(typeof calledWith[0] === 'undefined').to.equal(true);
-    expect(res.set).to.not.have.been.called;
-
-    expect(logger.error).to.be.calledOnce;
-    expect(logger.error).to.have.been.calledWithMatch(Error, 'Rate Limiter Error');
-  });
-
-  it('throws when there are no available points remaining', async () => {
-    nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns('true');
-    const attachRateLimiter = requireAgain(pathToRateLimiter).default;
-
-    // call for 31 times
-    for (let i = 0; i < 31; i += 1) {
-      await attachRateLimiter(req, res, next); // eslint-disable-line no-await-in-loop
-    }
-
-    expect(next).to.have.been.callCount(31);
-    const calledWith = next.getCall(30).args;
-    expect(calledWith[0].message).to.equal(apiError('clientRateLimited'));
-    expect(calledWith[0] instanceof TooManyRequests).to.equal(true);
-
-    expect(res.set).to.have.been.callCount(31);
-    expect(res.set).to.have.been.calledWithMatch({
-      'Retry-After': sinon.match(Number),
-      'X-RateLimit-Limit': 30,
-      'X-RateLimit-Remaining': 0,
-      'X-RateLimit-Reset': sinon.match(Date),
-    });
-  });
-
-  it('uses the user id if supplied or the ip address', async () => {
-    nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns('true');
-    const attachRateLimiter = requireAgain(pathToRateLimiter).default;
-
-    req.ip = 1;
-    await attachRateLimiter(req, res, next);
-
-    req.headers['x-api-user'] = 'user-1';
-    await attachRateLimiter(req, res, next);
-    await attachRateLimiter(req, res, next);
-
-    // user id an ip are counted as separate sources
-    expect(res.set).to.have.been.calledWithMatch({
-      'X-RateLimit-Limit': 30,
-      'X-RateLimit-Remaining': 28, // 2 calls with user id
-      'X-RateLimit-Reset': sinon.match(Date),
-    });
-
-    req.headers['x-api-user'] = undefined;
-    await attachRateLimiter(req, res, next);
-    await attachRateLimiter(req, res, next);
-
-    expect(res.set).to.have.been.calledWithMatch({
-      'X-RateLimit-Limit': 30,
-      'X-RateLimit-Remaining': 27, // 3 calls with only ip
-      'X-RateLimit-Reset': sinon.match(Date),
-    });
-  });
-});

test/api/unit/middlewares/redirects.js

@@ -22,7 +22,7 @@ describe('redirects middleware', () => {
       const nconfStub = sandbox.stub(nconf, 'get');
       nconfStub.withArgs('BASE_URL').returns('https://habitica.com');
       nconfStub.withArgs('IS_PROD').returns(true);
-      req.protocol = 'http';
+      req.header = sandbox.stub().withArgs('x-forwarded-proto').returns('http');
       req.originalUrl = '/static/front';
 
       const attachRedirects = requireAgain(pathToRedirectsMiddleware);
@@ -37,7 +37,7 @@ describe('redirects middleware', () => {
       const nconfStub = sandbox.stub(nconf, 'get');
       nconfStub.withArgs('BASE_URL').returns('https://habitica.com');
       nconfStub.withArgs('IS_PROD').returns(true);
-      req.protocol = 'https';
+      req.header = sandbox.stub().withArgs('x-forwarded-proto').returns('https');
       req.originalUrl = '/static/front';
 
       const attachRedirects = requireAgain(pathToRedirectsMiddleware);
@@ -51,7 +51,7 @@ describe('redirects middleware', () => {
       const nconfStub = sandbox.stub(nconf, 'get');
       nconfStub.withArgs('BASE_URL').returns('https://habitica.com');
       nconfStub.withArgs('IS_PROD').returns(false);
-      req.protocol = 'http';
+      req.header = sandbox.stub().withArgs('x-forwarded-proto').returns('http');
       req.originalUrl = '/static/front';
 
       const attachRedirects = requireAgain(pathToRedirectsMiddleware);
@@ -65,7 +65,7 @@ describe('redirects middleware', () => {
       const nconfStub = sandbox.stub(nconf, 'get');
       nconfStub.withArgs('BASE_URL').returns('http://habitica.com');
       nconfStub.withArgs('IS_PROD').returns(true);
-      req.protocol = 'http';
+      req.header = sandbox.stub().withArgs('x-forwarded-proto').returns('http');
       req.originalUrl = '/static/front';
 
       const attachRedirects = requireAgain(pathToRedirectsMiddleware);
@@ -81,7 +81,7 @@ describe('redirects middleware', () => {
       nconfStub.withArgs('IS_PROD').returns(true);
       nconfStub.withArgs('SKIP_SSL_CHECK_KEY').returns('test-key');
 
-      req.protocol = 'http';
+      req.header = sandbox.stub().withArgs('x-forwarded-proto').returns('http');
       req.originalUrl = '/static/front';
       req.query.skipSSLCheck = 'test-key';
 
@@ -97,7 +97,7 @@ describe('redirects middleware', () => {
       nconfStub.withArgs('IS_PROD').returns(true);
       nconfStub.withArgs('SKIP_SSL_CHECK_KEY').returns('test-key');
 
-      req.protocol = 'http';
+      req.header = sandbox.stub().withArgs('x-forwarded-proto').returns('http');
       req.originalUrl = '/static/front?skipSSLCheck=INVALID';
       req.query.skipSSLCheck = 'INVALID';
 
@@ -114,7 +114,7 @@ describe('redirects middleware', () => {
       nconfStub.withArgs('IS_PROD').returns(true);
       nconfStub.withArgs('SKIP_SSL_CHECK_KEY').returns(null);
 
-      req.protocol = 'http';
+      req.header = sandbox.stub().withArgs('x-forwarded-proto').returns('http');
       req.originalUrl = '/static/front';
       req.query.skipSSLCheck = 'INVALID';
 

test/api/unit/middlewares/response.js

@@ -16,6 +16,7 @@ describe('response middleware', () => {
     next = generateNext();
   });
 
+
   it('attaches respond method to res', () => {
     responseMiddleware(req, res, next);
 

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

@@ -35,33 +35,6 @@ describe('Challenge Model', () => {
       notes: 'test notes',
     },
   };
-  const tasks2ToTest = {
-    habit: {
-      text: 'test habit 2',
-      type: 'habit',
-      up: false,
-      down: true,
-      notes: 'test notes',
-    },
-    todo: {
-      text: 'test todo 2',
-      type: 'todo',
-      notes: 'test notes',
-    },
-    daily: {
-      text: 'test daily 2',
-      type: 'daily',
-      frequency: 'daily',
-      everyX: 5,
-      startDate: new Date(),
-      notes: 'test notes',
-    },
-    reward: {
-      text: 'test reward 2',
-      type: 'reward',
-      notes: 'test notes',
-    },
-  };
 
   beforeEach(async () => {
     guild = new Group({
@@ -173,60 +146,6 @@ describe('Challenge Model', () => {
         expect(syncedTask.attribute).to.eql('str');
       });
 
-      it('should add challenge tag back to user upon syncing challenge tasks to a user with challenge tag removed', async () => {
-        await challenge.addTasks([task]);
-
-        const newMember = new User({
-          guilds: [guild._id],
-        });
-        await newMember.save();
-        await challenge.syncTasksToUser(newMember);
-
-        let updatedNewMember = await User.findById(newMember._id).exec();
-        const updatedNewMemberId = updatedNewMember._id;
-
-        updatedNewMember.tags = [];
-        await updatedNewMember.save();
-
-        const taskValue2 = tasks2ToTest[taskType];
-        const task2 = new Tasks[`${taskType}`](Tasks.Task.sanitize(taskValue2));
-        task2.challenge.id = challenge._id;
-        await challenge.addTasks([task2]);
-        await challenge.syncTasksToUser(updatedNewMember);
-
-        updatedNewMember = await User.findById(updatedNewMemberId).exec();
-
-        expect(updatedNewMember.tags.length).to.equal(1);
-        expect(updatedNewMember.tags[0].id).to.equal(challenge._id);
-        expect(updatedNewMember.tags[0].name).to.equal(challenge.shortName);
-      });
-
-      it('should not add a duplicate challenge tag to user upon syncing challenge tasks to a user with existing challenge tag', async () => {
-        await challenge.addTasks([task]);
-
-        const newMember = new User({
-          guilds: [guild._id],
-        });
-        await newMember.save();
-        await challenge.syncTasksToUser(newMember);
-
-        let updatedNewMember = await User.findById(newMember._id).exec();
-        const updatedNewMemberId = updatedNewMember._id;
-
-        const taskValue2 = tasks2ToTest[taskType];
-        const task2 = new Tasks[`${taskType}`](Tasks.Task.sanitize(taskValue2));
-        task2.challenge.id = challenge._id;
-        await challenge.addTasks([task2]);
-        await challenge.syncTasksToUser(updatedNewMember);
-
-        updatedNewMember = await User.findById(updatedNewMemberId);
-
-        expect(updatedNewMember.tags.length).to.equal(8);
-        expect(updatedNewMember.tags[7].id).to.equal(challenge._id);
-        expect(updatedNewMember.tags[7].name).to.equal(challenge.shortName);
-        expect(updatedNewMember.tags.filter(tag => tag.id === challenge._id).length).to.equal(1);
-      });
-
       it('syncs challenge tasks to a user with the existing task', async () => {
         await challenge.addTasks([task]);
 

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

@@ -769,6 +769,7 @@ describe('Group Model', () => {
         expect(res.t).to.not.be.called;
       });
 
+
       it('does not throw an error if only user ids are passed in', async () => {
         await Group.validateInvitations({ uuids: ['user-id', 'user-id2'] }, res);
         expect(res.t).to.not.be.called;

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

@@ -235,16 +235,15 @@ describe('Group Task Methods', () => {
         });
       });
 
-      it('removes assigned tasks when master task is deleted', async () => {
+      it('removes an assigned task and unlinks assignees', async () => {
         await guild.syncTask(task, leader);
         await guild.removeTask(task);
 
         const updatedLeader = await User.findOne({ _id: leader._id });
-        const updatedLeadersTasks = await Tasks.Task.find({ userId: leader._id, type: taskType });
+        const updatedLeadersTasks = await Tasks.Task.find({ _id: { $in: updatedLeader.tasksOrder[`${taskType}s`] } });
         const syncedTask = find(updatedLeadersTasks, findLinkedTask);
 
-        expect(updatedLeader.tasksOrder[`${taskType}s`]).to.not.include(task._id);
-        expect(syncedTask).to.not.exist;
+        expect(syncedTask.group.broken).to.equal('TASK_DELETED');
       });
 
       it('unlinks and deletes group tasks for a user when remove-all is specified', async () => {

test/api/unit/models/newsPost.js

@@ -1,138 +0,0 @@
-import { v4 } from 'uuid';
-import { model as NewsPost, refreshNewsPost } from '../../../../website/server/models/newsPost';
-import { sleep } from '../../../helpers/api-unit.helper';
-
-describe('NewsPost Model', () => {
-  const publishDate = Number(new Date());
-
-  // NOTE publishDate is manually increased by +500 for each test
-  // to make sure it's always in the future from the previous one
-  // bevause NewsPost.lastNewsPost() is not reset between tests.
-  // And without a more recent publishDate it wouldn't update
-
-  it('#lastNewsPost', () => {
-    const lastPost = { _id: v4(), publishDate, published: true };
-    NewsPost.updateLastNewsPost(lastPost);
-    expect(NewsPost.lastNewsPost()).to.equal(lastPost);
-  });
-
-  it('#getLastPostFromDatabase', async () => {
-    const expectedId = v4();
-
-    await NewsPost.create([
-      // more recent but not published
-      {
-        _id: v4(),
-        publishDate: new Date(publishDate + 50),
-        author: v4(),
-        published: false,
-        title: 'Title',
-        credits: 'credits',
-        text: 'text',
-      },
-      // expected
-      {
-        _id: expectedId,
-        publishDate,
-        author: v4(),
-        published: true,
-        title: 'Title',
-        credits: 'credits',
-        text: 'text',
-      },
-      // published but less recent
-      {
-        _id: v4(),
-        publishDate: new Date(Number(publishDate) - 50),
-        author: v4(),
-        published: true,
-        title: 'Title',
-        credits: 'credits',
-        text: 'text',
-      },
-    ]);
-
-    const fetched = await NewsPost.getLastPostFromDatabase();
-    expect(fetched._id).to.equal(expectedId);
-  });
-
-  context('#updateLastNewsPost', () => {
-    it('updates the post if new one is more recent and published', () => {
-      const previousPost = {
-        _id: v4(),
-        publishDate: new Date(publishDate + 100),
-        published: true,
-      };
-      NewsPost.updateLastNewsPost(previousPost);
-      const newPost = {
-        _id: v4(),
-        publishDate: new Date(publishDate + 150),
-        published: true,
-      };
-      NewsPost.updateLastNewsPost(newPost);
-      expect(NewsPost.lastNewsPost()._id).to.equal(newPost._id);
-    });
-
-    it('does not update the post if new one is from the past', () => {
-      const previousPost = new NewsPost({
-        _id: v4(), publishDate: new Date(publishDate + 200), published: true,
-      });
-      NewsPost.updateLastNewsPost(previousPost);
-      const newPost = new NewsPost({
-        _id: v4(), publishDate: new Date(publishDate + 175), published: true,
-      });
-      NewsPost.updateLastNewsPost(newPost);
-      expect(NewsPost.lastNewsPost()._id).to.equal(previousPost._id);
-    });
-
-    it('does not update the post if new one is not published', () => {
-      const previousPost = new NewsPost({
-        _id: v4(), publishDate: new Date(publishDate + 250), published: true,
-      });
-      NewsPost.updateLastNewsPost(previousPost);
-      const newPost = new NewsPost({
-        _id: v4(), publishDate: new Date(publishDate + 300), published: false,
-      });
-      NewsPost.updateLastNewsPost(newPost);
-      expect(NewsPost.lastNewsPost()._id).to.equal(previousPost._id);
-    });
-  });
-
-  context('refreshes NewsPost', () => {
-    let intervalId;
-
-    beforeEach(async () => {
-      // Delete all existing posts from the database
-      await NewsPost.remove();
-    });
-
-    afterEach(() => {
-      if (intervalId) clearInterval(intervalId);
-    });
-
-    it('refreshes the last post at a specific interval', async () => {
-      await sleep(0.1); // wait 100ms to make sure all previous posts are in the past
-      const previousPost = {
-        _id: v4(), publishDate: new Date(), published: true,
-      };
-      NewsPost.updateLastNewsPost(previousPost);
-      intervalId = refreshNewsPost(50); // refreshes every 50ms
-
-      await sleep(0.1); // wait 100ms to make sure the new post has a more recent publishDate
-      const newPost = await NewsPost.create({
-        _id: v4(),
-        publishDate: new Date(),
-        author: v4(),
-        published: true,
-        title: 'Title',
-        credits: 'credits',
-        text: 'text',
-      });
-
-      expect(NewsPost.lastNewsPost()._id).to.equal(previousPost._id);
-      await sleep(0.15); // wait 150ms
-
-      expect(NewsPost.lastNewsPost()._id).to.equal(newPost._id);
-    });
-  });
-});

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

@@ -3,6 +3,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 { InternalServerError } from '../../../../website/server/libs/errors';
 import { generateHistory } from '../../../helpers/api-unit.helper';
 
 describe('Task Model', () => {
@@ -98,8 +99,7 @@ describe('Task Model', () => {
           throw new Error('No exception when Id is None');
         } catch (err) {
           expect(err).to.exist;
-          expect(err).to.be.an.instanceOf(Error);
-          expect(err.message).to.eql('Task identifier is a required argument');
+          expect(err).to.eql(new InternalServerError('Task identifier is a required argument'));
         }
       });
 
@@ -109,8 +109,7 @@ describe('Task Model', () => {
           throw new Error('No exception when user_id is undefined');
         } catch (err) {
           expect(err).to.exist;
-          expect(err).to.be.an.instanceOf(Error);
-          expect(err.message).to.eql('User identifier is a required argument');
+          expect(err).to.eql(new InternalServerError('User identifier is a required argument'));
         }
       });
 
@@ -154,132 +153,6 @@ describe('Task Model', () => {
       });
     });
 
-    describe('findMultipleByIdOrAlias', () => {
-      let taskWithAlias;
-      let secondTask;
-      let user;
-
-      beforeEach(async () => {
-        user = new User();
-        await user.save();
-
-        taskWithAlias = new Tasks.todo({ // eslint-disable-line new-cap
-          text: 'some text',
-          alias: 'short-name',
-          userId: user.id,
-        });
-        await taskWithAlias.save();
-
-        secondTask = new Tasks.habit({ // eslint-disable-line new-cap
-          text: 'second task',
-          alias: 'second-short-name',
-          userId: user.id,
-        });
-        await secondTask.save();
-
-        sandbox.spy(Tasks.Task, 'find');
-      });
-
-      it('throws an error if task identifiers is not passed in', async () => {
-        try {
-          await Tasks.Task.findMultipleByIdOrAlias(null, user._id);
-          throw new Error('No exception when Id is None');
-        } catch (err) {
-          expect(err).to.exist;
-          expect(err).to.be.an.instanceOf(Error);
-          expect(err.message).to.eql('Task identifiers is a required array argument');
-        }
-      });
-
-      it('throws an error if task identifiers is not an array', async () => {
-        try {
-          await Tasks.Task.findMultipleByIdOrAlias('string', user._id);
-          throw new Error('No exception when Id is None');
-        } catch (err) {
-          expect(err).to.exist;
-          expect(err).to.be.an.instanceOf(Error);
-          expect(err.message).to.eql('Task identifiers is a required array argument');
-        }
-      });
-
-      it('throws an error if user identifier is not passed in', async () => {
-        try {
-          await Tasks.Task.findMultipleByIdOrAlias([taskWithAlias._id]);
-          throw new Error('No exception when user_id is undefined');
-        } catch (err) {
-          expect(err).to.exist;
-          expect(err).to.be.an.instanceOf(Error);
-          expect(err.message).to.eql('User identifier is a required argument');
-        }
-      });
-
-      it('returns task by id', async () => {
-        const foundTasks = await Tasks.Task.findMultipleByIdOrAlias([taskWithAlias._id], user._id);
-
-        expect(foundTasks[0].text).to.eql(taskWithAlias.text);
-      });
-
-      it('returns task by alias', async () => {
-        const foundTasks = await Tasks.Task.findMultipleByIdOrAlias(
-          [taskWithAlias.alias], user._id,
-        );
-
-        expect(foundTasks[0].text).to.eql(taskWithAlias.text);
-      });
-
-      it('returns multiple tasks', async () => {
-        const foundTasks = await Tasks.Task.findMultipleByIdOrAlias(
-          [taskWithAlias.alias, secondTask._id], user._id,
-        );
-
-        expect(foundTasks.length).to.eql(2);
-        expect(foundTasks[0]._id).to.eql(taskWithAlias._id);
-        expect(foundTasks[1]._id).to.eql(secondTask._id);
-      });
-
-      it('returns a task only once if searched by both id and alias', async () => {
-        const foundTasks = await Tasks.Task.findMultipleByIdOrAlias(
-          [taskWithAlias.alias, taskWithAlias._id], user._id,
-        );
-
-        expect(foundTasks.length).to.eql(1);
-        expect(foundTasks[0].text).to.eql(taskWithAlias.text);
-      });
-
-      it('scopes alias lookup to user', async () => {
-        await Tasks.Task.findMultipleByIdOrAlias([taskWithAlias.alias], user._id);
-
-        expect(Tasks.Task.find).to.be.calledOnce;
-        expect(Tasks.Task.find).to.be.calledWithMatch({
-          $or: [
-            { _id: { $in: [] } },
-            { alias: { $in: [taskWithAlias.alias] } },
-          ],
-          userId: user._id,
-        });
-      });
-
-      it('returns empty array if tasks cannot be found', async () => {
-        const foundTasks = await Tasks.Task.findMultipleByIdOrAlias(['not-found'], user._id);
-
-        expect(foundTasks).to.eql([]);
-      });
-
-      it('accepts additional query parameters', async () => {
-        await Tasks.Task.findMultipleByIdOrAlias([taskWithAlias.alias], user._id, { foo: 'bar' });
-
-        expect(Tasks.Task.find).to.be.calledOnce;
-        expect(Tasks.Task.find).to.be.calledWithMatch({
-          $or: [
-            { _id: { $in: [] } },
-            { alias: { $in: [taskWithAlias.alias] } },
-          ],
-          userId: user._id,
-          foo: 'bar',
-        });
-      });
-    });
-
     describe('sanitizeUserChallengeTask ', () => {
     });
 

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

@@ -1,90 +1,87 @@
 import moment from 'moment';
 import { model as User } from '../../../../website/server/models/user';
-import { model as NewsPost } from '../../../../website/server/models/newsPost';
 import { model as Group } from '../../../../website/server/models/group';
 import common from '../../../../website/common';
 
 describe('User Model', () => {
-  describe('.toJSON()', () => {
-    it('keeps user._tmp when calling .toJSON', () => {
-      const user = new User({
-        auth: {
-          local: {
-            username: 'username',
-            lowerCaseUsername: 'username',
-            email: 'email@email.email',
-            salt: 'salt',
-            hashed_password: 'hashed_password', // eslint-disable-line camelcase
-          },
+  it('keeps user._tmp when calling .toJSON', () => {
+    const user = new User({
+      auth: {
+        local: {
+          username: 'username',
+          lowerCaseUsername: 'username',
+          email: 'email@email.email',
+          salt: 'salt',
+          hashed_password: 'hashed_password', // eslint-disable-line camelcase
         },
-      });
-
-      user._tmp = { ok: true };
-      user._nonTmp = { ok: true };
-
-      expect(user._tmp).to.eql({ ok: true });
-      expect(user._nonTmp).to.eql({ ok: true });
-
-      const toObject = user.toObject();
-      const toJSON = user.toJSON();
-
-      expect(toObject).to.not.have.keys('_tmp');
-      expect(toObject).to.not.have.keys('_nonTmp');
-
-      expect(toJSON).to.have.any.key('_tmp');
-      expect(toJSON._tmp).to.eql({ ok: true });
-      expect(toJSON).to.not.have.keys('_nonTmp');
+      },
     });
 
-    it('can add computed stats to a JSONified user object', () => {
-      const user = new User();
-      const userToJSON = user.toJSON();
+    user._tmp = { ok: true };
+    user._nonTmp = { ok: true };
 
-      expect(userToJSON.stats.maxMP).to.not.exist;
-      expect(userToJSON.stats.maxHealth).to.not.exist;
-      expect(userToJSON.stats.toNextLevel).to.not.exist;
+    expect(user._tmp).to.eql({ ok: true });
+    expect(user._nonTmp).to.eql({ ok: true });
 
-      User.addComputedStatsToJSONObj(userToJSON.stats, userToJSON);
+    const toObject = user.toObject();
+    const toJSON = user.toJSON();
 
-      expect(userToJSON.stats.maxMP).to.exist;
-      expect(userToJSON.stats.maxHealth).to.equal(common.maxHealth);
-      expect(userToJSON.stats.toNextLevel).to.equal(common.tnl(user.stats.lvl));
-    });
+    expect(toObject).to.not.have.keys('_tmp');
+    expect(toObject).to.not.have.keys('_nonTmp');
 
-    it('can transform user object without mongoose helpers', async () => {
-      const user = new User();
-      await user.save();
-      const userToJSON = await User.findById(user._id).lean().exec();
+    expect(toJSON).to.have.any.key('_tmp');
+    expect(toJSON._tmp).to.eql({ ok: true });
+    expect(toJSON).to.not.have.keys('_nonTmp');
+  });
 
-      expect(userToJSON.stats.maxMP).to.not.exist;
-      expect(userToJSON.stats.maxHealth).to.not.exist;
-      expect(userToJSON.stats.toNextLevel).to.not.exist;
-      expect(userToJSON.id).to.not.exist;
+  it('can add computed stats to a JSONified user object', () => {
+    const user = new User();
+    const userToJSON = user.toJSON();
 
-      User.transformJSONUser(userToJSON);
+    expect(userToJSON.stats.maxMP).to.not.exist;
+    expect(userToJSON.stats.maxHealth).to.not.exist;
+    expect(userToJSON.stats.toNextLevel).to.not.exist;
 
-      expect(userToJSON.id).to.equal(userToJSON._id);
-      expect(userToJSON.stats.maxMP).to.not.exist;
-      expect(userToJSON.stats.maxHealth).to.not.exist;
-      expect(userToJSON.stats.toNextLevel).to.not.exist;
-    });
+    User.addComputedStatsToJSONObj(userToJSON.stats, userToJSON);
 
-    it('can transform user object without mongoose helpers (including computed stats)', async () => {
-      const user = new User();
-      await user.save();
-      const userToJSON = await User.findById(user._id).lean().exec();
+    expect(userToJSON.stats.maxMP).to.exist;
+    expect(userToJSON.stats.maxHealth).to.equal(common.maxHealth);
+    expect(userToJSON.stats.toNextLevel).to.equal(common.tnl(user.stats.lvl));
+  });
 
-      expect(userToJSON.stats.maxMP).to.not.exist;
-      expect(userToJSON.stats.maxHealth).to.not.exist;
-      expect(userToJSON.stats.toNextLevel).to.not.exist;
+  it('can transform user object without mongoose helpers', async () => {
+    const user = new User();
+    await user.save();
+    const userToJSON = await User.findById(user._id).lean().exec();
 
-      User.transformJSONUser(userToJSON, true);
+    expect(userToJSON.stats.maxMP).to.not.exist;
+    expect(userToJSON.stats.maxHealth).to.not.exist;
+    expect(userToJSON.stats.toNextLevel).to.not.exist;
+    expect(userToJSON.id).to.not.exist;
 
-      expect(userToJSON.id).to.equal(userToJSON._id);
-      expect(userToJSON.stats.maxMP).to.exist;
-      expect(userToJSON.stats.maxHealth).to.equal(common.maxHealth);
-      expect(userToJSON.stats.toNextLevel).to.equal(common.tnl(user.stats.lvl));
-    });
+    User.transformJSONUser(userToJSON);
+
+    expect(userToJSON.id).to.equal(userToJSON._id);
+    expect(userToJSON.stats.maxMP).to.not.exist;
+    expect(userToJSON.stats.maxHealth).to.not.exist;
+    expect(userToJSON.stats.toNextLevel).to.not.exist;
+  });
+
+  it('can transform user object without mongoose helpers (including computed stats)', async () => {
+    const user = new User();
+    await user.save();
+    const userToJSON = await User.findById(user._id).lean().exec();
+
+    expect(userToJSON.stats.maxMP).to.not.exist;
+    expect(userToJSON.stats.maxHealth).to.not.exist;
+    expect(userToJSON.stats.toNextLevel).to.not.exist;
+
+    User.transformJSONUser(userToJSON, true);
+
+    expect(userToJSON.id).to.equal(userToJSON._id);
+    expect(userToJSON.stats.maxMP).to.exist;
+    expect(userToJSON.stats.maxHealth).to.equal(common.maxHealth);
+    expect(userToJSON.stats.toNextLevel).to.equal(common.tnl(user.stats.lvl));
   });
 
   context('achievements', () => {
@@ -435,6 +432,7 @@ describe('User Model', () => {
       user = new User();
     });
 
+
     it('returns false if user does not have customer id', () => {
       expect(user.isSubscribed()).to.be.undefined;
     });
@@ -560,6 +558,7 @@ describe('User Model', () => {
     });
   });
 
+
   context('hasCancelled', () => {
     let user;
     beforeEach(() => {
@@ -592,50 +591,6 @@ describe('User Model', () => {
   });
 
   context('pre-save hook', () => {
-    it('enrolls users that signup through web in the Drop Cap AB test', async () => {
-      let user = new User();
-      user.registeredThrough = 'habitica-web';
-      user = await user.save();
-      expect(user._ABtests.dropCapNotif).to.exist;
-    });
-
-    it('does not enroll users that signup through modal in the Drop Cap AB test', async () => {
-      let user = new User();
-      user.registeredThrough = 'habitica-ios';
-      user = await user.save();
-      expect(user._ABtests.dropCapNotif).to.not.exist;
-    });
-
-    it('marks the last news post as read for new users', async () => {
-      const lastNewsPost = { _id: '1' };
-      sandbox.stub(NewsPost, 'lastNewsPost').returns(lastNewsPost);
-
-      let user = new User();
-      expect(user.isNew).to.equal(true);
-      user = await user.save();
-
-      expect(user.checkNewStuff()).to.equal(false);
-      expect(user.toJSON().flags.newStuff).to.equal(false);
-      expect(user.flags.lastNewStuffRead).to.equal(lastNewsPost._id);
-    });
-
-    it('does not mark the last news post as read for existing users', async () => {
-      const lastNewsPost = { _id: '1' };
-      const lastNewsPostStub = sandbox.stub(NewsPost, 'lastNewsPost');
-      lastNewsPostStub.returns(lastNewsPost);
-
-      let user = new User();
-      user = await user.save();
-
-      expect(user.isNew).to.equal(false);
-      user.profile.name = 'new name';
-
-      lastNewsPostStub.returns({ _id: '2' });
-      user = await user.save();
-
-      expect(user.flags.lastNewStuffRead).to.equal(lastNewsPost._id); // not _id: 2
-    });
-
     it('does not try to award achievements when achievements or items not selected in query', async () => {
       let user = new User();
       user = await user.save(); // necessary for user.isSelected to work correctly
@@ -808,7 +763,7 @@ describe('User Model', () => {
     });
   });
 
-  describe('daysUserHasMissed', () => {
+  context('days missed', () => {
     // http://forbrains.co.uk/international_tools/earth_timezones
     let user;
 
@@ -816,51 +771,24 @@ describe('User Model', () => {
       user = new User();
     });
 
-    it('correctly calculates days missed since lastCron', () => {
-      const now = moment();
-      user.lastCron = moment(now).subtract(5, 'days');
+    it('should not cron early when going back a timezone', () => {
+      const yesterday = moment('2017-12-05T00:00:00.000-06:00'); // 11 pm on 4 Texas
+      const timezoneOffset = moment().zone('-06:00').zone();
+      user.lastCron = yesterday;
+      user.preferences.timezoneOffset = timezoneOffset;
 
-      const { daysMissed } = user.daysUserHasMissed(now);
+      const today = moment('2017-12-06T00:00:00.000-06:00'); // 11 pm on 4 Texas
+      const req = {};
+      req.header = () => timezoneOffset + 60;
 
-      expect(daysMissed).to.eql(5);
-    });
+      const { daysMissed } = user.daysUserHasMissed(today, req);
 
-    it('uses timezone from preferences to calculate days missed', () => {
-      const now = moment('2017-07-08 01:00:00Z');
-      user.lastCron = moment('2017-07-04 13:00:00Z');
-      user.preferences.timezoneOffset = 120;
-
-      const { daysMissed } = user.daysUserHasMissed(now);
-
-      expect(daysMissed).to.eql(3);
-    });
-
-    it('uses timezone at last cron to calculate days missed', () => {
-      const now = moment('2017-09-08 13:00:00Z');
-      user.lastCron = moment('2017-09-06 01:00:00+02:00');
-      user.preferences.timezoneOffset = 0;
-      user.preferences.timezoneOffsetAtLastCron = -120;
-
-      const { daysMissed } = user.daysUserHasMissed(now);
-
-      expect(daysMissed).to.eql(2);
-    });
-
-    it('respects new timezone that drags time into same day', () => {
-      user.lastCron = moment('2017-12-05T00:00:00.000-06:00');
-      user.preferences.timezoneOffset = 360;
-      const today = moment('2017-12-06T00:00:00.000-06:00');
-      const requestWithMinus7Timezone = { header: () => 420 };
-
-      const { daysMissed } = user.daysUserHasMissed(today, requestWithMinus7Timezone);
-
-      expect(user.preferences.timezoneOffset).to.eql(420);
       expect(daysMissed).to.eql(0);
     });
 
     it('should not cron early when going back a timezone with a custom day start', () => {
       const yesterday = moment('2017-12-05T02:00:00.000-08:00');
-      const timezoneOffset = 480;
+      const timezoneOffset = moment().zone('-08:00').zone();
       user.lastCron = yesterday;
       user.preferences.timezoneOffset = timezoneOffset;
       user.preferences.dayStart = 2;
@@ -874,46 +802,4 @@ describe('User Model', () => {
       expect(daysMissed).to.eql(0);
     });
   });
-
-  it('isNewsPoster', async () => {
-    const user = new User();
-    await user.save();
-
-    expect(user.isNewsPoster()).to.equal(false);
-
-    user.contributor.newsPoster = true;
-    expect(user.isNewsPoster()).to.equal(true);
-  });
-
-  describe('checkNewStuff', () => {
-    let user;
-
-    beforeEach(() => {
-      user = new User();
-    });
-
-    afterEach(() => {
-      sandbox.restore();
-    });
-
-    it('no last news post', () => {
-      sandbox.stub(NewsPost, 'lastNewsPost').returns(null);
-      expect(user.checkNewStuff()).to.equal(false);
-      expect(user.toJSON().flags.newStuff).to.equal(false);
-    });
-
-    it('last news post read', () => {
-      sandbox.stub(NewsPost, 'lastNewsPost').returns({ _id: '123' });
-      user.flags.lastNewStuffRead = '123';
-      expect(user.checkNewStuff()).to.equal(false);
-      expect(user.toJSON().flags.newStuff).to.equal(false);
-    });
-
-    it('last news post not read', () => {
-      sandbox.stub(NewsPost, 'lastNewsPost').returns({ _id: '123' });
-      user.flags.lastNewStuffRead = '124';
-      expect(user.checkNewStuff()).to.equal(true);
-      expect(user.toJSON().flags.newStuff).to.equal(true);
-    });
-  });
 });

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

@@ -299,6 +299,7 @@ describe('Webhook Model', () => {
         });
       });
 
+
       context('type is globalActivity', () => {
         let config;
 

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

@@ -117,7 +117,7 @@ describe('GET /challenges/:challengeId/members', () => {
     expect(res[0].profile).to.have.all.keys(['name']);
   });
 
-  it('returns only first 30 members if req.query.includeAllMembers is not true and req.query.limit is undefined', async () => {
+  it('returns only first 30 members if req.query.includeAllMembers is not true', async () => {
     const group = await generateGroup(user, { type: 'party', name: generateUUID() });
     const challenge = await generateChallenge(user, group);
     await user.post(`/challenges/${challenge._id}/join`);
@@ -136,7 +136,7 @@ describe('GET /challenges/:challengeId/members', () => {
     });
   });
 
-  it('returns only first 30 members if req.query.includeAllMembers is not defined and req.query.limit is undefined', async () => {
+  it('returns only first 30 members if req.query.includeAllMembers is not defined', async () => {
     const group = await generateGroup(user, { type: 'party', name: generateUUID() });
     const challenge = await generateChallenge(user, group);
     await user.post(`/challenges/${challenge._id}/join`);
@@ -155,68 +155,6 @@ describe('GET /challenges/:challengeId/members', () => {
     });
   });
 
-  it('returns an error if req.query.limit is over 60', async () => {
-    const group = await generateGroup(user, { type: 'party', privacy: 'private' });
-    const challenge = await generateChallenge(user, group);
-    const anotherUser = await generateUser();
-
-    await expect(anotherUser.get(`/challenges/${challenge._id}/members?limit=61`)).to.eventually.be.rejected.and.eql({
-      code: 400,
-      error: 'BadRequest',
-      message: t('invalidReqParams'),
-    });
-  });
-
-  it('returns an error if req.query.limit is under 1', async () => {
-    const group = await generateGroup(user, { type: 'party', privacy: 'private' });
-    const challenge = await generateChallenge(user, group);
-    const anotherUser = await generateUser();
-
-    await expect(anotherUser.get(`/challenges/${challenge._id}/members?limit=-13`)).to.eventually.be.rejected.and.eql({
-      code: 400,
-      error: 'BadRequest',
-      message: t('invalidReqParams'),
-    });
-  });
-
-  it('returns an error if req.query.limit is not an integer', async () => {
-    const group = await generateGroup(user, { type: 'party', privacy: 'private' });
-    const challenge = await generateChallenge(user, group);
-    const anotherUser = await generateUser();
-
-    await expect(anotherUser.get(`/challenges/${challenge._id}/members?limit=true`)).to.eventually.be.rejected.and.eql({
-      code: 400,
-      error: 'BadRequest',
-      message: t('invalidReqParams'),
-    });
-  });
-
-  it('returns up to 60 members when req.query.limit is specified', async () => {
-    const group = await generateGroup(user, { type: 'party', name: generateUUID() });
-    const challenge = await generateChallenge(user, group);
-    await user.post(`/challenges/${challenge._id}/join`);
-
-    const usersToGenerate = [];
-    for (let i = 0; i < 62; i += 1) {
-      usersToGenerate.push(generateUser({ challenges: [challenge._id] }));
-    }
-    await Promise.all(usersToGenerate);
-
-    let res = await user.get(`/challenges/${challenge._id}/members?limit=57`);
-    expect(res.length).to.equal(57);
-    res.forEach(member => {
-      expect(member).to.have.all.keys(['_id', 'auth', 'flags', 'id', 'profile']);
-      expect(member.profile).to.have.all.keys(['name']);
-    });
-
-    res = await user.get(`/challenges/${challenge._id}/members?limit=60&lastId=${res[res.length - 1]._id}`);
-    expect(res.length).to.equal(6);
-    res.forEach(member => {
-      expect(member).to.have.all.keys(['_id', 'auth', 'flags', 'id', 'profile']);
-      expect(member.profile).to.have.all.keys(['name']);
-    });
-  }).timeout(30000);
-
   it('returns all members if req.query.includeAllMembers is true', async () => {
     const group = await generateGroup(user, { type: 'party', name: generateUUID() });
     const challenge = await generateChallenge(user, group);

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

@@ -6,8 +6,8 @@ import {
 
 describe('GET challenges/user', () => {
   context('no official challenges', () => {
-    let user; let member; let nonMember; let challenge; let challenge2;
-    let publicGuild; let userData; let groupData;
+    let user; let member; let nonMember; let challenge; let challenge2; let
+      publicGuild;
 
     before(async () => {
       const { group, groupLeader, members } = await createAndPopulateGroup({
@@ -19,20 +19,25 @@ describe('GET challenges/user', () => {
         members: 1,
       });
 
-      publicGuild = group;
-      groupData = {
-        _id: publicGuild._id,
-        categories: [],
-        id: publicGuild._id,
-        type: publicGuild.type,
-        privacy: publicGuild.privacy,
-        name: publicGuild.name,
-        summary: publicGuild.name,
-        leader: publicGuild.leader._id,
-      };
-
       user = groupLeader;
-      userData = {
+      publicGuild = group;
+      member = members[0]; // eslint-disable-line prefer-destructuring
+      nonMember = await generateUser();
+
+      challenge = await generateChallenge(user, group);
+      await user.post(`/challenges/${challenge._id}/join`);
+      challenge2 = await generateChallenge(user, group);
+      await user.post(`/challenges/${challenge2._id}/join`);
+    });
+
+    it('should return challenges user has joined', async () => {
+      await nonMember.post(`/challenges/${challenge._id}/join`);
+
+      const challenges = await nonMember.get('/challenges/user');
+
+      const foundChallenge = _.find(challenges, { _id: challenge._id });
+      expect(foundChallenge).to.exist;
+      expect(foundChallenge.leader).to.eql({
         _id: publicGuild.leader._id,
         id: publicGuild.leader._id,
         profile: { name: user.profile.name },
@@ -44,172 +49,195 @@ describe('GET challenges/user', () => {
         flags: {
           verifiedUsername: true,
         },
-      };
-
-      member = members[0]; // eslint-disable-line prefer-destructuring
-      nonMember = await generateUser();
-
-      challenge = await generateChallenge(user, group);
-      challenge2 = await generateChallenge(user, group);
-
-      await nonMember.post(`/challenges/${challenge._id}/join`);
-    });
-    context('all challenges', () => {
-      it('should return challenges user has joined', async () => {
-        const challenges = await nonMember.get('/challenges/user');
-
-        const foundChallenge = _.find(challenges, { _id: challenge._id });
-        expect(foundChallenge).to.exist;
-        expect(foundChallenge.leader).to.eql(userData);
-        expect(foundChallenge.group).to.eql(groupData);
       });
-
-      it('should not return challenges a non-member has not joined', async () => {
-        const challenges = await nonMember.get('/challenges/user');
-
-        const foundChallenge2 = _.find(challenges, { _id: challenge2._id });
-        expect(foundChallenge2).to.not.exist;
-      });
-
-      it('should return challenges user has created', async () => {
-        const challenges = await user.get('/challenges/user');
-
-        const foundChallenge1 = _.find(challenges, { _id: challenge._id });
-        expect(foundChallenge1).to.exist;
-        expect(foundChallenge1.leader).to.eql(userData);
-        expect(foundChallenge1.group).to.eql(groupData);
-        const foundChallenge2 = _.find(challenges, { _id: challenge2._id });
-        expect(foundChallenge2).to.exist;
-        expect(foundChallenge2.leader).to.eql(userData);
-        expect(foundChallenge2.group).to.eql(groupData);
-      });
-
-      it('should return challenges in user\'s group', async () => {
-        const challenges = await member.get('/challenges/user');
-
-        const foundChallenge1 = _.find(challenges, { _id: challenge._id });
-        expect(foundChallenge1).to.exist;
-        expect(foundChallenge1.leader).to.eql(userData);
-        expect(foundChallenge1.group).to.eql(groupData);
-        const foundChallenge2 = _.find(challenges, { _id: challenge2._id });
-        expect(foundChallenge2).to.exist;
-        expect(foundChallenge2.leader).to.eql(userData);
-        expect(foundChallenge2.group).to.eql(groupData);
-      });
-
-      it('should return newest challenges first', async () => {
-        let challenges = await user.get('/challenges/user');
-
-        let foundChallengeIndex = _.findIndex(challenges, { _id: challenge2._id });
-        expect(foundChallengeIndex).to.eql(0);
-
-        const newChallenge = await generateChallenge(user, publicGuild);
-        await user.post(`/challenges/${newChallenge._id}/join`);
-
-        challenges = await user.get('/challenges/user');
-
-        foundChallengeIndex = _.findIndex(challenges, { _id: newChallenge._id });
-        expect(foundChallengeIndex).to.eql(0);
-      });
-
-      it('should not return challenges user doesn\'t have access to', async () => {
-        const { group, groupLeader } = await createAndPopulateGroup({
-          groupDetails: {
-            name: 'TestPrivateGuild',
-            summary: 'summary for TestPrivateGuild',
-            type: 'guild',
-            privacy: 'private',
-          },
-        });
-
-        const privateChallenge = await generateChallenge(groupLeader, group);
-        await groupLeader.post(`/challenges/${privateChallenge._id}/join`);
-
-        const challenges = await nonMember.get('/challenges/user');
-
-        const foundChallenge = _.find(challenges, { _id: privateChallenge._id });
-        expect(foundChallenge).to.not.exist;
-      });
-
-      it('should not return challenges user doesn\'t have access to, even with query parameters', async () => {
-        const { group, groupLeader } = await createAndPopulateGroup({
-          groupDetails: {
-            name: 'TestPrivateGuild',
-            summary: 'summary for TestPrivateGuild',
-            type: 'guild',
-            privacy: 'private',
-          },
-        });
-
-        const privateChallenge = await generateChallenge(groupLeader, group, {
-          categories: [{
-            name: 'academics',
-            slug: 'academics',
-          }],
-        });
-        await groupLeader.post(`/challenges/${privateChallenge._id}/join`);
-
-        const challenges = await nonMember.get('/challenges/user?categories=academics&owned=not_owned');
-
-        const foundChallenge = _.find(challenges, { _id: privateChallenge._id });
-        expect(foundChallenge).to.not.exist;
+      expect(foundChallenge.group).to.eql({
+        _id: publicGuild._id,
+        categories: [],
+        id: publicGuild._id,
+        type: publicGuild.type,
+        privacy: publicGuild.privacy,
+        name: publicGuild.name,
+        summary: publicGuild.name,
+        leader: publicGuild.leader._id,
       });
     });
 
-    context('my challenges', () => {
-      it('should return challenges user has joined', async () => {
-        const challenges = await nonMember.get(`/challenges/user?member=${true}`);
+    it('should return challenges user has created', async () => {
+      const challenges = await user.get('/challenges/user');
 
-        const foundChallenge = _.find(challenges, { _id: challenge._id });
-        expect(foundChallenge).to.exist;
-        expect(foundChallenge.leader).to.eql(userData);
-        expect(foundChallenge.group).to.eql(groupData);
+      const foundChallenge1 = _.find(challenges, { _id: challenge._id });
+      expect(foundChallenge1).to.exist;
+      expect(foundChallenge1.leader).to.eql({
+        _id: publicGuild.leader._id,
+        id: publicGuild.leader._id,
+        profile: { name: user.profile.name },
+        auth: {
+          local: {
+            username: user.auth.local.username,
+          },
+        },
+        flags: {
+          verifiedUsername: true,
+        },
+      });
+      expect(foundChallenge1.group).to.eql({
+        _id: publicGuild._id,
+        categories: [],
+        id: publicGuild._id,
+        type: publicGuild.type,
+        privacy: publicGuild.privacy,
+        name: publicGuild.name,
+        summary: publicGuild.name,
+        leader: publicGuild.leader._id,
+      });
+      const foundChallenge2 = _.find(challenges, { _id: challenge2._id });
+      expect(foundChallenge2).to.exist;
+      expect(foundChallenge2.leader).to.eql({
+        _id: publicGuild.leader._id,
+        id: publicGuild.leader._id,
+        profile: { name: user.profile.name },
+        auth: {
+          local: {
+            username: user.auth.local.username,
+          },
+        },
+        flags: {
+          verifiedUsername: true,
+        },
+      });
+      expect(foundChallenge2.group).to.eql({
+        _id: publicGuild._id,
+        categories: [],
+        id: publicGuild._id,
+        type: publicGuild.type,
+        privacy: publicGuild.privacy,
+        name: publicGuild.name,
+        summary: publicGuild.name,
+        leader: publicGuild.leader._id,
+      });
+    });
+
+    it('should return challenges in user\'s group', async () => {
+      const challenges = await member.get('/challenges/user');
+
+      const foundChallenge1 = _.find(challenges, { _id: challenge._id });
+      expect(foundChallenge1).to.exist;
+      expect(foundChallenge1.leader).to.eql({
+        _id: publicGuild.leader._id,
+        id: publicGuild.leader._id,
+        profile: { name: user.profile.name },
+        auth: {
+          local: {
+            username: user.auth.local.username,
+          },
+        },
+        flags: {
+          verifiedUsername: true,
+        },
+      });
+      expect(foundChallenge1.group).to.eql({
+        _id: publicGuild._id,
+        categories: [],
+        id: publicGuild._id,
+        type: publicGuild.type,
+        privacy: publicGuild.privacy,
+        name: publicGuild.name,
+        summary: publicGuild.name,
+        leader: publicGuild.leader._id,
+      });
+      const foundChallenge2 = _.find(challenges, { _id: challenge2._id });
+      expect(foundChallenge2).to.exist;
+      expect(foundChallenge2.leader).to.eql({
+        _id: publicGuild.leader._id,
+        id: publicGuild.leader._id,
+        profile: { name: user.profile.name },
+        auth: {
+          local: {
+            username: user.auth.local.username,
+          },
+        },
+        flags: {
+          verifiedUsername: true,
+        },
+      });
+      expect(foundChallenge2.group).to.eql({
+        _id: publicGuild._id,
+        categories: [],
+        id: publicGuild._id,
+        type: publicGuild.type,
+        privacy: publicGuild.privacy,
+        name: publicGuild.name,
+        summary: publicGuild.name,
+        leader: publicGuild.leader._id,
+      });
+    });
+
+    it('should not return challenges in user groups if we send member true param', async () => {
+      const challenges = await member.get(`/challenges/user?member=${true}`);
+
+      const foundChallenge1 = _.find(challenges, { _id: challenge._id });
+      expect(foundChallenge1).to.not.exist;
+
+      const foundChallenge2 = _.find(challenges, { _id: challenge2._id });
+      expect(foundChallenge2).to.not.exist;
+    });
+
+    it('should return newest challenges first', async () => {
+      let challenges = await user.get('/challenges/user');
+
+      let foundChallengeIndex = _.findIndex(challenges, { _id: challenge2._id });
+      expect(foundChallengeIndex).to.eql(0);
+
+      const newChallenge = await generateChallenge(user, publicGuild);
+      await user.post(`/challenges/${newChallenge._id}/join`);
+
+      challenges = await user.get('/challenges/user');
+
+      foundChallengeIndex = _.findIndex(challenges, { _id: newChallenge._id });
+      expect(foundChallengeIndex).to.eql(0);
+    });
+
+    it('should not return challenges user doesn\'t have access to', async () => {
+      const { group, groupLeader } = await createAndPopulateGroup({
+        groupDetails: {
+          name: 'TestPrivateGuild',
+          summary: 'summary for TestPrivateGuild',
+          type: 'guild',
+          privacy: 'private',
+        },
       });
 
-      it('should return challenges user has created', async () => {
-        const challenges = await user.get(`/challenges/user?member=${true}`);
+      const privateChallenge = await generateChallenge(groupLeader, group);
+      await groupLeader.post(`/challenges/${privateChallenge._id}/join`);
 
-        const foundChallenge1 = _.find(challenges, { _id: challenge._id });
-        expect(foundChallenge1).to.exist;
-        expect(foundChallenge1.leader).to.eql(userData);
-        expect(foundChallenge1.group).to.eql(groupData);
-        const foundChallenge2 = _.find(challenges, { _id: challenge2._id });
-        expect(foundChallenge2).to.exist;
-        expect(foundChallenge2.leader).to.eql(userData);
-        expect(foundChallenge2.group).to.eql(groupData);
+      const challenges = await nonMember.get('/challenges/user');
+
+      const foundChallenge = _.find(challenges, { _id: privateChallenge._id });
+      expect(foundChallenge).to.not.exist;
+    });
+
+    it('should not return challenges user doesn\'t have access to, even with query parameters', async () => {
+      const { group, groupLeader } = await createAndPopulateGroup({
+        groupDetails: {
+          name: 'TestPrivateGuild',
+          summary: 'summary for TestPrivateGuild',
+          type: 'guild',
+          privacy: 'private',
+        },
       });
 
-      it('should return challenges user has created if filter by owned', async () => {
-        const challenges = await user.get(`/challenges/user?member=${true}&owned=owned`);
-
-        const foundChallenge1 = _.find(challenges, { _id: challenge._id });
-        expect(foundChallenge1).to.exist;
-        expect(foundChallenge1.leader).to.eql(userData);
-        expect(foundChallenge1.group).to.eql(groupData);
-        const foundChallenge2 = _.find(challenges, { _id: challenge2._id });
-        expect(foundChallenge2).to.exist;
-        expect(foundChallenge2.leader).to.eql(userData);
-        expect(foundChallenge2.group).to.eql(groupData);
+      const privateChallenge = await generateChallenge(groupLeader, group, {
+        categories: [{
+          name: 'academics',
+          slug: 'academics',
+        }],
       });
+      await groupLeader.post(`/challenges/${privateChallenge._id}/join`);
 
-      it('should not return challenges user has created if filter by not owned', async () => {
-        const challenges = await user.get(`/challenges/user?owned=not_owned&member=${true}`);
+      const challenges = await nonMember.get('/challenges/user?categories=academics&owned=not_owned');
 
-        const foundChallenge1 = _.find(challenges, { _id: challenge._id });
-        expect(foundChallenge1).to.not.exist;
-        const foundChallenge2 = _.find(challenges, { _id: challenge2._id });
-        expect(foundChallenge2).to.not.exist;
-      });
-
-      it('should not return challenges in user groups', async () => {
-        const challenges = await member.get(`/challenges/user?member=${true}`);
-
-        const foundChallenge1 = _.find(challenges, { _id: challenge._id });
-        expect(foundChallenge1).to.not.exist;
-
-        const foundChallenge2 = _.find(challenges, { _id: challenge2._id });
-        expect(foundChallenge2).to.not.exist;
-      });
+      const foundChallenge = _.find(challenges, { _id: privateChallenge._id });
+      expect(foundChallenge).to.not.exist;
     });
   });
 

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

@@ -159,7 +159,7 @@ describe('POST /challenges/:challengeId/winner/:winnerId', () => {
 
       expect(testTask.challenge.broken).to.eql('CHALLENGE_CLOSED');
       expect(testTask.challenge.winner).to.eql(winningUser.profile.name);
-      expect(challengeTag.challenge).to.eql(false);
+      expect(challengeTag.challenge).to.eql('false');
     });
   });
 });

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

@@ -14,6 +14,7 @@ import {
   TAVERN_ID,
 } from '../../../../../website/server/models/group';
 import { CHAT_FLAG_FROM_SHADOW_MUTE, MAX_MESSAGE_LENGTH } from '../../../../../website/common/script/constants';
+import guildsAllowingBannedWords from '../../../../../website/server/libs/guildsAllowingBannedWords';
 import * as email from '../../../../../website/server/libs/email';
 
 const BASE_URL = nconf.get('BASE_URL');
@@ -328,8 +329,7 @@ describe('POST /chat', () => {
         members: 1,
       });
 
-      // Update the bannedWordsAllowed property for the group
-      group.update({ bannedWordsAllowed: true });
+      guildsAllowingBannedWords[group._id] = true;
 
       const message = await members[0].post(`/groups/${group._id}/chat`, { message: testBannedWordMessage });
 
@@ -503,8 +503,8 @@ describe('POST /chat', () => {
     const memberUsername = 'memberUsername';
     await member.update({ 'auth.local.username': memberUsername });
 
-    const messageWithMentions = `hi @${memberUsername} 123456789
-     123456789 123456789 123456789 123456789 123456789 123456789 89 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 12345678 END.`;
+    const messageWithMentions = `hi @${memberUsername} 123456789 
+    123456789 123456789 123456789 123456789 123456789 123456789 89 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 12345678 END.`;
     expect(messageWithMentions.length).to.equal(MAX_MESSAGE_LENGTH);
     const newMessage = await user.post(`/groups/${groupWithChat._id}/chat`, { message: messageWithMentions });
     const groupMessages = await user.get(`/groups/${groupWithChat._id}/chat`);

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

@@ -12,7 +12,7 @@ import apiError from '../../../../../website/server/libs/apiError';
 describe('GET /groups', () => {
   let user;
   let userInGuild;
-  const NUMBER_OF_PUBLIC_GUILDS = 2;
+  const NUMBER_OF_PUBLIC_GUILDS = 3; // 2 + the tavern
   const NUMBER_OF_PUBLIC_GUILDS_USER_IS_LEADER = 2;
   const NUMBER_OF_PUBLIC_GUILDS_USER_IS_MEMBER = 1;
   const NUMBER_OF_USERS_PRIVATE_GUILDS = 1;
@@ -236,22 +236,11 @@ describe('GET /groups', () => {
       await expect(user.get('/groups?type=publicGuilds&paginate=true&page=1'))
         .to.eventually.have.a.lengthOf(GUILD_PER_PAGE);
       const page2 = await expect(user.get('/groups?type=publicGuilds&paginate=true&page=2'))
-        // 1 created now, 4 by other tests, -1 for no more tavern.
-        .to.eventually.have.a.lengthOf(1 + 4 - 1);
-      expect(page2[3].name).to.equal('guild with less members');
+        .to.eventually.have.a.lengthOf(1 + 4); // 1 created now, 4 by other tests
+      expect(page2[4].name).to.equal('guild with less members');
     }).timeout(10000);
   });
 
-  it('makes sure that the tavern doesn\'t show up when guilds is passed as a query', async () => {
-    const guilds = await user.get('/groups?type=guilds');
-    expect(guilds.find(g => g.id === TAVERN_ID)).to.be.undefined;
-  });
-
-  it('makes sure that the tavern doesn\'t show up when publicGuilds is passed as a query', async () => {
-    const guilds = await user.get('/groups?type=publicGuilds');
-    expect(guilds.find(g => g.id === TAVERN_ID)).to.be.undefined;
-  });
-
   it('returns all the user\'s guilds when guilds passed in as query', async () => {
     await expect(user.get('/groups?type=guilds'))
       .to.eventually.have.a
@@ -265,7 +254,7 @@ describe('GET /groups', () => {
 
   it('returns a list of groups user has access to', async () => {
     await expect(user.get('/groups?type=privateGuilds,publicGuilds,party,tavern'))
-      .to.eventually.have.lengthOf(NUMBER_OF_GROUPS_USER_CAN_VIEW - 1); // -1 for no Tavern.
+      .to.eventually.have.lengthOf(NUMBER_OF_GROUPS_USER_CAN_VIEW);
   });
 
   it('returns a list of groups user has access to', async () => {

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

@@ -70,7 +70,7 @@ describe('GET /groups/:groupId/invites', () => {
     expect(res[0].profile).to.have.all.keys(['name']);
   });
 
-  it('returns only first 30 invites by default (req.query.limit not specified)', async () => {
+  it('returns only first 30 invites', async () => {
     const leader = await generateUser({ balance: 4 });
     const group = await generateGroup(leader, { type: 'guild', privacy: 'public', name: generateUUID() });
 
@@ -89,65 +89,6 @@ describe('GET /groups/:groupId/invites', () => {
     });
   }).timeout(10000);
 
-  it('returns an error if req.query.limit is over 60', async () => {
-    const leader = await generateUser({ balance: 4 });
-    const group = await generateGroup(leader, { type: 'guild', privacy: 'public', name: generateUUID() });
-
-    await expect(leader.get(`/groups/${group._id}/invites?limit=61`)).to.eventually.be.rejected.and.eql({
-      code: 400,
-      error: 'BadRequest',
-      message: t('invalidReqParams'),
-    });
-  });
-
-  it('returns an error if req.query.limit is under 1', async () => {
-    const leader = await generateUser({ balance: 4 });
-    const group = await generateGroup(leader, { type: 'guild', privacy: 'public', name: generateUUID() });
-
-    await expect(leader.get(`/groups/${group._id}/invites?limit=-1`)).to.eventually.be.rejected.and.eql({
-      code: 400,
-      error: 'BadRequest',
-      message: t('invalidReqParams'),
-    });
-  });
-
-  it('returns an error if req.query.limit is not an integer', async () => {
-    const leader = await generateUser({ balance: 4 });
-    const group = await generateGroup(leader, { type: 'guild', privacy: 'public', name: generateUUID() });
-
-    await expect(leader.get(`/groups/${group._id}/invites?limit=1.3`)).to.eventually.be.rejected.and.eql({
-      code: 400,
-      error: 'BadRequest',
-      message: t('invalidReqParams'),
-    });
-  });
-
-  it('returns up to 60 invites when req.query.limit is specified', async () => {
-    const leader = await generateUser({ balance: 4 });
-    const group = await generateGroup(leader, { type: 'guild', privacy: 'public', name: generateUUID() });
-
-    const invitesToGenerate = [];
-    for (let i = 0; i < 31; i += 1) {
-      invitesToGenerate.push(generateUser());
-    }
-    const generatedInvites = await Promise.all(invitesToGenerate);
-    await leader.post(`/groups/${group._id}/invite`, { uuids: generatedInvites.map(invite => invite._id) });
-
-    let res = await leader.get(`/groups/${group._id}/invites?limit=14`);
-    expect(res.length).to.equal(14);
-    res.forEach(member => {
-      expect(member).to.have.all.keys(['_id', 'auth', 'flags', 'id', 'profile']);
-      expect(member.profile).to.have.all.keys(['name']);
-    });
-
-    res = await leader.get(`/groups/${group._id}/invites?limit=31`);
-    expect(res.length).to.equal(31);
-    res.forEach(member => {
-      expect(member).to.have.all.keys(['_id', 'auth', 'flags', 'id', 'profile']);
-      expect(member.profile).to.have.all.keys(['name']);
-    });
-  }).timeout(30000);
-
   it('supports using req.query.lastId to get more invites', async function test () {
     this.timeout(30000); // @TODO: times out after 8 seconds
     const leader = await generateUser({ balance: 4 });

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

@@ -116,7 +116,7 @@ describe('GET /groups/:groupId/members', () => {
     expect(memberRes.inbox.messages).to.not.exist;
   });
 
-  it('returns only first 30 members by default (req.query.limit not specified)', async () => {
+  it('returns only first 30 members', async () => {
     const group = await generateGroup(user, { type: 'party', name: generateUUID() });
 
     const usersToGenerate = [];
@@ -133,60 +133,6 @@ describe('GET /groups/:groupId/members', () => {
     });
   });
 
-  it('returns an error if req.query.limit is over 60', async () => {
-    await generateGroup(user, { type: 'party', name: generateUUID() });
-
-    await expect(user.get('/groups/party/members?limit=61')).to.eventually.be.rejected.and.eql({
-      code: 400,
-      error: 'BadRequest',
-      message: t('invalidReqParams'),
-    });
-  });
-
-  it('returns an error if req.query.limit is under 1', async () => {
-    await generateGroup(user, { type: 'party', name: generateUUID() });
-
-    await expect(user.get('/groups/party/members?limit=0')).to.eventually.be.rejected.and.eql({
-      code: 400,
-      error: 'BadRequest',
-      message: t('invalidReqParams'),
-    });
-  });
-
-  it('returns an error if req.query.limit is not an integer', async () => {
-    await generateGroup(user, { type: 'party', name: generateUUID() });
-
-    await expect(user.get('/groups/party/members?limit=1.1')).to.eventually.be.rejected.and.eql({
-      code: 400,
-      error: 'BadRequest',
-      message: t('invalidReqParams'),
-    });
-  });
-
-  it('returns up to 60 members when req.query.limit is specified', async () => {
-    const group = await generateGroup(user, { type: 'party', name: generateUUID() });
-
-    const usersToGenerate = [];
-    for (let i = 0; i < 62; i += 1) {
-      usersToGenerate.push(generateUser({ party: { _id: group._id } }));
-    }
-    await Promise.all(usersToGenerate);
-
-    let res = await user.get('/groups/party/members?limit=60');
-    expect(res.length).to.equal(60);
-    res.forEach(member => {
-      expect(member).to.have.all.keys(['_id', 'auth', 'flags', 'id', 'profile']);
-      expect(member.profile).to.have.all.keys(['name']);
-    });
-
-    res = await user.get(`/groups/party/members?limit=60&lastId=${res[res.length - 1]._id}`);
-    expect(res.length).to.equal(3);
-    res.forEach(member => {
-      expect(member).to.have.all.keys(['_id', 'auth', 'flags', 'id', 'profile']);
-      expect(member.profile).to.have.all.keys(['name']);
-    });
-  }).timeout(30000);
-
   it('returns only first 30 members even when ?includeAllMembers=true', async () => {
     const group = await generateGroup(user, { type: 'party', name: generateUUID() });
 

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

@@ -75,7 +75,12 @@ describe('POST /group/:groupId/remove-manager', () => {
     await nonLeader.post(`/tasks/${task._id}/assign/${nonManager._id}`);
     const memberTasks = await nonManager.get('/tasks/user');
     const syncedTask = find(memberTasks, findAssignedTask);
-    await nonManager.post(`/tasks/${syncedTask._id}/score/up`);
+    await expect(nonManager.post(`/tasks/${syncedTask._id}/score/up`))
+      .to.eventually.be.rejected.and.to.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('taskApprovalHasBeenRequested'),
+      });
 
     const updatedGroup = await leader.post(`/groups/${groupToUpdate._id}/remove-manager`, {
       managerId: nonLeader._id,

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

@@ -203,16 +203,6 @@ describe('POST /group/:groupId/join', () => {
         await expect(invitedUser.get('/user')).to.eventually.have.nested.property('party._id', party._id);
       });
 
-      it('Issue #12291: accepting a redundant party invite will let the user stay in the party', async () => {
-        await invitedUser.update({
-          'party._id': party._id,
-        });
-        await expect(invitedUser.get('/user')).to.eventually.have.nested.property('party._id', party._id);
-        await invitedUser.post(`/groups/${party._id}/join`);
-
-        await expect(invitedUser.get('/user')).to.eventually.have.nested.property('party._id', party._id);
-      });
-
       it('notifies inviting user that their invitation was accepted', async () => {
         await invitedUser.post(`/groups/${party._id}/join`);
 

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

@@ -274,7 +274,6 @@ describe('POST /groups/:groupId/leave', () => {
 
   each(typesOfGroups, (groupDetails, groupType) => {
     context(`Leaving a group plan when the group is a ${groupType}`, () => {
-      if (groupDetails.privacy === 'public') return; // public guilds cannot be group plans
       let groupWithPlan;
       let leader;
       let member;
@@ -342,7 +341,6 @@ describe('POST /groups/:groupId/leave', () => {
 
   each(typesOfGroups, (groupDetails, groupType) => {
     context(`Leaving a group with extraMonths left plan when the group is a ${groupType}`, () => {
-      if (groupDetails.privacy === 'public') return; // public guilds cannot be group plans
       const extraMonths = 12;
       let groupWithPlan;
       let member;

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

@@ -251,29 +251,6 @@ describe('POST /groups/:groupId/removeMember/:memberId', () => {
       expect(party.quest.members[partyMember._id]).to.not.exist;
     });
 
-    it('prevents user from being removed if they are the quest owner', async () => {
-      const petQuest = 'whale';
-      await partyMember.update({
-        [`items.quests.${petQuest}`]: 1,
-      });
-
-      await partyMember.post(`/groups/${party._id}/quests/invite/${petQuest}`);
-      await partyLeader.post(`/groups/${party._id}/quests/accept`);
-
-      await party.sync();
-
-      expect(party.quest.members[partyLeader._id]).to.be.true;
-      expect(party.quest.members[partyMember._id]).to.be.true;
-
-      await party.sync();
-
-      expect(leader.post(`/groups/${party._id}/removeMember/${partyMember._id}`))
-        .to.eventually.be.rejected.and.eql({
-          code: 401,
-          text: t('cannotRemoveQuestOwner'),
-        });
-    });
-
     it('sends email to user with rescinded invite', async () => {
       await partyLeader.post(`/groups/${party._id}/removeMember/${partyInvitedUser._id}`);
 

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

@@ -79,56 +79,4 @@ describe('PUT /group', () => {
     expect(updatedGroup.leader.profile.name).to.eql(nonLeader.profile.name);
     expect(updatedGroup.name).to.equal(groupUpdatedName);
   });
-
-  it('allows for an admin to update the bannedWordsAllow property for an existing guild', async () => {
-    const { group, groupLeader } = await createAndPopulateGroup({
-      groupDetails: {
-        name: 'public guild',
-        type: 'guild',
-        privacy: 'public',
-      },
-    });
-
-    const updateGroupDetails = {
-      id: group._id,
-      name: 'public guild',
-      type: 'guild',
-      privacy: 'public',
-      bannedWordsAllowed: true,
-    };
-
-    // Make guild leader into admin
-    await groupLeader.post('/debug/make-admin');
-    await groupLeader.sync();
-
-    // Update the bannedWordsAllowed property for the group
-    const response = await groupLeader.put(`/groups/${group._id}`, updateGroupDetails);
-
-    expect(groupLeader.contributor.admin).to.eql(true);
-    expect(response.bannedWordsAllowed).to.eql(true);
-  });
-
-  it('does not allow for a non-admin to update the bannedWordsAllow property for an existing guild', async () => {
-    const { group, groupLeader } = await createAndPopulateGroup({
-      groupDetails: {
-        name: 'public guild',
-        type: 'guild',
-        privacy: 'public',
-      },
-    });
-
-    const updateGroupDetails = {
-      id: group._id,
-      name: 'public guild',
-      type: 'guild',
-      privacy: 'public',
-      bannedWordsAllowed: true,
-    };
-
-    // Update the bannedWordsAllowed property for the group
-    const response = await groupLeader.put(`/groups/${group._id}`, updateGroupDetails);
-
-    expect(groupLeader.contributor.admin).to.eql(undefined);
-    expect(response.bannedWordsAllowed).to.eql(undefined);
-  });
 });

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

@@ -4,6 +4,7 @@ import {
 
 describe('GET /news', () => {
   let api;
+
   beforeEach(async () => {
     api = requester();
   });

test/api/v3/integration/news/POST-news_tell_me_later.test.js

@@ -1,27 +1,24 @@
 import {
   generateUser,
 } from '../../../../helpers/api-integration/v3';
-import { model as NewsPost } from '../../../../../website/server/models/newsPost';
 
 describe('POST /news/tell-me-later', () => {
   let user;
 
   beforeEach(async () => {
-    NewsPost.updateLastNewsPost({
-      _id: '1234', publishDate: new Date(), title: 'Title', published: true,
+    user = await generateUser({
+      'flags.newStuff': true,
     });
-    user = await generateUser();
   });
 
   it('marks new stuff as read and adds notification', async () => {
+    expect(user.flags.newStuff).to.equal(true);
     const initialNotifications = user.notifications.length;
 
     await user.post('/news/tell-me-later');
     await user.sync();
 
-    expect(user.flags.lastNewStuffRead).to.equal('1234');
-    // fetching the user because newStuff is a computed property
-    expect((await user.get('/user')).flags.newStuff).to.equal(false);
+    expect(user.flags.newStuff).to.equal(false);
     expect(user.notifications.length).to.equal(initialNotifications + 1);
 
     const notification = user.notifications[user.notifications.length - 1];

test/api/v3/integration/payments/stripe/POST-payments_stripe_checkout.test.js

@@ -14,10 +14,7 @@ describe('payments - stripe - #checkout', () => {
   });
 
   it('verifies credentials', async () => {
-    await expect(user.post(
-      `${endpoint}?gemsBlock=4gems`,
-      { id: 123 },
-    )).to.eventually.be.rejected.and.include({
+    await expect(user.post(endpoint, { id: 123 })).to.eventually.be.rejected.and.include({
       code: 401,
       error: 'Error',
       // message: 'Invalid API Key provided: aaaabbbb********************1111',
@@ -35,7 +32,7 @@ describe('payments - stripe - #checkout', () => {
       stripePayments.checkout.restore();
     });
 
-    it('creates a user subscription', async () => {
+    it('cancels a user subscription', async () => {
       user = await generateUser({
         'profile.name': 'sender',
         'purchased.plan.customerId': 'customer-id',
@@ -51,7 +48,7 @@ describe('payments - stripe - #checkout', () => {
       expect(stripeCheckoutSubscriptionStub.args[0][0].groupId).to.eql(undefined);
     });
 
-    it('creates a group subscription', async () => {
+    it('cancels a group subscription', async () => {
       user = await generateUser({
         'profile.name': 'sender',
         'purchased.plan.customerId': 'customer-id',

test/api/v3/integration/quests/POST-groups_groupId_quests_invite.test.js

@@ -83,6 +83,22 @@ describe('POST /groups/:groupId/quests/invite/:questKey', () => {
       });
     });
 
+    it('does not issue invites if the user is of insufficient Level', async () => {
+      const LEVELED_QUEST = 'atom1';
+      const LEVELED_QUEST_REQ = questScrolls[LEVELED_QUEST].lvl;
+      const leaderUpdate = {};
+      leaderUpdate[`items.quests.${LEVELED_QUEST}`] = 1;
+      leaderUpdate['stats.lvl'] = LEVELED_QUEST_REQ - 1;
+
+      await leader.update(leaderUpdate);
+
+      await expect(leader.post(`/groups/${questingGroup._id}/quests/invite/${LEVELED_QUEST}`)).to.eventually.be.rejected.and.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('questLevelTooHigh', { level: LEVELED_QUEST_REQ }),
+      });
+    });
+
     it('does not issue invites if a quest is already underway', async () => {
       const QUEST_IN_PROGRESS = 'atom1';
       const leaderUpdate = {};
@@ -196,18 +212,6 @@ describe('POST /groups/:groupId/quests/invite/:questKey', () => {
       expect(returnedGroup.chat[0]._meta).to.be.undefined;
     });
 
-    it('successfully issues a quest invitation when quest level is higher than user level', async () => {
-      const LEVELED_QUEST = 'atom1';
-      const LEVELED_QUEST_REQ = questScrolls[LEVELED_QUEST].lvl;
-      const leaderUpdate = {};
-      leaderUpdate[`items.quests.${LEVELED_QUEST}`] = 1;
-      leaderUpdate['stats.lvl'] = LEVELED_QUEST_REQ - 1;
-
-      await leader.update(leaderUpdate);
-
-      await leader.post(`/groups/${questingGroup._id}/quests/invite/${LEVELED_QUEST}`);
-    });
-
     context('sending quest activity webhooks', () => {
       before(async () => {
         await server.start();

test/api/v3/integration/tasks/GET-tasks_id.test.js

@@ -2,8 +2,6 @@ import { v4 as generateUUID } from 'uuid';
 import {
   generateUser,
   translate as t,
-  createAndPopulateGroup,
-  generateChallenge,
 } from '../../../../helpers/api-integration/v3';
 
 describe('GET /tasks/:id', () => {
@@ -13,158 +11,55 @@ describe('GET /tasks/:id', () => {
     user = await generateUser();
   });
 
-  context('general', () => {
-    context('task cannot be accessed', () => {
-      it('cannot get a non-existent task', async () => {
-        const dummyId = generateUUID();
+  context('task can be accessed', async () => {
+    let task;
 
-        await expect(user.get(`/tasks/${dummyId}`)).to.eventually.be.rejected.and.eql({
-          code: 404,
-          error: 'NotFound',
-          message: t('taskNotFound'),
-        });
+    beforeEach(async () => {
+      task = await user.post('/tasks/user', {
+        text: 'test habit',
+        type: 'habit',
+        alias: 'alias',
       });
     });
+
+    it('gets specified task', async () => {
+      const getTask = await user.get(`/tasks/${task._id}`);
+
+      expect(getTask).to.eql(task);
+    });
+
+    it('can use alias to retrieve task', async () => {
+      const getTask = await user.get(`/tasks/${task.alias}`);
+
+      expect(getTask).to.eql(task);
+    });
+
+    // TODO after challenges are implemented
+    it('can get active challenge task that user does not own'); // Yes?
   });
 
-  context('user', () => {
-    context('task can be accessed', async () => {
-      let task;
+  context('task cannot be accessed', () => {
+    it('cannot get a non-existent task', async () => {
+      const dummyId = generateUUID();
 
-      beforeEach(async () => {
-        task = await user.post('/tasks/user', {
-          text: 'test habit',
-          type: 'habit',
-          alias: 'alias',
-        });
-      });
-
-      it('gets specified task', async () => {
-        const getTask = await user.get(`/tasks/${task._id}`);
-
-        expect(getTask).to.eql(task);
-      });
-
-      it('can use alias to retrieve task', async () => {
-        const getTask = await user.get(`/tasks/${task.alias}`);
-
-        expect(getTask).to.eql(task);
+      await expect(user.get(`/tasks/${dummyId}`)).to.eventually.be.rejected.and.eql({
+        code: 404,
+        error: 'NotFound',
+        message: t('taskNotFound'),
       });
     });
 
-    context('task cannot be accessed', () => {
-      it('cannot get a task owned by someone else', async () => {
-        const anotherUser = await generateUser();
-        const task = await user.post('/tasks/user', {
-          text: 'test habit',
-          type: 'habit',
-        });
-
-        await expect(anotherUser.get(`/tasks/${task._id}`)).to.eventually.be.rejected.and.eql({
-          code: 404,
-          error: 'NotFound',
-          message: t('taskNotFound'),
-        });
-      });
-    });
-  });
-
-  context('challenge', () => {
-    let challenge; let task; let leader; let member;
-
-    before(async () => {
-      const populatedGroup = await createAndPopulateGroup({
-        members: 1,
-      });
-
-      const guild = populatedGroup.group;
-      leader = populatedGroup.groupLeader;
-      member = populatedGroup.members[0]; // eslint-disable-line prefer-destructuring
-
-      challenge = await generateChallenge(leader, guild);
-      await leader.post(`/challenges/${challenge._id}/join`);
-
-      task = await leader.post(`/tasks/challenge/${challenge._id}`, {
+    it('cannot get a task owned by someone else', async () => {
+      const anotherUser = await generateUser();
+      const task = await user.post('/tasks/user', {
         text: 'test habit',
         type: 'habit',
       });
-    });
 
-    context('task can be accessed', async () => {
-      it('can get challenge task if member of that challenge', async () => {
-        await member.post(`/challenges/${challenge._id}/join`);
-
-        const getTask = await member.get(`/tasks/${task._id}`);
-        expect(getTask).to.eql(task);
-      });
-
-      it('can get challenge task if leader of that challenge', async () => {
-        const getTask = await leader.get(`/tasks/${task._id}`);
-        expect(getTask).to.eql(task);
-      });
-
-      it('can get challenge task if admin', async () => {
-        const admin = await generateUser({
-          'contributor.admin': true,
-        });
-
-        const getTask = await admin.get(`/tasks/${task._id}`);
-        expect(getTask).to.eql(task);
-      });
-    });
-
-    context('task cannot be accessed', () => {
-      it('cannot get a task in a challenge i am not part of', async () => {
-        await expect(user.get(`/tasks/${task._id}`)).to.eventually.be.rejected.and.eql({
-          code: 404,
-          error: 'NotFound',
-          message: t('taskNotFound'),
-        });
-      });
-    });
-  });
-
-  context('group', () => {
-    let group; let task; let members; let leader;
-
-    before(async () => {
-      const groupData = await createAndPopulateGroup({
-        groupDetails: {
-          name: 'Test Guild',
-          type: 'guild',
-        },
-        members: 1,
-      });
-
-      group = groupData.group;
-      members = groupData.members;
-      leader = groupData.groupLeader;
-
-      task = await leader.post(`/tasks/group/${group._id}`, {
-        text: 'test habit',
-        type: 'habit',
-      });
-    });
-
-    context('task can be accessed', async () => {
-      it('can get group task if leader of that group', async () => {
-        const getTask = await leader.get(`/tasks/${task._id}`);
-        expect(getTask).to.eql(task);
-      });
-
-      it('can get group task if member of that group', async () => {
-        const getTask = await members[0].get(`/tasks/${task._id}`);
-        expect(getTask).to.eql(task);
-      });
-    });
-
-    context('task cannot be accessed', () => {
-      it('cannot get a task in a group i am not part of', async () => {
-        await expect(user.get(`/tasks/${task._id}`)).to.eventually.be.rejected.and.eql({
-          code: 404,
-          error: 'NotFound',
-          message: t('taskNotFound'),
-        });
+      await expect(anotherUser.get(`/tasks/${task._id}`)).to.eventually.be.rejected.and.eql({
+        code: 404,
+        error: 'NotFound',
+        message: t('taskNotFound'),
       });
     });
   });

test/api/v3/integration/tasks/GET-tasks_user.test.js

@@ -153,12 +153,40 @@ describe('GET /tasks/user', () => {
   });
 
   xit('returns dailies with isDue for the date specified and will add CDS offset if time is not supplied and assumes timezones', async () => {
-    const timezoneOffset = 420;
+    const timezone = 420;
     await user.update({
       'preferences.dayStart': 0,
-      'preferences.timezoneOffset': timezoneOffset,
+      'preferences.timezoneOffset': timezone,
     });
-    const startDate = moment().utcOffset(-timezoneOffset).subtract('4', 'days').startOf('day')
+    const startDate = moment().zone(timezone).subtract('4', 'days').startOf('day')
+      .toISOString();
+    await user.post('/tasks/user', [
+      {
+        text: 'test daily',
+        type: 'daily',
+        startDate,
+        frequency: 'daily',
+        everyX: 2,
+      },
+    ]);
+
+    const today = moment().format('YYYY-MM-DD');
+    const dailys = await user.get(`/tasks/user?type=dailys&dueDate=${today}`);
+    expect(dailys[0].isDue).to.be.true;
+
+    const yesterday = moment().subtract('1', 'days').format('YYYY-MM-DD');
+    const dailys2 = await user.get(`/tasks/user?type=dailys&dueDate=${yesterday}`);
+    expect(dailys2[0].isDue).to.be.false;
+  });
+
+
+  xit('returns dailies with isDue for the date specified and will add CDS offset if time is not supplied and assumes timezones', async () => {
+    const timezone = 240;
+    await user.update({
+      'preferences.dayStart': 0,
+      'preferences.timezoneOffset': timezone,
+    });
+    const startDate = moment().zone(timezone).subtract('4', 'days').startOf('day')
       .toISOString();
     await user.post('/tasks/user', [
       {
@@ -180,39 +208,12 @@ describe('GET /tasks/user', () => {
   });
 
   xit('returns dailies with isDue for the date specified and will add CDS offset if time is not supplied and assumes timezones', async () => {
-    const timezoneOffset = 240;
+    const timezone = 540;
     await user.update({
       'preferences.dayStart': 0,
-      'preferences.timezoneOffset': timezoneOffset,
+      'preferences.timezoneOffset': timezone,
     });
-    const startDate = moment().utcOffset(-timezoneOffset).subtract('4', 'days').startOf('day')
-      .toISOString();
-    await user.post('/tasks/user', [
-      {
-        text: 'test daily',
-        type: 'daily',
-        startDate,
-        frequency: 'daily',
-        everyX: 2,
-      },
-    ]);
-
-    const today = moment().format('YYYY-MM-DD');
-    const dailys = await user.get(`/tasks/user?type=dailys&dueDate=${today}`);
-    expect(dailys[0].isDue).to.be.true;
-
-    const yesterday = moment().subtract('1', 'days').format('YYYY-MM-DD');
-    const dailys2 = await user.get(`/tasks/user?type=dailys&dueDate=${yesterday}`);
-    expect(dailys2[0].isDue).to.be.false;
-  });
-
-  xit('returns dailies with isDue for the date specified and will add CDS offset if time is not supplied and assumes timezones', async () => {
-    const timezoneOffset = 540;
-    await user.update({
-      'preferences.dayStart': 0,
-      'preferences.timezoneOffset': timezoneOffset,
-    });
-    const startDate = moment().utcOffset(-timezoneOffset).subtract('4', 'days').startOf('day')
+    const startDate = moment().zone(timezone).subtract('4', 'days').startOf('day')
       .toISOString();
     await user.post('/tasks/user', [
       {

test/api/v3/integration/tasks/POST-tasks_id_score_direction.test.js

@@ -1,5 +1,4 @@
 import { v4 as generateUUID } from 'uuid';
-import apiError from '../../../../../website/server/libs/apiError';
 import {
   generateUser,
   sleep,
@@ -45,7 +44,7 @@ describe('POST /tasks/:id/score/:direction', () => {
       await expect(user.post(`/tasks/${generateUUID()}/score/tt`)).to.eventually.be.rejected.and.eql({
         code: 400,
         error: 'BadRequest',
-        message: apiError('directionUpDown'),
+        message: t('invalidReqParams'),
       });
     });
 
@@ -262,7 +261,6 @@ describe('POST /tasks/:id/score/:direction', () => {
       const task = await user.get(`/tasks/${daily._id}`);
 
       expect(task.completed).to.equal(true);
-      expect(task.value).to.be.greaterThan(daily.value);
     });
 
     it('uncompletes daily when direction is down', async () => {

test/api/v3/integration/tasks/POST-tasks_move_taskId_to_position.test.js

@@ -91,9 +91,7 @@ describe('POST /tasks/:taskId/move/to/:position', () => {
 
     const taskToMove = tasks[1];
     expect(taskToMove.text).to.equal('habit 2');
-    await user.post(`/tasks/${tasks[1]._id}/move/to/-1`);
-    await user.sync();
-    const newOrder = user.tasksOrder.habits;
+    const newOrder = await user.post(`/tasks/${tasks[1]._id}/move/to/-1`);
     expect(newOrder[4]).to.equal(taskToMove._id);
     expect(newOrder.length).to.equal(5);
   });

test/api/v3/integration/tasks/POST-tasks_user.test.js

@@ -687,6 +687,7 @@ describe('POST /tasks/user', () => {
       });
     });
 
+
     it('can create checklists', async () => {
       const task = await user.post('/tasks/user', {
         text: 'test daily',

test/api/v3/integration/tasks/PUT-tasks_id.test.js

@@ -499,45 +499,6 @@ describe('PUT /tasks/:id', () => {
     });
   });
 
-  context('monthly dailys', () => {
-    let monthly;
-
-    beforeEach(async () => {
-      const date1 = moment.utc('2020-07-01').toDate();
-      monthly = await user.post('/tasks/user', {
-        text: 'test monthly',
-        type: 'daily',
-        frequency: 'monthly',
-        startDate: date1,
-        daysOfMonth: [date1.getDate()],
-      });
-    });
-
-    it('updates days of month when start date updated', async () => {
-      const date2 = moment.utc('2020-07-01').toDate();
-      const savedMonthly = await user.put(`/tasks/${monthly._id}`, {
-        startDate: date2,
-      });
-
-      expect(savedMonthly.daysOfMonth).to.deep.equal([moment(date2).date()]);
-    });
-
-    it('updates next due when start date updated', async () => {
-      const date2 = moment.utc('2022-07-01').toDate();
-      const savedMonthly = await user.put(`/tasks/${monthly._id}`, {
-        startDate: date2,
-      });
-
-      expect(savedMonthly.nextDue.length).to.eql(6);
-      expect(moment(savedMonthly.nextDue[0]).toDate()).to.eql(moment.utc('2022-08-01').toDate());
-      expect(moment(savedMonthly.nextDue[1]).toDate()).to.eql(moment.utc('2022-09-01').toDate());
-      expect(moment(savedMonthly.nextDue[2]).toDate()).to.eql(moment.utc('2022-10-01').toDate());
-      expect(moment(savedMonthly.nextDue[3]).toDate()).to.eql(moment.utc('2022-11-01').toDate());
-      expect(moment(savedMonthly.nextDue[4]).toDate()).to.eql(moment.utc('2022-12-01').toDate());
-      expect(moment(savedMonthly.nextDue[5]).toDate()).to.eql(moment.utc('2023-01-01').toDate());
-    });
-  });
-
   context('rewards', () => {
     let reward;
 

test/api/v3/integration/tasks/groups/DELETE-group_tasks_id.test.js

@@ -73,7 +73,12 @@ describe('Groups DELETE /tasks/:id', () => {
     });
     const memberTasks = await member.get('/tasks/user');
     const syncedTask = find(memberTasks, findAssignedTask);
-    await member.post(`/tasks/${syncedTask._id}/score/up`);
+    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+      .to.eventually.be.rejected.and.to.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('taskApprovalHasBeenRequested'),
+      });
 
     await user.sync();
     await member2.sync();
@@ -91,16 +96,16 @@ describe('Groups DELETE /tasks/:id', () => {
     expect(member2.notifications.length).to.equal(1);
   });
 
-  it('deletes task from assigned user', async () => {
+  it('unlinks assigned user', async () => {
     await user.del(`/tasks/${task._id}`);
 
     const memberTasks = await member.get('/tasks/user');
     const syncedTask = find(memberTasks, findAssignedTask);
 
-    expect(syncedTask).to.not.exist;
+    expect(syncedTask.group.broken).to.equal('TASK_DELETED');
   });
 
-  it('deletes task from all assigned users', async () => {
+  it('unlinks all assigned users', async () => {
     await user.del(`/tasks/${task._id}`);
 
     const memberTasks = await member.get('/tasks/user');
@@ -109,8 +114,8 @@ describe('Groups DELETE /tasks/:id', () => {
     const member2Tasks = await member2.get('/tasks/user');
     const member2SyncedTask = find(member2Tasks, findAssignedTask);
 
-    expect(syncedTask).to.not.exist;
-    expect(member2SyncedTask).to.not.exist;
+    expect(syncedTask.group.broken).to.equal('TASK_DELETED');
+    expect(member2SyncedTask.group.broken).to.equal('TASK_DELETED');
   });
 
   it('prevents a user from deleting a task they are assigned to', async () => {
@@ -125,6 +130,22 @@ describe('Groups DELETE /tasks/:id', () => {
       });
   });
 
+  it('allows a user to delete a broken task', async () => {
+    const memberTasks = await member.get('/tasks/user');
+    const syncedTask = find(memberTasks, findAssignedTask);
+
+    await user.del(`/tasks/${task._id}`);
+
+    await member.del(`/tasks/${syncedTask._id}`);
+
+    await expect(member.get(`/tasks/${syncedTask._id}`))
+      .to.eventually.be.rejected.and.eql({
+        code: 404,
+        error: 'NotFound',
+        message: 'Task not found.',
+      });
+  });
+
   it('allows a user to delete a task after leaving a group', async () => {
     const memberTasks = await member.get('/tasks/user');
     const syncedTask = find(memberTasks, findAssignedTask);

test/api/v3/integration/tasks/groups/POST-group_tasks_id_approve_userId.test.js

@@ -58,14 +58,22 @@ describe('POST /tasks/:id/approve/:userId', () => {
     let memberTasks = await member.get('/tasks/user');
     let syncedTask = find(memberTasks, findAssignedTask);
 
-    await member.post(`/tasks/${syncedTask._id}/score/up`);
+    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+      .to.eventually.be.rejected.and.to.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('taskApprovalHasBeenRequested'),
+      });
+
     await user.post(`/tasks/${task._id}/approve/${member._id}`);
 
     await member.sync();
 
-    expect(member.notifications.length).to.equal(2);
+    expect(member.notifications.length).to.equal(3);
     expect(member.notifications[1].type).to.equal('GROUP_TASK_APPROVED');
     expect(member.notifications[1].data.message).to.equal(t('yourTaskHasBeenApproved', { taskText: task.text }));
+    expect(member.notifications[2].type).to.equal('SCORED_TASK');
+    expect(member.notifications[2].data.message).to.equal(t('yourTaskHasBeenApproved', { taskText: task.text }));
 
     memberTasks = await member.get('/tasks/user');
     syncedTask = find(memberTasks, findAssignedTask);
@@ -85,13 +93,21 @@ describe('POST /tasks/:id/approve/:userId', () => {
     let memberTasks = await member.get('/tasks/user');
     let syncedTask = find(memberTasks, findAssignedTask);
 
-    await member.post(`/tasks/${syncedTask._id}/score/up`);
+    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+      .to.eventually.be.rejected.and.to.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('taskApprovalHasBeenRequested'),
+      });
+
     await member2.post(`/tasks/${task._id}/approve/${member._id}`);
     await member.sync();
 
-    expect(member.notifications.length).to.equal(2);
+    expect(member.notifications.length).to.equal(3);
     expect(member.notifications[1].type).to.equal('GROUP_TASK_APPROVED');
     expect(member.notifications[1].data.message).to.equal(t('yourTaskHasBeenApproved', { taskText: task.text }));
+    expect(member.notifications[2].type).to.equal('SCORED_TASK');
+    expect(member.notifications[2].data.message).to.equal(t('yourTaskHasBeenApproved', { taskText: task.text }));
 
     memberTasks = await member.get('/tasks/user');
     syncedTask = find(memberTasks, findAssignedTask);
@@ -109,7 +125,12 @@ describe('POST /tasks/:id/approve/:userId', () => {
     await member2.post(`/tasks/${task._id}/assign/${member._id}`);
     const memberTasks = await member.get('/tasks/user');
     const syncedTask = find(memberTasks, findAssignedTask);
-    await member.post(`/tasks/${syncedTask._id}/score/up`);
+    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+      .to.eventually.be.rejected.and.to.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('taskApprovalHasBeenRequested'),
+      });
 
     await user.sync();
     await member2.sync();
@@ -136,9 +157,14 @@ describe('POST /tasks/:id/approve/:userId', () => {
 
     const memberTasks = await member.get('/tasks/user');
     const syncedTask = find(memberTasks, findAssignedTask);
-    await member.post(`/tasks/${syncedTask._id}/score/up`);
-    await member2.post(`/tasks/${task._id}/approve/${member._id}`);
+    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+      .to.eventually.be.rejected.and.to.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('taskApprovalHasBeenRequested'),
+      });
 
+    await member2.post(`/tasks/${task._id}/approve/${member._id}`);
     await expect(user.post(`/tasks/${task._id}/approve/${member._id}`))
       .to.eventually.be.rejected.and.to.eql({
         code: 401,
@@ -171,7 +197,13 @@ describe('POST /tasks/:id/approve/:userId', () => {
 
     const memberTasks = await member.get('/tasks/user');
     const syncedTask = find(memberTasks, findAssignedTask);
-    await member.post(`/tasks/${syncedTask._id}/score/up`);
+    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+      .to.eventually.be.rejected.and.to.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('taskApprovalHasBeenRequested'),
+      });
+
     await user.post(`/tasks/${sharedCompletionTask._id}/approve/${member._id}`);
 
     const groupTasks = await user.get(`/tasks/group/${guild._id}?type=completedTodos`);
@@ -194,7 +226,13 @@ describe('POST /tasks/:id/approve/:userId', () => {
 
     const memberTasks = await member.get('/tasks/user');
     const syncedTask = find(memberTasks, findAssignedTask);
-    await member.post(`/tasks/${syncedTask._id}/score/up`);
+    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+      .to.eventually.be.rejected.and.to.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('taskApprovalHasBeenRequested'),
+      });
+
     await user.post(`/tasks/${sharedCompletionTask._id}/approve/${member._id}`);
 
     const member2Tasks = await member2.get('/tasks/user');
@@ -220,7 +258,13 @@ describe('POST /tasks/:id/approve/:userId', () => {
 
     const memberTasks = await member.get('/tasks/user');
     const syncedTask = find(memberTasks, findAssignedTask);
-    await member.post(`/tasks/${syncedTask._id}/score/up`);
+    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+      .to.eventually.be.rejected.and.to.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('taskApprovalHasBeenRequested'),
+      });
+
     await user.post(`/tasks/${sharedCompletionTask._id}/approve/${member._id}`);
 
     const groupTasks = await user.get(`/tasks/group/${guild._id}`);
@@ -243,10 +287,21 @@ describe('POST /tasks/:id/approve/:userId', () => {
 
     const memberTasks = await member.get('/tasks/user');
     const syncedTask = find(memberTasks, findAssignedTask);
-    await member.post(`/tasks/${syncedTask._id}/score/up`);
+    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+      .to.eventually.be.rejected.and.to.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('taskApprovalHasBeenRequested'),
+      });
+
     const member2Tasks = await member2.get('/tasks/user');
     const member2SyncedTask = find(member2Tasks, findAssignedTask);
-    await member2.post(`/tasks/${member2SyncedTask._id}/score/up`);
+    await expect(member2.post(`/tasks/${member2SyncedTask._id}/score/up`))
+      .to.eventually.be.rejected.and.to.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('taskApprovalHasBeenRequested'),
+      });
 
     await user.post(`/tasks/${sharedCompletionTask._id}/approve/${member._id}`);
     await user.post(`/tasks/${sharedCompletionTask._id}/approve/${member2._id}`);

test/api/v3/integration/tasks/groups/POST-group_tasks_id_needs-work_userId.test.js

@@ -61,7 +61,13 @@ describe('POST /tasks/:id/needs-work/:userId', () => {
     let syncedTask = find(memberTasks, findAssignedTask);
 
     // score task to require approval
-    await member.post(`/tasks/${syncedTask._id}/score/up`);
+    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+      .to.eventually.be.rejected.and.to.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('taskApprovalHasBeenRequested'),
+      });
+
     await user.post(`/tasks/${task._id}/needs-work/${member._id}`);
 
     [memberTasks] = await Promise.all([member.get('/tasks/user'), member.sync()]);
@@ -108,7 +114,12 @@ describe('POST /tasks/:id/needs-work/:userId', () => {
     let syncedTask = find(memberTasks, findAssignedTask);
 
     // score task to require approval
-    await member.post(`/tasks/${syncedTask._id}/score/up`);
+    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+      .to.eventually.be.rejected.and.to.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('taskApprovalHasBeenRequested'),
+      });
 
     const initialNotifications = member.notifications.length;
 
@@ -161,7 +172,13 @@ describe('POST /tasks/:id/needs-work/:userId', () => {
     const memberTasks = await member.get('/tasks/user');
     const syncedTask = find(memberTasks, findAssignedTask);
 
-    await member.post(`/tasks/${syncedTask._id}/score/up`);
+    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+      .to.eventually.be.rejected.and.to.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('taskApprovalHasBeenRequested'),
+      });
+
     await member2.post(`/tasks/${task._id}/approve/${member._id}`);
     await expect(user.post(`/tasks/${task._id}/needs-work/${member._id}`))
       .to.eventually.be.rejected.and.to.eql({

test/api/v3/integration/tasks/groups/POST-group_tasks_id_score_direction.test.js

@@ -44,11 +44,12 @@ describe('POST /tasks/:id/score/:direction', () => {
     const syncedTask = find(memberTasks, findAssignedTask);
     const direction = 'up';
 
-    const response = await member.post(`/tasks/${syncedTask._id}/score/${direction}`);
-
-    expect(response.data.requiresApproval).to.equal(true);
-    expect(response.message).to.equal(t('taskApprovalHasBeenRequested'));
-
+    await expect(member.post(`/tasks/${syncedTask._id}/score/${direction}`))
+      .to.eventually.be.rejected.and.to.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('taskApprovalHasBeenRequested'),
+      });
     const updatedTask = await member.get(`/tasks/${syncedTask._id}`);
 
     await user.sync();
@@ -75,7 +76,12 @@ describe('POST /tasks/:id/score/:direction', () => {
     const syncedTask = find(memberTasks, findAssignedTask);
     const direction = 'up';
 
-    await member.post(`/tasks/${syncedTask._id}/score/${direction}`);
+    await expect(member.post(`/tasks/${syncedTask._id}/score/${direction}`))
+      .to.eventually.be.rejected.and.to.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('taskApprovalHasBeenRequested'),
+      });
     const updatedTask = await member.get(`/tasks/${syncedTask._id}`);
     await user.sync();
     await member2.sync();
@@ -105,18 +111,31 @@ describe('POST /tasks/:id/score/:direction', () => {
     const memberTasks = await member.get('/tasks/user');
     const syncedTask = find(memberTasks, findAssignedTask);
 
-    await member.post(`/tasks/${syncedTask._id}/score/up`);
+    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+      .to.eventually.be.rejected.and.to.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('taskApprovalHasBeenRequested'),
+      });
 
-    const response = await member.post(`/tasks/${syncedTask._id}/score/up`);
-    expect(response.data.requiresApproval).to.equal(true);
-    expect(response.message).to.equal(t('taskRequiresApproval'));
+    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+      .to.eventually.be.rejected.and.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('taskRequiresApproval'),
+      });
   });
 
   it('allows a user to score an approved task', async () => {
     const memberTasks = await member.get('/tasks/user');
     const syncedTask = find(memberTasks, findAssignedTask);
 
-    await member.post(`/tasks/${syncedTask._id}/score/up`);
+    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+      .to.eventually.be.rejected.and.to.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('taskApprovalHasBeenRequested'),
+      });
 
     await user.post(`/tasks/${task._id}/approve/${member._id}`);
 

test/api/v3/integration/tasks/groups/PUT-group_task_id.test.js

@@ -4,12 +4,8 @@ import {
 } from '../../../../../helpers/api-integration/v3';
 
 describe('PUT /tasks/:id', () => {
-  let user;
-  let guild;
-  let member;
-  let member2;
-  let habit;
-  let todo;
+  let user; let guild; let member; let member2; let
+    task;
 
   function findAssignedTask (memberTask) {
     return memberTask.group.id === guild._id;
@@ -29,7 +25,7 @@ describe('PUT /tasks/:id', () => {
     member = members[0]; // eslint-disable-line prefer-destructuring
     member2 = members[1]; // eslint-disable-line prefer-destructuring
 
-    habit = await user.post(`/tasks/group/${guild._id}`, {
+    task = await user.post(`/tasks/group/${guild._id}`, {
       text: 'test habit',
       type: 'habit',
       up: false,
@@ -37,18 +33,12 @@ describe('PUT /tasks/:id', () => {
       notes: 1976,
     });
 
-    todo = await user.post(`/tasks/group/${guild._id}`, {
-      text: 'test todo',
-      type: 'todo',
-      notes: 1976,
-    });
-
-    await user.post(`/tasks/${habit._id}/assign/${member._id}`);
-    await user.post(`/tasks/${habit._id}/assign/${member2._id}`);
+    await user.post(`/tasks/${task._id}/assign/${member._id}`);
+    await user.post(`/tasks/${task._id}/assign/${member2._id}`);
   });
 
   it('updates a group task', async () => {
-    const savedHabit = await user.put(`/tasks/${habit._id}`, {
+    const savedHabit = await user.put(`/tasks/${task._id}`, {
       notes: 'some new notes',
     });
 
@@ -61,55 +51,27 @@ describe('PUT /tasks/:id', () => {
       managerId: member._id,
     });
 
-    // change the habit
-    habit = await member.put(`/tasks/${habit._id}`, {
+    // change the todo
+    task = await member.put(`/tasks/${task._id}`, {
       text: 'new text!',
       requiresApproval: true,
     });
 
     const memberTasks = await member2.get('/tasks/user');
-    const syncedTask = find(memberTasks, memberTask => memberTask.group.taskId === habit._id);
+    const syncedTask = find(memberTasks, memberTask => memberTask.group.taskId === task._id);
 
     // score up to trigger approval
-    const response = await member2.post(`/tasks/${syncedTask._id}/score/up`);
-
-    expect(response.data.requiresApproval).to.equal(true);
-    expect(response.message).to.equal(t('taskApprovalHasBeenRequested'));
-  });
-
-  it('member updates a group task value - not allowed', async () => {
-    // change the todo
-    await expect(member.put(`/tasks/${habit._id}`, {
-      text: 'new text!',
-    })).to.eventually.be.rejected.and.to.eql({
-      code: 401,
-      error: 'NotAuthorized',
-      message: t('onlyGroupLeaderCanEditTasks'),
-    });
-  });
-
-  it('member updates the collapseChecklist property - change is allowed', async () => {
-    // change the todo
-    await member.put(`/tasks/${todo._id}`, {
-      collapseChecklist: true,
-    });
-  });
-
-  it('member updates the collapseChecklist and another property - change not allowed', async () => {
-    // change the todo
-    await expect(member.put(`/tasks/${todo._id}`, {
-      collapseChecklist: true,
-      title: 'test',
-    })).to.eventually.be.rejected.and.to.eql({
-      code: 401,
-      error: 'NotAuthorized',
-      message: t('onlyGroupLeaderCanEditTasks'),
-    });
+    await expect(member2.post(`/tasks/${syncedTask._id}/score/up`))
+      .to.eventually.be.rejected.and.to.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('taskApprovalHasBeenRequested'),
+      });
   });
 
   it('updates a group task with checklist', async () => {
     // add a new todo
-    habit = await user.post(`/tasks/group/${guild._id}`, {
+    task = await user.post(`/tasks/group/${guild._id}`, {
       text: 'todo',
       type: 'todo',
       checklist: [
@@ -119,13 +81,13 @@ describe('PUT /tasks/:id', () => {
       ],
     });
 
-    await user.post(`/tasks/${habit._id}/assign/${member._id}`);
+    await user.post(`/tasks/${task._id}/assign/${member._id}`);
 
     // change the checklist text
-    habit = await user.put(`/tasks/${habit._id}`, {
+    task = await user.put(`/tasks/${task._id}`, {
       checklist: [
         {
-          id: habit.checklist[0].id,
+          id: task.checklist[0].id,
           text: 'checklist 1 - edit',
         },
         {
@@ -134,17 +96,18 @@ describe('PUT /tasks/:id', () => {
       ],
     });
 
-    expect(habit.checklist.length).to.eql(2);
+    expect(task.checklist.length).to.eql(2);
   });
 
   it('updates the linked tasks', async () => {
-    await user.put(`/tasks/${habit._id}`, {
+    await user.put(`/tasks/${task._id}`, {
       text: 'some new text',
       up: false,
       down: false,
       notes: 'some new notes',
     });
 
+
     const memberTasks = await member.get('/tasks/user');
     const syncedTask = find(memberTasks, findAssignedTask);
 
@@ -154,7 +117,7 @@ describe('PUT /tasks/:id', () => {
   });
 
   it('updates the linked tasks for all assigned users', async () => {
-    await user.put(`/tasks/${habit._id}`, {
+    await user.put(`/tasks/${task._id}`, {
       text: 'some new text',
       up: false,
       down: false,
@@ -181,13 +144,14 @@ describe('PUT /tasks/:id', () => {
       managerId: member2._id,
     });
 
-    await member2.put(`/tasks/${habit._id}`, {
+    await member2.put(`/tasks/${task._id}`, {
       text: 'some new text',
       up: false,
       down: false,
       notes: 'some new notes',
     });
 
+
     const memberTasks = await member.get('/tasks/user');
     const syncedTask = find(memberTasks, findAssignedTask);
 

test/api/v3/integration/user/POST-user_class_cast_spellId.test.js

@@ -1,3 +1,4 @@
+
 import { v4 as generateUUID } from 'uuid';
 import { find } from 'lodash';
 import {
@@ -161,23 +162,6 @@ describe('POST /user/class/cast/:spellId', () => {
       });
   });
 
-  it('Issue #12361: returns an error if stealth has already been cast', async () => {
-    await user.update({
-      'stats.class': 'rogue',
-      'stats.lvl': 15,
-      'stats.mp': 400,
-      'stats.buffs.stealth': 1,
-    });
-    await user.sync();
-    await expect(user.post('/user/class/cast/stealth'))
-      .to.eventually.be.rejected.and.eql({
-        code: 400,
-        error: 'BadRequest',
-        message: t('spellAlreadyCast'),
-      });
-    expect(user.stats.mp).to.equal(400);
-  });
-
   it('returns an error if targeted party member doesn\'t exist', async () => {
     const { groupLeader } = await createAndPopulateGroup({
       groupDetails: { type: 'party', privacy: 'private' },
@@ -341,6 +325,7 @@ describe('POST /user/class/cast/:spellId', () => {
     expect(result.user.stats.mp).to.equal(10);
   });
 
+
   // TODO find a way to have sinon working in integration tests
   // it doesn't work when tests are running separately from server
   it('passes correct target to spell when targetType === \'tasks\'');

test/api/v3/integration/user/POST-user_feed_pet_food.test.js

@@ -41,29 +41,6 @@ describe('POST /user/feed/:pet/:food', () => {
     expect(user.items.pets['Wolf-Base']).to.equal(7);
   });
 
-  it('bulk feeding pet with non-preferred food', async () => {
-    await user.update({
-      'items.pets.Wolf-Base': 5,
-      'items.food.Milk': 3,
-    });
-
-    const food = content.food.Milk;
-    const pet = content.petInfo['Wolf-Base'];
-
-    const res = await user.post('/user/feed/Wolf-Base/Milk?amount=2');
-    await user.sync();
-    expect(res).to.eql({
-      data: user.items.pets['Wolf-Base'],
-      message: t('messageDontEnjoyFood', {
-        egg: pet.text(),
-        foodText: food.textThe(),
-      }),
-    });
-
-    expect(user.items.food.Milk).to.eql(1);
-    expect(user.items.pets['Wolf-Base']).to.equal(9);
-  });
-
   context('sending user activity webhooks', () => {
     before(async () => {
       await server.start();
@@ -100,33 +77,5 @@ describe('POST /user/feed/:pet/:food', () => {
       expect(body.pet).to.eql('Wolf-Base');
       expect(body.message).to.eql(res.message);
     });
-
-    it('sends user activity webhook (mount raised after full bulk feeding)', async () => {
-      const uuid = generateUUID();
-
-      await user.post('/user/webhook', {
-        url: `http://localhost:${server.port}/webhooks/${uuid}`,
-        type: 'userActivity',
-        enabled: true,
-        options: {
-          mountRaised: true,
-        },
-      });
-
-      await user.update({
-        'items.pets.Wolf-Base': 47,
-        'items.food.Milk': 3,
-      });
-      const res = await user.post('/user/feed/Wolf-Base/Milk?amount=2');
-
-      await sleep();
-
-      const body = server.getWebhookData(uuid);
-
-      expect(user.achievements.allYourBase).to.not.equal(true);
-      expect(body.type).to.eql('mountRaised');
-      expect(body.pet).to.eql('Wolf-Base');
-      expect(body.message).to.eql(res.message);
-    });
   });
 });

test/api/v3/integration/user/PUT-user.test.js

@@ -3,7 +3,7 @@ import {
   generateUser,
   translate as t,
 } from '../../../../helpers/api-integration/v3';
-import { model as NewsPost } from '../../../../../website/server/models/newsPost';
+
 
 describe('PUT /user', () => {
   let user;
@@ -53,6 +53,7 @@ describe('PUT /user', () => {
       expect(user.tags.length).to.be.eql(userTags.length + 1);
     });
 
+
     it('validates profile.name', async () => {
       await expect(user.put('/user', {
         'profile.name': ' ', // string should be trimmed
@@ -93,32 +94,6 @@ describe('PUT /user', () => {
         error: 'BadRequest',
         message: t('displaynameIssueSlur'),
       });
-
-      await expect(user.put('/user', {
-        'profile.name': 'namecontainsnewline\n',
-      })).to.eventually.be.rejected.and.eql({
-        code: 400,
-        error: 'BadRequest',
-        message: t('displaynameIssueNewline'),
-      });
-    });
-
-    it('can set flags.newStuff to false', async () => {
-      NewsPost.updateLastNewsPost({
-        _id: '1234', publishDate: new Date(), title: 'Title', published: true,
-      });
-
-      await user.update({
-        'flags.lastNewStuffRead': '123',
-      });
-
-      await user.put('/user', {
-        'flags.newStuff': false,
-      });
-
-      await user.sync();
-
-      expect(user.flags.lastNewStuffRead).to.eql('1234');
     });
   });
 

test/api/v3/integration/user/auth/POST-login-local.test.js

@@ -10,6 +10,7 @@ import {
   sha1Encrypt as sha1EncryptPassword,
 } from '../../../../../../website/server/libs/password';
 
+
 describe('POST /user/auth/local/login', () => {
   let api;
   let user;

test/api/v3/integration/user/auth/PUT-user_update_email.test.js

@@ -9,6 +9,7 @@ import {
   sha1Encrypt as sha1EncryptPassword,
 } from '../../../../../../website/server/libs/password';
 
+
 const ENDPOINT = '/user/auth/update-email';
 
 describe('PUT /user/auth/update-email', () => {

test/api/v3/integration/webhook/PUT-user_update_webhook.test.js

@@ -127,26 +127,19 @@ describe('PUT /user/webhook/:id', () => {
   it('can update taskActivity options', async () => {
     const type = 'taskActivity';
     const options = {
-      checklistScored: true,
       updated: false,
-      scored: false,
+      deleted: true,
     };
-    const expected = {
-      checklistScored: true,
+
+    const webhook = await user.put(`/user/webhook/${webhookToUpdate.id}`, { type, options });
+
+    expect(webhook.options).to.eql({
+      checklistScored: false, // starting value
       created: true, // starting value
       updated: false,
-      deleted: false, // starting value
-      scored: false,
-    };
-
-    const returnedWebhook = await user.put(`/user/webhook/${webhookToUpdate.id}`, { type, options });
-
-    await user.sync();
-
-    const savedWebhook = user.webhooks.find(hook => webhookToUpdate.id === hook.id);
-
-    expect(returnedWebhook.options).to.eql(expected);
-    expect(savedWebhook.options).to.eql(expected);
+      deleted: true,
+      scored: true, // default value
+    });
   });
 
   it('errors if taskActivity option is not a boolean', async () => {