3.83.4

.babelrc

@@ -1,7 +1,6 @@
 {
   "presets": ["es2015"],
   "plugins": [
-    "transform-object-rest-spread",
     ["transform-async-to-module-method", {
       "module": "bluebird",
       "method": "coroutine"

.bowerrc

@@ -0,0 +1,3 @@
+{
+  "directory": "website/client-old/bower_components"
+}

.ebextensions/deploy.config

@@ -14,13 +14,17 @@ files:
     owner: root
     group: users
     content: |
-      $(ls -td /opt/elasticbeanstalk/node-install/node-* | head -1)/bin/npm install -g npm@5
+      $(ls -td /opt/elasticbeanstalk/node-install/node-* | head -1)/bin/npm install -g npm@4
 container_commands:
   01_makeBabel:
     command: "touch /tmp/.babel.json"
   02_ownBabel:
     command: "chmod a+rw /tmp/.babel.json"
-  03_installGulp:
+  03_installBower:
+    command: "$NODE_HOME/bin/npm install -g bower"
+  04_installGulp:
     command: "$NODE_HOME/bin/npm install -g gulp"
-  04_runGulp:
+  05_runBower:
+    command: "$NODE_HOME/lib/node_modules/bower/bin/bower --config.interactive=false --allow-root install -f"
+  06_runGulp:
     command: "$NODE_HOME/lib/node_modules/gulp/bin/gulp.js build"

.github/CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Reporting Bugs
 
-[Please see these instructions for reporting bugs](https://github.com/HabitRPG/habitica/issues/2760)
+[Please see these instructions for reporting bugs](https://github.com/HabitRPG/habitrpg/issues/2760)
 
 # Pull Request
 

.github/ISSUE_TEMPLATE.md

@@ -1,19 +1,21 @@
-[//]: # (Before logging this issue, please post to the Report a Bug guild from the Habitica website's Help menu. Most bugs can be handled quickly there. If a GitHub issue is needed, you will be advised of that by a moderator or staff member -- a player with a dark blue or purple name. It is recommended that you don't create a new issue unless advised to.)
+[//]: # (Before logging this issue, look through common problems at https://github.com/HabitRPG/habitrpg/issues If you find your issue there, read at least the first post to see if there is a workaround for you)
 
-[//]: # (Bugs in the mobile apps can also be reported there.)
+[//]: # (Github is primarily used for reporting bugs. If you have a feature request, use "Help > Request a Feature" so that the feature request can be vetted by the larger Habitica community)
 
-[//]: # (If you have a feature request, use "Help > Request a Feature", not GitHub or the Report a Bug guild.)
+[//]: # (To report a bug in one of the mobile apps, please report it in the correct repository. Android: https://github.com/HabitRPG/habitrpg-android, iOS: https://github.com/HabitRPG/habitrpg-ios)
 
-[//]: # (For more guidelines see https://github.com/HabitRPG/habitica/issues/2760)
+[//]: # (For more guidelines see https://github.com/HabitRPG/habitrpg/issues/2760)
 
 [//]: # (Fill out relevant information - UUID is found in Settings -> API)
-### General Info
+General Info
   * UUID: 
   * Browser: 
   * OS: 
 
 ### Description
-[//]: # (Describe bug in detail here. Include screenshots if helpful.)
+[//]: # (Describe bug in detail here. Include pictures if helpful.)
+
+
 
 #### Console Errors
 [//]: # (Include any JavaScript console errors here.)

.gitignore

@@ -2,14 +2,11 @@
 website/client-old/gen
 website/client-old/common
 website/client-old/apidoc
-website/build
 website/client-old/js/habitrpg-shared.js*
 website/client-old/css/habitrpg-shared.css
 website/transpiled-babel/
 website/common/transpiled-babel/
 node_modules
-content_cache
-apidoc_build
 *.swp
 .idea*
 config.json

.travis.yml

@@ -2,9 +2,6 @@ language: node_js
 node_js:
   - '6'
 sudo: required
-dist: precise
-services:
-  - mongodb
 addons:
   apt:
     sources:
@@ -13,26 +10,24 @@ addons:
       - g++-4.8
 before_install:
   - $CXX --version
-  - npm install -g npm@5
+  - npm install -g npm@4
   - if [ $REQUIRES_SERVER ]; then sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10; echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | sudo tee /etc/apt/sources.list.d/mongodb.list; sudo apt-get update; sudo apt-get install mongodb-org-server; fi
-install:
-  - npm install &> npm.install.log || (cat npm.install.log; false)
 before_script:
   - npm run test:build
   - cp config.json.example config.json
-  - sleep 15
-script:
-  - npm run $TEST
-  - if [ $COVERAGE ]; then ./node_modules/.bin/lcov-result-merger 'coverage/**/*.info' | ./node_modules/coveralls/bin/coveralls.js; fi
+  - if [ $REQUIRES_SERVER ]; then until nc -z localhost 27017; do echo Waiting for MongoDB; sleep 1; done; export DISPLAY=:99; fi
+after_script:
+  - ./node_modules/.bin/lcov-result-merger 'coverage/**/*.info' | ./node_modules/coveralls/bin/coveralls.js
+script: npm run $TEST
 env:
   global:
     - CXX=g++-4.8
     - DISABLE_REQUEST_LOGGING=true
   matrix:
     - TEST="lint"
-    - TEST="test:api-v3" REQUIRES_SERVER=true COVERAGE=true
+    - TEST="test:api-v3" REQUIRES_SERVER=true
     - TEST="test:sanity"
-    - TEST="test:content" COVERAGE=true
-    - TEST="test:common" COVERAGE=true
-    - TEST="client:unit" COVERAGE=true
-    - TEST="apidoc"
+    - TEST="test:content"
+    - TEST="test:common"
+    - TEST="test:karma"
+    - TEST="client:unit"

Dockerfile

@@ -1,21 +1,45 @@
-FROM node:boron
-
-# Upgrade NPM to v5 (Yarn is needed because of this bug https://github.com/npm/npm/issues/16807)
-# The used solution is suggested here https://github.com/npm/npm/issues/16807#issuecomment-313591975
-RUN yarn global add npm@5
-# Install global packages
-RUN npm install -g gulp mocha
-
-# Clone Habitica repo and install dependencies
-RUN mkdir -p /usr/src/habitrpg
-WORKDIR /usr/src/habitrpg
-RUN git clone https://github.com/HabitRPG/habitica.git /usr/src/habitrpg
-RUN cp config.json.example config.json
-RUN npm install
-
-# Create Build dir
-RUN mkdir -p ./website/build
-
-# Start Habitica
-EXPOSE 3000
-CMD ["npm", "start"]
+FROM ubuntu:trusty
+
+MAINTAINER Sabe Jones <sabe@habitica.com>
+
+# Avoid ERROR: invoke-rc.d: policy-rc.d denied execution of start.
+RUN echo -e '#!/bin/sh\nexit 0' > /usr/sbin/policy-rc.d
+
+# Install prerequisites
+RUN apt-get update
+RUN apt-get install -y \
+    build-essential \
+    curl \
+    git \
+    libfontconfig1 \
+    libfreetype6 \
+    libkrb5-dev \
+    python
+
+# Install NodeJS
+RUN curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
+RUN apt-get install -y nodejs
+
+# Install npm@latest
+RUN curl -sL https://www.npmjs.org/install.sh | sh
+
+# Clean up package management
+RUN apt-get clean
+RUN rm -rf /var/lib/apt/lists/*
+
+# Install global packages
+RUN npm install -g gulp grunt-cli bower mocha
+
+# Clone Habitica repo and install dependencies
+WORKDIR /habitrpg
+RUN git clone https://github.com/HabitRPG/habitica.git /habitrpg
+RUN npm install
+RUN bower install --allow-root
+
+# Create environment config file and build directory
+RUN cp config.json.example config.json
+RUN mkdir -p ./website/build
+
+# Start Habitica
+EXPOSE 3000
+CMD ["npm", "start"]

Dockerfile-Production

@@ -1,21 +0,0 @@
-FROM node:boron
-
-# Upgrade NPM to v5 (Yarn is needed because of this bug https://github.com/npm/npm/issues/16807)
-# The used solution is suggested here https://github.com/npm/npm/issues/16807#issuecomment-313591975
-RUN yarn global add npm@5
-# Install global packages
-RUN npm install -g gulp mocha
-
-# Clone Habitica repo and install dependencies
-RUN mkdir -p /usr/src/habitrpg
-WORKDIR /usr/src/habitrpg
-RUN git clone --branch v4.0.3 https://github.com/HabitRPG/habitica.git /usr/src/habitrpg
-RUN npm install
-RUN gulp build:prod --force
-
-# Create Build dir
-RUN mkdir -p ./website/build
-
-# Start Habitica
-EXPOSE 3000
-CMD ["node", "./website/transpiled-babel/index.js"]

Gruntfile.js

@@ -0,0 +1,142 @@
+/*global module:false*/
+require('babel-register');
+var _ = require('lodash');
+module.exports = function(grunt) {
+
+  // Project configuration.
+  grunt.initConfig({
+    pkg: grunt.file.readJSON('package.json'),
+
+    karma: {
+      unit: {
+        configFile: 'test/client-old/spec/karma.conf.js'
+      },
+      continuous: {
+        configFile: 'test/client-old/spec/karma.conf.js',
+        singleRun: true,
+        autoWatch: false
+      }
+    },
+
+    clean: {
+      build: ['website/build']
+    },
+
+    cssmin: {
+      dist: {
+        options: {
+          report: 'gzip'
+        },
+        files:{
+          "website/client-old/css/habitrpg-shared.css": [
+            "website/assets/sprites/dist/spritesmith*.css",
+            "website/assets/sprites/css/backer.css",
+            "website/assets/sprites/css/Mounts.css",
+            "website/assets/sprites/css/index.css"
+          ]
+        }
+      }
+    },
+
+    stylus: {
+      build: {
+        options: {
+          compress: false, // AFTER
+          'include css': true,
+          paths: ['website/client-old']
+        },
+        files: {
+          'website/build/app.css': ['website/client-old/css/index.styl'],
+          'website/build/static.css': ['website/client-old/css/static.styl']
+        }
+      }
+    },
+
+    copy: {
+      build: {
+        files: [
+          {expand: true, cwd: 'website/client-old/', src: 'favicon.ico', dest: 'website/build/'},
+          {expand: true, cwd: 'website/client-old/', src: 'favicon_192x192.png', dest: 'website/build/'},
+          {expand: true, cwd: 'website/assets/sprites/dist/', src: 'spritesmith*.png', dest: 'website/build/static/sprites'},
+          {expand: true, cwd: 'website/assets/sprites/', src: 'backer-only/*.gif', dest: 'website/build/'},
+          {expand: true, cwd: 'website/assets/sprites/', src: 'npc_ian.gif', dest: 'website/build/'},
+          {expand: true, cwd: 'website/assets/sprites/', src: 'quest_*.gif', dest: 'website/build/'},
+          {expand: true, cwd: 'website/client-old/', src: 'bower_components/bootstrap/dist/fonts/*', dest: 'website/build/'}
+        ]
+      }
+    },
+
+    // UPDATE IT WHEN YOU ADD SOME FILES NOT ALREADY MATCHED!
+    hashres: {
+      build: {
+        options: {
+          fileNameFormat: '${name}-${hash}.${ext}'
+        },
+        src: [
+          'website/build/*.js',
+          'website/build/*.css',
+          'website/build/favicon.ico',
+          'website/build/favicon_192x192.png',
+          'website/build/*.png',
+          'website/build/static/sprites/*.png',
+          'website/build/*.gif',
+          'website/build/bower_components/bootstrap/dist/fonts/*'
+        ],
+        dest: 'website/build/*.css'
+      }
+    }
+  });
+
+  //Load build files from client-old/manifest.json
+  grunt.registerTask('loadManifestFiles', 'Load all build files from client-old/manifest.json', function(){
+    var files = grunt.file.readJSON('./website/client-old/manifest.json');
+    var uglify = {};
+    var cssmin = {};
+
+    _.each(files, function(val, key){
+
+      var js = uglify['website/build/' + key + '.js'] = [];
+
+      _.each(files[key].js, function(val){
+        var path = "./";
+        if( val.indexOf('common/') == -1)
+          path = './website/client-old/';
+        js.push(path + val);
+      });
+
+      var css = cssmin['website/build/' + key + '.css'] = [];
+
+      _.each(files[key].css, function(val){
+        var path = "./";
+        if( val.indexOf('common/') == -1) {
+          path = (val == 'app.css' || val == 'static.css') ?  './website/build/' : './website/client-old/';
+        }
+        css.push(path + val)
+      });
+
+    });
+
+    grunt.config.set('uglify.build.files', uglify);
+    grunt.config.set('uglify.build.options', {compress: false});
+
+    grunt.config.set('cssmin.build.files', cssmin);
+    // Rewrite urls to relative path
+    grunt.config.set('cssmin.build.options', {'target': 'website/client-old/css/whatever-css.css'});
+  });
+
+  // Register tasks.
+  grunt.registerTask('build:prod', ['loadManifestFiles', 'clean:build', 'uglify', 'stylus', 'cssmin', 'copy:build', 'hashres']);
+  grunt.registerTask('build:dev', ['cssmin', 'stylus']);
+  grunt.registerTask('build:test', ['build:dev']);
+
+  // Load tasks
+  grunt.loadNpmTasks('grunt-contrib-uglify');
+  grunt.loadNpmTasks('grunt-contrib-clean');
+  grunt.loadNpmTasks('grunt-contrib-stylus');
+  grunt.loadNpmTasks('grunt-contrib-cssmin');
+  grunt.loadNpmTasks('grunt-contrib-copy');
+  grunt.loadNpmTasks('grunt-contrib-watch');
+  grunt.loadNpmTasks('grunt-hashres');
+  if (process.env.NODE_ENV !== 'production') grunt.loadNpmTasks('grunt-karma');
+
+};

README.md

@@ -5,7 +5,8 @@ Habitica [![Build Status](https://travis-ci.org/HabitRPG/habitica.svg?branch=dev
 
 We need more programmers! Your assistance will be greatly appreciated.
 
-For an introduction to the technologies used and how the software is organized, refer to [Guidance for Blacksmiths](http://habitica.wikia.com/wiki/Guidance_for_Blacksmiths).
+For an introduction to the technologies used and how the software is organized, refer to [Contributing to Habitica](http://habitica.wikia.com/wiki/Contributing_to_Habitica#Coders_.28Web_.26_Mobile.29) - "Coders (Web & Mobile)" section.
 
-To set up a local install of Habitica for development and testing on various platforms, see [Setting up Habitica Locally](http://habitica.wikia.com/wiki/Setting_up_Habitica_Locally).
+To set up a local install of Habitica for development and testing, see [Setting up Habitica Locally](http://habitica.wikia.com/wiki/Setting_up_Habitica_Locally), which contains instructions for Windows, *nix / Mac OS, and Vagrant.
 
+Then read [Guidance for Blacksmiths](http://habitica.wikia.com/wiki/Guidance_for_Blacksmiths) for additional instructions and useful tips.

bower.json

@@ -0,0 +1,56 @@
+{
+  "name": "HabitRPG",
+  "version": "0.1.1",
+  "homepage": "https://github.com/lefnire/habitrpg",
+  "authors": [
+    "Tyler Renelle <tylerrenelle@gmail.com>"
+  ],
+  "private": true,
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "website/client-old/bower_components",
+    "test",
+    "tests"
+  ],
+  "dependencies": {
+    "Angular-At-Directive": "snicker/Angular-At-Directive#c27bae207aa06d1e",
+    "angular": "1.3.9",
+    "angular-bootstrap": "0.13.0",
+    "angular-filter": "0.5.1",
+    "angular-loading-bar": "0.6.0",
+    "angular-resource": "1.3.9",
+    "angular-sanitize": "1.3.9",
+    "angular-ui": "0.4.0",
+    "angular-ui-router": "0.2.13",
+    "angular-ui-select2": "angular-ui/ui-select2#afa6589a54cb72815f",
+    "angular-ui-utils": "0.1.0",
+    "bootstrap": "3.1.0",
+    "bootstrap-growl": "ifightcrime/bootstrap-growl#162daa41cd1155f",
+    "bootstrap-tour": "0.10.1",
+    "css-social-buttons": "samcollins/css-social-buttons#v1.1.1 ",
+    "github-buttons": "mdo/github-buttons#v3.0.0",
+    "hello": "1.14.1",
+    "jquery": "2.1.0",
+    "jquery-colorbox": "1.4.36",
+    "jquery-ui": "1.10.3",
+    "jquery.cookie": "1.4.0",
+    "js-emoji": "snicker/js-emoji#f25d8a303f",
+    "ngInfiniteScroll": "1.1.0",
+    "pnotify": "1.3.1",
+    "sticky": "1.0.3",
+    "swagger-ui": "wordnik/swagger-ui#v2.0.24",
+    "smart-app-banner": "78ef9c0679723b25be1a0ae04f7b4aef7cbced4f",
+    "habitica-markdown": "1.2.2",
+    "pusher-js-auth": "^2.0.0",
+    "pusher-websocket-iso": "pusher#^3.2.0",
+    "taggle": "^1.11.1"
+  },
+  "devDependencies": {
+    "angular-mocks": "1.3.9"
+  },
+  "resolutions": {
+    "angular": "1.3.9",
+    "jquery": ">=1.9.0"
+  }
+}

config.json.example

@@ -66,8 +66,7 @@
         },
         "mode":"sandbox",
         "client_id":"client_id",
-        "client_secret":"client_secret",
-        "experience_profile_id": ""
+        "client_secret":"client_secret"
     },
     "IAP_GOOGLE_KEYDIR": "/path/to/google/public/key/dir/",
     "LOGGLY_TOKEN": "token",
@@ -95,12 +94,8 @@
     },
     "ITUNES_SHARED_SECRET": "aaaabbbbccccddddeeeeffff00001111",
     "EMAILS" : {
-        "COMMUNITY_MANAGER_EMAIL" : "leslie@habitica.com",
-        "TECH_ASSISTANCE_EMAIL" : "admin@habitica.com",
-        "PRESS_ENQUIRY_EMAIL" : "leslie@habitica.com"
-    },
-    "LOGGLY" : {
-        "TOKEN" : "example-token",
-        "SUBDOMAIN" : "exmaple-subdomain"
+        "COMMUNITY_MANAGER_EMAIL" : "community@example.com",
+        "TECH_ASSISTANCE_EMAIL" : "tech@example.com",
+        "PRESS_ENQUIRY_EMAIL" : "press@example.com"
     }
 }

database_reports/count_users_who_own_specified_gear.js

@@ -3,7 +3,7 @@ var authorUuid = 'd904bd62-da08-416b-a816-ba797c9ee265'; //... own data is done
 
 /**
  * database_reports/count_users_who_own_specified_gear.js
- * https://github.com/HabitRPG/habitica/pull/3884
+ * https://github.com/HabitRPG/habitrpg/pull/3884
  */
 
 var thingsOfInterest = {

docker-compose.dev.yml

@@ -1,3 +1,3 @@
 web:
   volumes:
-    - '.:/usr/src/habitrpg'
+    - '.:/habitrpg'

gulp/gulp-apidoc.js

@@ -2,7 +2,7 @@ import gulp from 'gulp';
 import clean from 'rimraf';
 import apidoc from 'apidoc';
 
-const APIDOC_DEST_PATH = './apidoc_build';
+const APIDOC_DEST_PATH = './website/build/apidoc';
 const APIDOC_SRC_PATH = './website/server';
 gulp.task('apidoc:clean', (done) => {
   clean(APIDOC_DEST_PATH, done);

gulp/gulp-babelify.js

@@ -0,0 +1,31 @@
+import gulp from 'gulp';
+import browserify from 'browserify';
+import source from 'vinyl-source-stream';
+import buffer from 'vinyl-buffer';
+import uglify from 'gulp-uglify';
+import sourcemaps from 'gulp-sourcemaps';
+import babel from 'babelify';
+
+gulp.task('browserify', function () {
+  let bundler = browserify({
+    entries: './website/common/browserify.js',
+    debug: true,
+    transform: [[babel, { compact: false }]],
+  });
+
+  return bundler.bundle()
+    .pipe(source('habitrpg-shared.js'))
+    .pipe(buffer())
+    .pipe(sourcemaps.init({loadMaps: true}))
+    .pipe(uglify())
+    .on('error', function (err) {
+      console.error(err);
+      this.emit('end');
+    })
+    .pipe(sourcemaps.write('./'))
+    .pipe(gulp.dest('./website/client-old/js/'));
+});
+
+gulp.task('browserify:watch', () => {
+  gulp.watch('./website/common/script/**/*.js', ['browserify']);
+});

gulp/gulp-bootstrap.js

@@ -1,36 +0,0 @@
-import gulp from 'gulp';
-import fs from 'fs';
-
-// Copy Bootstrap 4 config variables from /website /node_modules so we can check
-// them into Git
-
-const BOOSTRAP_NEW_CONFIG_PATH = 'website/client/assets/scss/bootstrap_config.scss';
-const BOOTSTRAP_ORIGINAL_CONFIG_PATH = 'node_modules/bootstrap/scss/_custom.scss';
-
-// https://stackoverflow.com/a/14387791/969528
-function copyFile(source, target, cb) {
-  let cbCalled = false;
-
-  function done(err) {
-    if (!cbCalled) {
-      cb(err);
-      cbCalled = true;
-    }
-  }
-
-  let rd = fs.createReadStream(source);
-  rd.on('error', done);
-  let wr = fs.createWriteStream(target);
-  wr.on('error', done);
-  wr.on('close', () => done());
-  rd.pipe(wr);
-}
-
-gulp.task('bootstrap', (done) => {
-  // use new config
-  copyFile(
-    BOOSTRAP_NEW_CONFIG_PATH,
-    BOOTSTRAP_ORIGINAL_CONFIG_PATH,
-    done,
-  );
-});

gulp/gulp-build.js

@@ -1,11 +1,13 @@
 import gulp from 'gulp';
 import runSequence from 'run-sequence';
 import babel from 'gulp-babel';
-import webpackProductionBuild from '../webpack/build';
+require('gulp-grunt')(gulp);
 
 gulp.task('build', () => {
   if (process.env.NODE_ENV === 'production') {
     gulp.start('build:prod');
+  } else {
+    gulp.start('build:dev');
   }
 });
 
@@ -23,16 +25,18 @@ gulp.task('build:common', () => {
 
 gulp.task('build:server', ['build:src', 'build:common']);
 
-// Client Production Build
-gulp.task('build:client', ['bootstrap'], (done) => {
-  webpackProductionBuild((err, output) => {
-    if (err) return done(err);
-    console.log(output);
-  });
+gulp.task('build:dev', ['browserify', 'prepare:staticNewStuff'], (done) => {
+  gulp.start('grunt-build:dev', done);
 });
 
-gulp.task('build:prod', [
-  'build:server', 
-  'build:client',
-  'apidoc',
-]);
+gulp.task('build:dev:watch', ['build:dev'], () => {
+  gulp.watch(['website/client-old/**/*.styl', 'website/common/script/*']);
+});
+
+gulp.task('build:prod', ['browserify', 'build:server', 'prepare:staticNewStuff'], (done) => {
+  runSequence(
+    'grunt-build:prod',
+    'apidoc',
+    done
+  );
+});

gulp/gulp-newstuff.js

@@ -0,0 +1,10 @@
+import gulp from 'gulp';
+import jade from 'jade';
+import {writeFileSync} from 'fs';
+
+gulp.task('prepare:staticNewStuff', () => {
+  writeFileSync(
+    './website/client-old/new-stuff.html',
+    jade.compileFile('./website/views/shared/new-stuff.jade')()
+  );
+});

gulp/gulp-sprites.js

@@ -10,24 +10,25 @@ import {each} from 'lodash';
 
 // https://github.com/Ensighten/grunt-spritesmith/issues/67#issuecomment-34786248
 const MAX_SPRITESHEET_SIZE = 1024 * 1024 * 3;
+const DIST_PATH = 'website/assets/sprites/dist/';
 
-const IMG_DIST_PATH = 'website/static/sprites/';
-const CSS_DIST_PATH = 'website/client/assets/css/sprites/';
+const IMG_DIST_PATH_NEW_CLIENT = 'website/static/sprites/';
+const CSS_DIST_PATH_NEW_CLIENT = 'website/client/assets/css/sprites/';
 
 gulp.task('sprites:compile', ['sprites:clean', 'sprites:main', 'sprites:largeSprites', 'sprites:checkCompiledDimensions']);
 
 gulp.task('sprites:main', () => {
-  let mainSrc = sync('website/raw_sprites/spritesmith/**/*.png');
+  let mainSrc = sync('website/assets/sprites/spritesmith/**/*.png');
   return createSpritesStream('main', mainSrc);
 });
 
 gulp.task('sprites:largeSprites', () => {
-  let largeSrc = sync('website/raw_sprites/spritesmith_large/**/*.png');
+  let largeSrc = sync('website/assets/sprites/spritesmith_large/**/*.png');
   return createSpritesStream('largeSprites', largeSrc);
 });
 
 gulp.task('sprites:clean', (done) => {
-  clean(`${IMG_DIST_PATH}spritesmith*,${CSS_DIST_PATH}spritesmith*}`, done);
+  clean(`{${DIST_PATH}spritesmith*,${IMG_DIST_PATH_NEW_CLIENT}spritesmith*,${CSS_DIST_PATH_NEW_CLIENT}spritesmith*}`, done);
 });
 
 gulp.task('sprites:checkCompiledDimensions', ['sprites:main', 'sprites:largeSprites'], () => {
@@ -35,7 +36,7 @@ gulp.task('sprites:checkCompiledDimensions', ['sprites:main', 'sprites:largeSpri
 
   let numberOfSheetsThatAreTooBig = 0;
 
-  let distSpritesheets = sync(`${IMG_DIST_PATH}*.png`);
+  let distSpritesheets = sync(`${DIST_PATH}*.png`);
 
   each(distSpritesheets, (img, index) => {
     let spriteSize = calculateImgDimensions(img);
@@ -48,7 +49,7 @@ gulp.task('sprites:checkCompiledDimensions', ['sprites:main', 'sprites:largeSpri
   });
 
   if (numberOfSheetsThatAreTooBig > 0) {
-    console.error(`${numberOfSheetsThatAreTooBig} sheets might too big for mobile Safari to be able to handle them, but there is a margin of error in these calculations so it is probably okay. Mention this to an admin so they can test a staging site on mobile Safari after your PR is merged.`); // https://github.com/HabitRPG/habitica/pull/6683#issuecomment-185462180
+    console.error(`${numberOfSheetsThatAreTooBig} sheets might too big for mobile Safari to be able to handle them, but there is a margin of error in these calculations so it is probably okay. Mention this to an admin so they can test a staging site on mobile Safari after your PR is merged.`); // https://github.com/HabitRPG/habitrpg/pull/6683#issuecomment-185462180
   } else {
     console.log('All images are within the correct dimensions');
   }
@@ -67,16 +68,18 @@ function createSpritesStream (name, src) {
         cssName: `spritesmith-${name}-${index}.css`,
         algorithm: 'binary-tree',
         padding: 1,
-        cssTemplate: 'website/raw_sprites/css/css.template.handlebars',
+        cssTemplate: 'website/assets/sprites/css/css.template.handlebars',
         cssVarMap: cssVarMap,
       }));
 
     let imgStream = spriteData.img
       .pipe(imagemin())
-      .pipe(gulp.dest(IMG_DIST_PATH));
+      .pipe(gulp.dest(IMG_DIST_PATH_NEW_CLIENT))
+      .pipe(gulp.dest(DIST_PATH));
 
     let cssStream = spriteData.css
-      .pipe(gulp.dest(CSS_DIST_PATH));
+      .pipe(gulp.dest(CSS_DIST_PATH_NEW_CLIENT))
+      .pipe(gulp.dest(DIST_PATH));
 
     stream.add(imgStream);
     stream.add(cssStream);

gulp/gulp-start.js

@@ -3,6 +3,8 @@ import nodemon from 'gulp-nodemon';
 
 let pkg = require('../package.json');
 
+gulp.task('run:dev', ['nodemon', 'build:dev:watch']);
+
 gulp.task('nodemon', () => {
   nodemon({
     script: pkg.main,

gulp/gulp-tests.js

@@ -29,6 +29,7 @@ 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 CONTENT_OPTIONS = {maxBuffer: 1024 * 500};
+const KARMA_TEST_COMMAND = 'npm run test:karma';
 
 /* Helper methods for reporting test summary */
 let testResults = [];
@@ -74,11 +75,25 @@ gulp.task('test:prepare:server', ['test:prepare:mongo'], () => {
   }
 });
 
-gulp.task('test:prepare:build', ['build']);
+gulp.task('test:prepare:translations', (cb) => {
+  fs.writeFile(
+    'test/client-old/spec/mocks/translations.js',
+     `if(!window.env) window.env = {};
+window.env.translations = ${JSON.stringify(i18n.translations['en'])};`, cb);
+
+});
+
+gulp.task('test:prepare:build', ['build', 'test:prepare:translations']);
+// exec(testBin('grunt build:test'), cb);
+
+gulp.task('test:prepare:webdriver', (cb) => {
+  exec('npm run test:prepare:webdriver', cb);
+});
 
 gulp.task('test:prepare', [
   'test:prepare:build',
   'test:prepare:mongo',
+  'test:prepare:webdriver',
 ]);
 
 gulp.task('test:sanity', (cb) => {
@@ -170,9 +185,102 @@ gulp.task('test:content:safe', ['test:prepare:build'], (cb) => {
   pipe(runner);
 });
 
+gulp.task('test:karma', ['test:prepare:build'], (cb) => {
+  let runner = exec(
+    testBin(KARMA_TEST_COMMAND),
+    (err, stdout) => {
+      if (err) {
+        process.exit(1);
+      }
+      cb();
+    }
+  );
+  pipe(runner);
+});
+
+gulp.task('test:karma:watch', ['test:prepare:build'], (cb) => {
+  let runner = exec(
+    testBin(`${KARMA_TEST_COMMAND}:watch`),
+    (err, stdout) => {
+      cb(err);
+    }
+  );
+  pipe(runner);
+});
+
+gulp.task('test:karma:safe', ['test:prepare:build'], (cb) => {
+  let runner = exec(
+    testBin(KARMA_TEST_COMMAND),
+    (err, stdout) => {
+      testResults.push({
+        suite: 'Karma Specs\t',
+        pass: testCount(stdout, /(\d+) tests? completed/),
+        fail: testCount(stdout, /(\d+) tests? failed/),
+        pend: testCount(stdout, /(\d+) tests? skipped/),
+      });
+      cb();
+    }
+  );
+  pipe(runner);
+});
+
+gulp.task('test:e2e', ['test:prepare', 'test:prepare:server'], (cb) => {
+  let support = [
+    'Xvfb :99 -screen 0 1024x768x24 -extension RANDR',
+    testBin('npm run test:e2e:webdriver', 'DISPLAY=:99'),
+  ].map(exec);
+  support.push(server);
+
+  Bluebird.all([
+    awaitPort(TEST_SERVER_PORT),
+    awaitPort(4444),
+  ]).then(() => {
+    let runner = exec(
+      'npm run test:e2e',
+      (err, stdout, stderr) => {
+        support.forEach(kill);
+        if (err) {
+          process.exit(1);
+        }
+        cb();
+      }
+    );
+    pipe(runner);
+  });
+});
+
+gulp.task('test:e2e:safe', ['test:prepare', 'test:prepare:server'], (cb) => {
+  let support = [
+    'Xvfb :99 -screen 0 1024x768x24 -extension RANDR',
+    'npm run test:e2e:webdriver',
+  ].map(exec);
+
+  Bluebird.all([
+    awaitPort(TEST_SERVER_PORT),
+    awaitPort(4444),
+  ]).then(() => {
+    let runner = exec(
+      'npm run test:e2e',
+      (err, stdout, stderr) => {
+        let match = stdout.match(/(\d+) tests?.*(\d) failures?/);
+
+        testResults.push({
+          suite: 'End-to-End Specs\t',
+          pass: testCount(stdout, /(\d+) passing/),
+          fail: testCount(stdout, /(\d+) failing/),
+          pend: testCount(stdout, /(\d+) pending/),
+        });
+        support.forEach(kill);
+        cb();
+      }
+    );
+    pipe(runner);
+  });
+});
+
 gulp.task('test:api-v3:unit', (done) => {
   let runner = exec(
-    testBin('node_modules/.bin/istanbul cover --dir coverage/api-v3-unit --report lcovonly node_modules/mocha/bin/_mocha -- test/api/v3/unit --recursive --require ./test/helpers/start-server'),
+    testBin('mocha test/api/v3/unit --recursive --require ./test/helpers/start-server'),
     (err, stdout, stderr) => {
       if (err) {
         process.exit(1);
@@ -190,7 +298,7 @@ gulp.task('test:api-v3:unit:watch', () => {
 
 gulp.task('test:api-v3:integration', (done) => {
   let runner = exec(
-    testBin('node_modules/.bin/istanbul cover --dir coverage/api-v3-integration --report lcovonly node_modules/mocha/bin/_mocha -- test/api/v3/integration --recursive --require ./test/helpers/start-server'),
+    testBin('mocha test/api/v3/integration --recursive --require ./test/helpers/start-server'),
     {maxBuffer: 500 * 1024},
     (err, stdout, stderr) => {
       if (err) {
@@ -223,6 +331,7 @@ gulp.task('test', (done) => {
     'test:sanity',
     'test:content',
     'test:common',
+    'test:karma',
     'test:api-v3:unit',
     'test:api-v3:integration',
     done

gulpfile.js

@@ -10,8 +10,9 @@ require('babel-register');
 
 if (process.env.NODE_ENV === 'production') {
   require('./gulp/gulp-apidoc');
+  require('./gulp/gulp-newstuff');
   require('./gulp/gulp-build');
-  require('./gulp/gulp-bootstrap');
+  require('./gulp/gulp-babelify');
 } else {
   require('glob').sync('./gulp/gulp-*').forEach(require);
   require('gulp').task('default', ['test']);

kubernetes/README.md

@@ -1,60 +0,0 @@
-# Habitica in Kubernetes
-This is a set of sample Kubernetes configuration files to launch Habitica under AWS, both as a single-node web frontend as well as a multi-node web frontend.
-
-## Prerequisites
-* An AWS account.
-* A working Kubernetes installation.
-* A basic understanding of how to use Kubernetes. https://kubernetes.io/
-* A persistent volume for MongoDB data.
-* Docker images of Habitica.
-  + You can use your own, or use the one included in the YAML files.
-  + If you use your own, you'll need a fork of the Habitica GitHub repo and your own Docker Hub repo, both of which are free.
-
-## Before you begin
-1. Set up Kubernetes.
-2. Create an EBS volume for MongoDB data.
-   + Make a note of the name, you'll need it later.
-
-## Starting MongoDB
-1. Edit mongo.yaml
-  + Find the volumeID line.
-  + Change the volume to the one created in the section above.
-2. Run the following commands:
-  + `kubectl.sh create -f mongo.yaml`
-  + `kubectl.sh create -f mongo-service.yaml`
-3. Wait for the MongoDB pod to start up.
-
-## Starting a Single Web Frontend
-
-1. Run the following commands:
-  + `kubectl.sh create -f habitica.yaml`
-  + `kubectl.sh create -f habitica-service.yaml`
-2. Wait for the frontend to start up.
-
-## Starting Multi-node Web Frontend
-1. Run the following commands :
-  + `kubectl.sh create -f habitica-rc.yaml`
-  + `kubectl.sh create -f habitica-service.yaml`
-2. Wait for the frontend to start up.
-
-## Accessing Your Habitica web interface
-Using `kubectl describe svc habiticaweb` get the hostname generated for the Habitica service. Open a browser and go to http://hostname:3000 to access the web front-end for the installations above.
-
-## Shutting down
-Shutting down is basically done by reversing the steps above:
-+ `kubectl.sh delete -f habitica-service.yaml`
-+ `kubectl.sh delete -f habitica.yaml (or habitica-rc.yaml)`
-+ `kubectl.sh delete -f mongo-service.yaml`
-+ `kubectl.sh delete -f mongo.yaml`
-
-You can also just shut down all of Kubernetes as well.
-
-## Notes
-+ MongoDB data will be persistent! If you need to start with a fresh database, you'll need to remove the volume and re-create it.
-+ On AWS, you probably want to use at least t2.medium minion nodes for Kubernetes. The default t2.small is too small for more than two Habitica nodes.
-
-## Future Plans
-+ Multi-node MongoDB.
-+ Monitoring
-+ Instructions for a better hostname. The default generated ones stink.
-+ More to come....

kubernetes/habitica-rc.yaml

@@ -1,25 +0,0 @@
-apiVersion: v1
-kind: ReplicationController
-metadata:
-  name: habitica
-  labels:
-    name: habitica
-spec:
-  replicas: 4
-  selector:
-    name: habitica
-  template:
-    metadata:
-      labels:
-        name: habitica
-    spec:
-      containers:
-      - name: habitica
-        image: ksonney/habitrpg:latest
-        env:
-          - name: NODE_DB_URI
-            value: mongodb://mongosvc/habitrpg
-        ports:
-          - containerPort: 3000
-            hostPort: 3000
-            name: habitica

kubernetes/habitica-service.yaml

@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata: 
-  labels: 
-    name: habiticaweb
-  name: habiticaweb
-spec: 
-  ports:
-    # the port that this service should serve on
-    - port: 3000
-  # label keys and values that must match in order to receive traffic for this service
-  selector: 
-    name: habitica
-  type: LoadBalancer

kubernetes/habitica.yaml

@@ -1,22 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: habitica
-  labels:
-    name: habitica
-spec:
-  containers:
-#    - image: mongo:latest
-#      name: mongo
-#      ports:
-#        - containerPort: 27017
-#          name: mongo
-    - image: ksonney/habitrpg:latest
-      name: habitica
-      env:
-        - name: NODE_DB_URI
-          value: mongodb://mongosvc/habitrpg
-      ports: 
-        - containerPort: 3000
-          hostPort: 3000
-          name: habitica

kubernetes/mongo-service.yaml

@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata: 
-  labels: 
-    name: mongosvc
-  name: mongosvc
-spec: 
-  ports:
-    # the port that this service should serve on
-    - port: 27017
-  # label keys and values that must match in order to receive traffic for this service
-  selector: 
-    name: mongodb

kubernetes/mongo.yaml

@@ -1,28 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: mongodb
-  labels: 
-    name: mongodb
-spec: 
-  containers: 
-    - resources:
-        limits :
-          cpu: 0.5
-      image: mongo
-      name: mongodb
-      ports: 
-        - containerPort: 27017
-          hostPort: 27017
-          name: mongo
-      volumeMounts:
-#         # name must match the volume name below
-        - name: mongo-persistent-storage
-#          # mount path within the container
-          mountPath: /data/db
-  volumes:
-    - name: mongo-persistent-storage
-      awsElasticBlockStore:
-        volumeID: aws://YOUR-REGION/YOUR-VOLNAME
-        fsType: ext3
-

migrations/20170111_announce_collection_quest_change_in_parties.js

@@ -1,110 +0,0 @@
-'use strict';
-
-/****************************************
- * Author: @Alys
- *
- * Reason: Collection quests are being changed
- * to require fewer items collected:
- * https://github.com/HabitRPG/habitrpg/pull/7987
- * This will cause existing quests to end sooner
- * than the party is expecting.
- * This script inserts an explanatory `system`
- * message into the chat for affected parties.
- ***************************************/
-
-global.Promise = require('bluebird');
-const uuid = require('uuid');
-const TaskQueue = require('cwait').TaskQueue;
-const logger = require('./utils/logger');
-const Timer = require('./utils/timer');
-const connectToDb = require('./utils/connect').connectToDb;
-const closeDb = require('./utils/connect').closeDb;
-
-const message = '`This party\'s collection quest has been made easier! For details, refer to http://habitica.wikia.com/wiki/User_blog:LadyAlys/Collection_Quests_are_Now_Easier`';
-
-const timer = new Timer();
-
-// PROD: Enable prod db
-// const DB_URI = 'mongodb://username:password@dsXXXXXX-a0.mlab.com:XXXXX,dsXXXXXX-a1.mlab.com:XXXXX/habitica?replicaSet=rs-dsXXXXXX';
-const DB_URI = 'mongodb://localhost/habitrpg';
-
-const COLLECTION_QUESTS = [
-  'vice2',
-  'egg',
-  'moonstone1',
-  'goldenknight1',
-  'dilatoryDistress1',
-];
-
-let Groups;
-
-connectToDb(DB_URI).then((db) => {
-  Groups = db.collection('groups');
-
-  return Promise.resolve();
-})
-.then(findPartiesWithCollectionQuest)
-// .then(displayGroups) // for testing only
-.then(addMessageToGroups)
-.then(() => {
-  timer.stop();
-  closeDb();
-}).catch(reportError);
-
-function reportError (err) {
-  logger.error('Uh oh, an error occurred');
-  closeDb();
-  timer.stop();
-  throw err;
-}
-
-function findPartiesWithCollectionQuest () {
-  logger.info('Looking up groups on collection quests...');
-
-  return Groups.find({'quest.key': {$in: COLLECTION_QUESTS}}, ['name','quest']).toArray().then((groups) => {
-    logger.success('Found', groups.length, 'parties on collection quests');
-
-    return Promise.resolve(groups);
-  })
-}
-
-function displayGroups (groups) { // for testing only
-  logger.info('Displaying parties...');
-  console.log(groups);
-  return Promise.resolve(groups);
-}
-
-function updateGroupById (group) {
-  var newMessage = {
-    'id' : uuid.v4(),
-    'text' : message,
-    'timestamp': Date.now(),
-    'likes': {},
-    'flags': {},
-    'flagCount': 0,
-    'uuid': 'system'
-  };
-  return Groups.findOneAndUpdate({_id: group._id}, {$push:{"chat" :{$each: [newMessage], $position:0}}}, {returnOriginal: false});
-  // Does not set the newMessage flag for all party members because I don't think it's essential and
-  // I don't want to run the extra code (extra database load, extra opportunity for bugs).
-}
-
-function addMessageToGroups (groups) {
-  let queue = new TaskQueue(Promise, 300);
-
-  logger.info('About to update', groups.length, 'parties...');
-
-  return Promise.map(groups, queue.wrap(updateGroupById)).then((result) => {
-    let updates = result.filter(res => res.lastErrorObject && res.lastErrorObject.updatedExisting)
-    let failures = result.filter(res => !(res.lastErrorObject && res.lastErrorObject.updatedExisting));
-
-    logger.success(updates.length, 'parties have been notified');
-
-    if (failures.length > 0) {
-      logger.error(failures.length, 'parties could not be notified');
-    }
-
-    return Promise.resolve();
-  });
-}
-

migrations/20170418_subscriber_jackalopes.js

@@ -1,88 +0,0 @@
-var migrationName = '20170418_subscriber_jackalopes.js';
-var authorName = 'Sabe'; // in case script author needs to know when their ...
-var authorUuid = '7f14ed62-5408-4e1b-be83-ada62d504931'; //... own data is done
-
-/*
- * Award Royal Purple Jackalope pet to all current subscribers
- */
-
-var monk = require('monk');
-var connectionString = 'mongodb://localhost:27017/habitrpg?auto_reconnect=true'; // FOR TEST DATABASE
-var dbUsers = monk(connectionString).get('users', { castIds: false });
-var now = new Date();
-
-function processUsers(lastId) {
-  // specify a query to limit the affected users (empty for all users):
-  var query = {
-    'purchased.plan.customerId': {$type: 2},
-    $or: [
-      {'purchased.plan.dateTerminated': null},
-      {'purchased.plan.dateTerminated': {$exists: false}},
-      {'purchased.plan.dateTerminated': {$gt: now}},
-    ]
-  };
-
-  if (lastId) {
-    query._id = {
-      $gt: lastId
-    }
-  }
-
-  dbUsers.find(query, {
-    sort: {_id: 1},
-    limit: 250,
-    fields: [] // specify fields we are interested in to limit retrieved data (empty if we're not reading data):
-  })
-  .then(updateUsers)
-  .catch(function (err) {
-    console.log(err);
-    return exiting(1, 'ERROR! ' + err);
-  });
-}
-
-var progressCount = 1000;
-var count = 0;
-
-function updateUsers (users) {
-  if (!users || users.length === 0) {
-    console.warn('All appropriate users found and modified.');
-    displayData();
-    return;
-  }
-
-  var userPromises = users.map(updateUser);
-  var lastUser = users[users.length - 1];
-
-  return Promise.all(userPromises)
-  .then(function () {
-    processUsers(lastUser._id);
-  });
-}
-
-function updateUser (user) {
-  count++;
-
-  var set = {'items.pets.Jackalope-RoyalPurple': 5};
-
-  dbUsers.update({_id: user._id}, {$set:set});
-
-  if (count % progressCount == 0) console.warn(count + ' ' + user._id);
-  if (user._id == authorUuid) console.warn(authorName + ' processed');
-}
-
-function displayData() {
-  console.warn('\n' + count + ' users processed\n');
-  return exiting(0);
-}
-
-function exiting(code, msg) {
-  code = code || 0; // 0 = success
-  if (code && !msg) { msg = 'ERROR!'; }
-  if (msg) {
-    if (code) { console.error(msg); }
-    else      { console.log(  msg); }
-  }
-  process.exit(code);
-}
-
-module.exports = processUsers;

migrations/20170425_missing_incentives.js

@@ -1,207 +0,0 @@
-var migrationName = '20170425_missing_incentives';
-var authorName = 'Sabe'; // in case script author needs to know when their ...
-var authorUuid = '7f14ed62-5408-4e1b-be83-ada62d504931'; //... own data is done
-
-/*
- * Award missing Royal Purple Hatching Potion to users with 55+ check-ins
- * Reduce users with impossible check-in counts to a reasonable number
- */
-
-import monk from 'monk';
-import common from '../website/common';
-
-var connectionString = 'mongodb://localhost:27017/habitrpg?auto_reconnect=true'; // FOR TEST DATABASE
-var dbUsers = monk(connectionString).get('users', { castIds: false });
-
-function processUsers(lastId) {
-  // specify a query to limit the affected users (empty for all users):
-  var query = {
-    'loginIncentives': {$gt:99},
-    'migration': {$ne: migrationName},
-  };
-
-  if (lastId) {
-    query._id = {
-      $gt: lastId
-    }
-  }
-
-  dbUsers.find(query, {
-    sort: {_id: 1},
-    limit: 250,
-    fields: [] // specify fields we are interested in to limit retrieved data (empty if we're not reading data):
-  })
-  .then(updateUsers)
-  .catch(function (err) {
-    console.log(err);
-    return exiting(1, 'ERROR! ' + err);
-  });
-}
-
-var progressCount = 1000;
-var count = 0;
-
-function updateUsers (users) {
-  if (!users || users.length === 0) {
-    console.warn('All appropriate users found and modified.');
-    displayData();
-    return;
-  }
-
-  var userPromises = users.map(updateUser);
-  var lastUser = users[users.length - 1];
-
-  return Promise.all(userPromises)
-  .then(function () {
-    processUsers(lastUser._id);
-  });
-}
-
-function updateUser (user) {
-  count++;
-  var language = user.preferences.language || 'en';
-  var set = {'migration': migrationName};
-  var inc = {
-    'items.eggs.BearCub': 0,
-    'items.eggs.Cactus': 0,
-    'items.eggs.Dragon': 0,
-    'items.eggs.FlyingPig': 0,
-    'items.eggs.Fox': 0,
-    'items.eggs.LionCub': 0,
-    'items.eggs.PandaCub': 0,
-    'items.eggs.TigerCub': 0,
-    'items.eggs.Wolf': 0,
-    'items.food.Chocolate': 0,
-    'items.food.CottonCandyBlue': 0,
-    'items.food.CottonCandyPink': 0,
-    'items.food.Fish': 0,
-    'items.food.Honey': 0,
-    'items.food.Meat': 0,
-    'items.food.Milk': 0,
-    'items.food.Potatoe': 0,
-    'items.food.RottenMeat': 0,
-    'items.food.Strawberry': 0,
-    'items.hatchingPotions.Base': 0,
-    'items.hatchingPotions.CottonCandyBlue': 0,
-    'items.hatchingPotions.CottonCandyPink': 0,
-    'items.hatchingPotions.Desert': 0,
-    'items.hatchingPotions.Golden': 0,
-    'items.hatchingPotions.Red': 0,
-    'items.hatchingPotions.RoyalPurple': 0,
-    'items.hatchingPotions.Shade': 0,
-    'items.hatchingPotions.Skeleton': 0,
-    'items.hatchingPotions.White': 0,
-    'items.hatchingPotions.Zombie': 0,
-  };
-  var nextReward;
-
-  if (user.loginIncentives >= 105) {
-    inc['items.hatchingPotions.RoyalPurple'] += 1;
-    nextReward = 110;
-  }
-  if (user.loginIncentives >= 110) {
-    inc['items.eggs.BearCub'] += 1;
-    inc['items.eggs.Cactus'] += 1;
-    inc['items.eggs.Dragon'] += 1;
-    inc['items.eggs.FlyingPig'] += 1;
-    inc['items.eggs.Fox'] += 1;
-    inc['items.eggs.LionCub'] += 1;
-    inc['items.eggs.PandaCub'] += 1;
-    inc['items.eggs.TigerCub'] += 1;
-    inc['items.eggs.Wolf'] += 1;
-    nextReward = 115;
-  }
-  if (user.loginIncentives >= 115) {
-    inc['items.hatchingPotions.RoyalPurple'] += 1;
-    nextReward = 120;
-  }
-  if (user.loginIncentives >= 120) {
-    inc['items.hatchingPotions.Base'] += 1;
-    inc['items.hatchingPotions.CottonCandyBlue'] += 1;
-    inc['items.hatchingPotions.CottonCandyPink'] += 1;
-    inc['items.hatchingPotions.Desert'] += 1;
-    inc['items.hatchingPotions.Golden'] += 1;
-    inc['items.hatchingPotions.Red'] += 1;
-    inc['items.hatchingPotions.Shade'] += 1;
-    inc['items.hatchingPotions.Skeleton'] += 1;
-    inc['items.hatchingPotions.White'] += 1;
-    inc['items.hatchingPotions.Zombie'] += 1;
-    nextReward = 125;
-  }
-  if (user.loginIncentives >= 125) {
-    inc['items.hatchingPotions.RoyalPurple'] += 1;
-    nextReward = 130;
-  }
-  if (user.loginIncentives >= 130) {
-    inc['items.food.Chocolate'] += 3;
-    inc['items.food.CottonCandyBlue'] += 3;
-    inc['items.food.CottonCandyPink'] += 3;
-    inc['items.food.Fish'] += 3;
-    inc['items.food.Honey'] += 3;
-    inc['items.food.Meat'] += 3;
-    inc['items.food.Milk'] += 3;
-    inc['items.food.Potatoe'] += 3;
-    inc['items.food.RottenMeat'] += 3;
-    inc['items.food.Strawberry'] += 3;
-  }
-  if (user.loginIncentives >= 135) {
-    inc['items.hatchingPotions.RoyalPurple'] += 1;
-    nextReward = 140;
-  }
-  if (user.loginIncentives >= 140) {
-    set['items.gear.owned.weapon_special_skeletonKey'] = true;
-    set['items.gear.owned.shield_special_lootBag'] = true;
-    nextReward = 145;
-  }
-  if (user.loginIncentives >= 145) {
-    inc['items.hatchingPotions.RoyalPurple'] += 1;
-    nextReward = 150;
-  }
-  if (user.loginIncentives >= 150) {
-    set['items.gear.owned.head_special_clandestineCowl'] = true;
-    set['items.gear.owned.armor_special_sneakthiefRobes'] = true;
-    nextReward = 155;
-  }
-  if (user.loginIncentives > 155) {
-    set.loginIncentives = 155;
-    nextReward = 160;
-  }
-
-  var push = {
-    'notifications': {
-      'type': 'LOGIN_INCENTIVE',
-      'data': {
-        'nextRewardAt': nextReward,
-        'rewardKey': [
-          'shop_armoire',
-        ],
-        'rewardText': common.i18n.t('checkInRewards', language),
-        'reward': [],
-        'message': common.i18n.t('backloggedCheckInRewards', language),
-      },
-      'id': common.uuid(),
-    }
-  };
-
-  dbUsers.update({_id: user._id}, {$set:set, $push:push, $inc:inc});
-
-  if (count % progressCount == 0) console.warn(count + ' ' + user._id);
-  if (user._id == authorUuid) console.warn(authorName + ' processed');
-}
-
-function displayData() {
-  console.warn('\n' + count + ' users processed\n');
-  return exiting(0);
-}
-
-function exiting(code, msg) {
-  code = code || 0; // 0 = success
-  if (code && !msg) { msg = 'ERROR!'; }
-  if (msg) {
-    if (code) { console.error(msg); }
-    else      { console.log(  msg); }
-  }
-  process.exit(code);
-}
-
-module.exports = processUsers;

migrations/20170616_achievements.js

@@ -1,114 +0,0 @@
-var migrationName = '20170616_achievements';
-var authorName = 'Sabe'; // in case script author needs to know when their ...
-var authorUuid = '7f14ed62-5408-4e1b-be83-ada62d504931'; //... own data is done
-
-/*
- * Updates to achievements for June 16, 2017 biweekly merge
- * 1. Multiply various collection quest achievements based on difficulty reduction
- * 2. Award Joined Challenge achievement to those who should have it already
- */
-
-import monk from 'monk';
-
-var connectionString = 'mongodb://localhost:27017/habitrpg?auto_reconnect=true'; // FOR TEST DATABASE
-var dbUsers = monk(connectionString).get('users', { castIds: false });
-
-function processUsers(lastId) {
-  // specify a query to limit the affected users (empty for all users):
-  var query = {
-    $or: [
-      {'achievements.quests.dilatoryDistress1': {$gt:0}},
-      {'achievements.quests.egg': {$gt:0}},
-      {'achievements.quests.goldenknight1': {$gt:0}},
-      {'achievements.quests.moonstone1': {$gt:0}},
-      {'achievements.quests.vice2': {$gt:0}},
-      {'achievements.challenges': {$exists: true, $ne: []}},
-      {'challenges': {$exists: true, $ne: []}},
-    ],
-  };
-
-  if (lastId) {
-    query._id = {
-      $gt: lastId
-    }
-  }
-
-  dbUsers.find(query, {
-    sort: {_id: 1},
-    limit: 250,
-    fields: [ // specify fields we are interested in to limit retrieved data (empty if we're not reading data):
-      'achievements',
-      'challenges',
-    ],
-  })
-  .then(updateUsers)
-  .catch(function (err) {
-    console.log(err);
-    return exiting(1, 'ERROR! ' + err);
-  });
-}
-
-var progressCount = 1000;
-var count = 0;
-
-function updateUsers (users) {
-  if (!users || users.length === 0) {
-    console.warn('All appropriate users found and modified.');
-    displayData();
-    return;
-  }
-
-  var userPromises = users.map(updateUser);
-  var lastUser = users[users.length - 1];
-
-  return Promise.all(userPromises)
-  .then(function () {
-    processUsers(lastUser._id);
-  });
-}
-
-function updateUser (user) {
-  count++;
-  var set = {'migration': migrationName};
-
-  if (user.challenges.length > 0 || user.achievements.challenges.length > 0) {
-    set['achievements.joinedChallenge'] = true;
-  }
-  if (user.achievements.quests.dilatoryDistress1) {
-    set['achievements.quests.dilatoryDistress1'] = Math.ceil(user.achievements.quests.dilatoryDistress1 * 1.25);
-  }
-  if (user.achievements.quests.egg) {
-    set['achievements.quests.egg'] = Math.ceil(user.achievements.quests.egg * 2.5);
-  }
-  if (user.achievements.quests.goldenknight1) {
-    set['achievements.quests.goldenknight1'] = user.achievements.quests.goldenknight1 * 5;
-  }
-  if (user.achievements.quests.moonstone1) {
-    set['achievements.quests.moonstone1'] = user.achievements.quests.moonstone1 * 5;
-  }
-  if (user.achievements.quests.vice2) {
-    set['achievements.quests.vice2'] = Math.ceil(user.achievements.quests.vice2 * 1.5);
-  }
-
-  dbUsers.update({_id: user._id}, {$set:set});
-
-  if (count % progressCount == 0) console.warn(count + ' ' + user._id);
-  if (user._id == authorUuid) console.warn(authorName + ' processed');
-}
-
-function displayData() {
-  console.warn('\n' + count + ' users processed\n');
-  return exiting(0);
-}
-
-function exiting(code, msg) {
-  code = code || 0; // 0 = success
-  if (code && !msg) { msg = 'ERROR!'; }
-  if (msg) {
-    if (code) { console.error(msg); }
-    else      { console.log(  msg); }
-  }
-  process.exit(code);
-}
-
-module.exports = processUsers;

migrations/20170711_orcas.js

@@ -1,90 +0,0 @@
-var migrationName = '20170711_orcas.js';
-var authorName = 'Sabe'; // in case script author needs to know when their ...
-var authorUuid = '7f14ed62-5408-4e1b-be83-ada62d504931'; //... own data is done
-
-/*
- * Award Orca pets to owners of Orca mount, and Orca mount to everyone else
- */
-
-var monk = require('monk');
-var connectionString = 'mongodb://localhost:27017/habitrpg?auto_reconnect=true'; // FOR TEST DATABASE
-var dbUsers = monk(connectionString).get('users', { castIds: false });
-
-function processUsers(lastId) {
-  // specify a query to limit the affected users (empty for all users):
-  var query = {
-    'migration':{$ne:migrationName},
-  };
-
-  if (lastId) {
-    query._id = {
-      $gt: lastId
-    }
-  }
-
-  dbUsers.find(query, {
-    sort: {_id: 1},
-    limit: 250,
-    fields: [
-      'items.mounts',
-    ] // specify fields we are interested in to limit retrieved data (empty if we're not reading data):
-  })
-  .then(updateUsers)
-  .catch(function (err) {
-    console.log(err);
-    return exiting(1, 'ERROR! ' + err);
-  });
-}
-
-var progressCount = 1000;
-var count = 0;
-
-function updateUsers (users) {
-  if (!users || users.length === 0) {
-    console.warn('All appropriate users found and modified.');
-    displayData();
-    return;
-  }
-
-  var userPromises = users.map(updateUser);
-  var lastUser = users[users.length - 1];
-
-  return Promise.all(userPromises)
-  .then(function () {
-    processUsers(lastUser._id);
-  });
-}
-
-function updateUser (user) {
-  count++;
-
-  var set = {};
-
-  if (user.items.mounts['Orca-Base']) {
-    set = {'migration':migrationName, 'items.pets.Orca-Base': 5};
-  } else {
-    set = {'migration':migrationName, 'items.mounts.Orca-Base': true};
-  }
-
-  dbUsers.update({_id: user._id}, {$set:set});
-
-  if (count % progressCount == 0) console.warn(count + ' ' + user._id);
-  if (user._id == authorUuid) console.warn(authorName + ' processed');
-}
-
-function displayData() {
-  console.warn('\n' + count + ' users processed\n');
-  return exiting(0);
-}
-
-function exiting(code, msg) {
-  code = code || 0; // 0 = success
-  if (code && !msg) { msg = 'ERROR!'; }
-  if (msg) {
-    if (code) { console.error(msg); }
-    else      { console.log(  msg); }
-  }
-  process.exit(code);
-}
-
-module.exports = processUsers;

migrations/20170731_naming_day.js

@@ -1,109 +0,0 @@
-var migrationName = '20170731_naming_day.js';
-var authorName = 'Sabe'; // in case script author needs to know when their ...
-var authorUuid = '7f14ed62-5408-4e1b-be83-ada62d504931'; //... own data is done
-
-/*
- * Award Royal Purple Gryphon Helm to Royal Purple Gryphon pet owners,
- * award Royal Purple Gryphon pet to Royal Purple Gryphon mount owners,
- * award Royal Purple Gryphon mount to everyone else
- */
-
-var monk = require('monk');
-var connectionString = 'mongodb://localhost:27017/habitrpg?auto_reconnect=true'; // FOR TEST DATABASE
-var dbUsers = monk(connectionString).get('users', { castIds: false });
-
-function processUsers(lastId) {
-  // specify a query to limit the affected users (empty for all users):
-  var query = {
-    'migration':{$ne:migrationName},
-    'auth.timestamps.loggedin': {$gt: new Date('2017-01-01')},
-  };
-
-  if (lastId) {
-    query._id = {
-      $gt: lastId
-    }
-  }
-
-  dbUsers.find(query, {
-    sort: {_id: 1},
-    limit: 250,
-    fields: [
-      'items.mounts',
-      'items.pets',
-    ] // specify fields we are interested in to limit retrieved data (empty if we're not reading data):
-  })
-  .then(updateUsers)
-  .catch(function (err) {
-    console.log(err);
-    return exiting(1, 'ERROR! ' + err);
-  });
-}
-
-var progressCount = 1000;
-var count = 0;
-
-function updateUsers (users) {
-  if (!users || users.length === 0) {
-    console.warn('All appropriate users found and modified.');
-    displayData();
-    return;
-  }
-
-  var userPromises = users.map(updateUser);
-  var lastUser = users[users.length - 1];
-
-  return Promise.all(userPromises)
-  .then(function () {
-    processUsers(lastUser._id);
-  });
-}
-
-function updateUser (user) {
-  count++;
-
-  var set = {};
-  var inc = {
-    'achievements.habiticaDays': 1,
-    'items.food.Cake_Skeleton': 1,
-    'items.food.Cake_Base': 1,
-    'items.food.Cake_CottonCandyBlue': 1,
-    'items.food.Cake_CottonCandyPink': 1,
-    'items.food.Cake_Shade': 1,
-    'items.food.Cake_White': 1,
-    'items.food.Cake_Golden': 1,
-    'items.food.Cake_Zombie': 1,
-    'items.food.Cake_Desert': 1,
-    'items.food.Cake_Red': 1
-  };
-
-  if (user.items.pets['Gryphon-RoyalPurple']) {
-    set = {'migration':migrationName, 'items.gear.owned.head_special_namingDay2017': false};
-  } else if (user.items.mounts['Gryphon-RoyalPurple']) {
-    set = {'migration':migrationName, 'items.pets.Gryphon-RoyalPurple': 5};
-  } else {
-    set = {'migration':migrationName, 'items.mounts.Gryphon-RoyalPurple': true};
-  }
-
-  dbUsers.update({_id: user._id}, {$set: set, $inc: inc});
-
-  if (count % progressCount == 0) console.warn(count + ' ' + user._id);
-  if (user._id == authorUuid) console.warn(authorName + ' processed');
-}
-
-function displayData() {
-  console.warn('\n' + count + ' users processed\n');
-  return exiting(0);
-}
-
-function exiting(code, msg) {
-  code = code || 0; // 0 = success
-  if (code && !msg) { msg = 'ERROR!'; }
-  if (msg) {
-    if (code) { console.error(msg); }
-    else      { console.log(  msg); }
-  }
-  process.exit(code);
-}
-
-module.exports = processUsers;

migrations/20170928_redesign_guilds.js

@@ -1,97 +0,0 @@
-var migrationName = '20170928_redesign_guilds.js';
-
-/*
- * Copy Guild Leader messages to end of Guild descriptions
- * Copy Guild logos to beginning of Guild descriptions
- */
-
-var monk = require('monk');
-var connectionString = 'mongodb://localhost:27017/habitrpg?auto_reconnect=true'; // FOR TEST DATABASE
-var dbGroups = monk(connectionString).get('groups', { castIds: false });
-
-function processGroups(lastId) {
-  // specify a query to limit the affected groups (empty for all groups):
-  var query = {
-  };
-
-  var fields = {
-    'description': 1,
-    'logo': 1,
-    'leaderMessage': 1,
-  }
-
-  if (lastId) {
-    query._id = {
-      $gt: lastId
-    }
-  }
-
-  return dbGroups.find(query, {
-    fields: fields,
-    sort: {_id: 1},
-    limit: 250,
-  })
-  .then(updateGroups)
-  .catch(function (err) {
-    console.log(err);
-    return exiting(1, 'ERROR! ' + err);
-  });
-}
-
-var progressCount = 1000;
-var count = 0;
-
-function updateGroups (groups) {
-  if (!groups || groups.length === 0) {
-    console.warn('All appropriate groups found and modified.');
-    displayData();
-    return;
-  }
-
-  var groupPromises = groups.map(updateGroup);
-  var lastGroup = groups[groups.length - 1];
-
-  return Promise.all(groupPromises)
-  .then(function () {
-    processGroups(lastGroup._id);
-  });
-}
-
-function updateGroup (group) {
-  count++;
-
-  var description = group.description;
-
-  if (group.logo) {
-    description = '![Guild Logo](' + group.logo + ')\n\n \n\n' + description;
-  }
-
-  if (group.leaderMessage) {
-    description = description + '\n\n \n\n' + group.leaderMessage;
-  }
-
-  var set = {
-    description: description,
-  };
-
-  if (count % progressCount == 0) console.warn(count + ' ' + group._id);
-
-  return dbGroups.update({_id: group._id}, {$set:set});
-}
-
-function displayData() {
-  console.warn('\n' + count + ' groups processed\n');
-  return exiting(0);
-}
-
-function exiting(code, msg) {
-  code = code || 0; // 0 = success
-  if (code && !msg) { msg = 'ERROR!'; }
-  if (msg) {
-    if (code) { console.error(msg); }
-    else      { console.log(  msg); }
-  }
-  process.exit(code);
-}
-
-module.exports = processGroups;

migrations/20170928_redesign_launch.js

@@ -1,128 +0,0 @@
-import { selectGearToPin } from '../website/common/script/ops/pinnedGearUtils';
-
-var getItemInfo = require('../website/common/script/libs/getItemInfo');
-
-var migrationName = '20170928_redesign_launch.js';
-var authorName = 'paglias'; // in case script author needs to know when their ...
-var authorUuid = 'ed4c688c-6652-4a92-9d03-a5a79844174a'; //... own data is done
-
-/*
- * Migrate existing in app rewards lists to pinned items
- * Award Veteran Pets
- */
-
-var monk = require('monk');
-var connectionString = 'mongodb://localhost:27017/habitrpg?auto_reconnect=true'; // FOR TEST DATABASE
-var dbUsers = monk(connectionString).get('users', { castIds: false });
-
-function processUsers(lastId) {
-  // specify a query to limit the affected users (empty for all users):
-  var query = {
-    'migration': {$ne:migrationName},
-    'auth.timestamps.loggedin': {$gt: new Date('2017-09-21')},
-  };
-
-  var fields = {
-    'items.pets': 1,
-    'items.gear': 1,
-    'stats.class': 1,
-  }
-
-  if (lastId) {
-    query._id = {
-      $gt: lastId
-    }
-  }
-
-  return dbUsers.find(query, {
-    fields: fields,
-    sort: {_id: 1},
-    limit: 250,
-  })
-  .then(updateUsers)
-  .catch(function (err) {
-    console.log(err);
-    return exiting(1, 'ERROR! ' + err);
-  });
-}
-
-var progressCount = 1000;
-var count = 0;
-
-function updateUsers (users) {
-  if (!users || users.length === 0) {
-    console.warn('All appropriate users found and modified.');
-    displayData();
-    return;
-  }
-
-  var userPromises = users.map(updateUser);
-  var lastUser = users[users.length - 1];
-
-  return Promise.all(userPromises)
-  .then(function () {
-    processUsers(lastUser._id);
-  });
-}
-
-function updateUser (user) {
-  count++;
-
-  var set = {'migration': migrationName};
-
-  var oldRewardsList = selectGearToPin(user);
-  var newPinnedItems = [
-    {
-      type: 'armoire',
-      path: 'armoire',
-    },
-    {
-      type: 'potion',
-      path: 'potion',
-    },
-  ];
-
-  oldRewardsList.forEach(item => {
-    var type = 'marketGear';
-
-    var itemInfo = getItemInfo(user, 'marketGear', item);
-    newPinnedItems.push({
-      type,
-      path: itemInfo.path,
-    })
-  });
-
-  set.pinnedItems = newPinnedItems;
-
-  if (user.items.pets['Lion-Veteran']) {
-    set['items.pets.Bear-Veteran'] = 5;
-  } else if (user.items.pets['Tiger-Veteran']) {
-    set['items.pets.Lion-Veteran'] = 5;
-  } else if (user.items.pets['Wolf-Veteran']) {
-    set['items.pets.Tiger-Veteran'] = 5;
-  } else {
-    set['items.pets.Wolf-Veteran'] = 5;
-  }
-
-  if (count % progressCount == 0) console.warn(count + ' ' + user._id);
-  if (user._id == authorUuid) console.warn(authorName + ' processed');
-
-  return dbUsers.update({_id: user._id}, {$set:set});
-}
-
-function displayData() {
-  console.warn('\n' + count + ' users processed\n');
-  return exiting(0);
-}
-
-function exiting(code, msg) {
-  code = code || 0; // 0 = success
-  if (code && !msg) { msg = 'ERROR!'; }
-  if (msg) {
-    if (code) { console.error(msg); }
-    else      { console.log(  msg); }
-  }
-  process.exit(code);
-}
-
-module.exports = processUsers;

migrations/challenges/sync-all-challenges.js

@@ -1,47 +1,47 @@
-import Bluebird from 'Bluebird';
-
-import { model as Challenges } from '../../website/server/models/challenge';
-import { model as User } from '../../website/server/models/user';
-
-async function syncChallengeToMembers (challenges) {
-  let challengSyncPromises = challenges.map(async function (challenge) {
-    let users = await User.find({
-      // _id: '',
-      challenges: challenge._id,
-    }).exec();
-
-    let promises = [];
-    users.forEach(function (user) {
-      promises.push(challenge.syncToUser(user));
-      promises.push(challenge.save());
-      promises.push(user.save());
-    });
-
-    return Bluebird.all(promises);
-  });
-
-  return await Bluebird.all(challengSyncPromises);
-}
-
-async function syncChallenges (lastChallengeDate) {
-  let query = {
-    // _id: '',
-  };
-
-  if (lastChallengeDate) {
-    query.createdOn = { $lte: lastChallengeDate };
-  }
-
-  let challengesFound = await Challenges.find(query)
-    .limit(10)
-    .sort('-createdAt')
-    .exec();
-
-  let syncedChallenges = await syncChallengeToMembers(challengesFound)
-    .catch(reason => console.error(reason));
-  let lastChallenge = challengesFound[challengesFound.length - 1];
-  if (lastChallenge) syncChallenges(lastChallenge.createdAt);
-  return syncedChallenges;
-};
-
-module.exports = syncChallenges;
+import Bluebird from 'Bluebird';
+
+import { model as Challenges } from '../../website/server/models/challenge';
+import { model as User } from '../../website/server/models/user';
+
+async function syncChallengeToMembers (challenges) {
+  let challengSyncPromises = challenges.map(async function (challenge) {
+    let users = await User.find({
+      // _id: '',
+      challenges: challenge._id,
+    }).exec();
+
+    let promises = [];
+    users.forEach(function (user) {
+      promises.push(challenge.syncToUser(user));
+      promises.push(challenge.save());
+      promises.push(user.save());
+    });
+
+    return Bluebird.all(promises);
+  });
+
+  return await Bluebird.all(challengSyncPromises);
+}
+
+async function syncChallenges (lastChallengeDate) {
+  let query = {
+    // _id: '',
+  };
+
+  if (lastChallengeDate) {
+    query.createdOn = { $lte: lastChallengeDate };
+  }
+
+  let challengesFound = await Challenges.find(query)
+    .limit(10)
+    .sort('-createdAt')
+    .exec();
+
+  let syncedChallenges = await syncChallengeToMembers(challengesFound)
+    .catch(reason => console.error(reason));
+  let lastChallenge = challengesFound[challengesFound.length - 1];
+  if (lastChallenge) syncChallenges(lastChallenge.createdAt);
+  return syncedChallenges;
+};
+
+module.exports = syncChallenges;

migrations/migration-runner.js

@@ -21,4 +21,4 @@ var processUsers = require('./groups/update-groups-with-group-plans');
 processUsers()
   .catch(function (err) {
       console.log(err)
-  })
+  })

migrations/mystery_items.js

@@ -2,7 +2,7 @@ var _id = '';
 var update = {
   $addToSet: {
     'purchased.plan.mysteryItems':{
-      $each:['shield_mystery_201709','back_mystery_201709']
+      $each:['head_mystery_201703','armor_mystery_201703']
     }
   }
 };

migrations/s3-upload.js

@@ -1,98 +0,0 @@
-let Bluebird = require('bluebird');
-let request = require('superagent');
-let last = require('lodash/last');
-let AWS = require('aws-sdk');
-
-let config = require('../config');
-const S3_DIRECTORY = 'mobileApp/images'; //config.S3.SPRITES_DIRECTORY;
-
-AWS.config.update({
-  accessKeyId: config.S3.accessKeyId,
-  secretAccessKey: config.S3.secretAccessKey,
-  // region: config.get('S3_REGION'),
-});
-
-let BUCKET_NAME = config.S3.bucket;
-let s3 = new AWS.S3();
-
-// Adapted from http://stackoverflow.com/a/22210077/2601552
-function uploadFile (buffer, fileName) {
-  return new Promise((resolve, reject) => {
-    s3.putObject({
-      Body: buffer,
-      Key: fileName,
-      Bucket: BUCKET_NAME,
-    }, (error) => {
-      if (error) {
-        reject(error);
-      } else {
-        // console.info(`${fileName} uploaded to ${BUCKET_NAME} succesfully.`);
-        resolve(fileName);
-      }
-    });
-  });
-}
-
-function getFileName (file) {
-  let piecesOfPath = file.split('/');
-  let name = last(piecesOfPath);
-  let fullName = S3_DIRECTORY + name;
-
-  return fullName;
-}
-
-function getFileFromUrl (url) {
-  return new Promise((resolve, reject) => {
-    request.get(url).end((err, res) => {
-      if (err) return reject(err);
-      let file = res.body;
-      resolve(file);
-    });
-  });
-}
-
-let commit = '78f94e365c72cc58f66857d5941105638db7d35c';
-commit = 'df0dbaba636c9ce424cc7040f7bd7fc1aa311015';
-let gihuburl = `https://api.github.com/repos/HabitRPG/habitica/commits/${commit}`
-
-
-let currentIndex = 0;
-
-function uploadToS3(start, end, filesUrls) {
-  let urls = filesUrls.slice(start, end);
-
-  if (urls.length === 0) {
-    console.log("done");
-    return;
-  }
-
-  let promises = urls.map(fullUrl => {
-    return getFileFromUrl(fullUrl)
-    .then((buffer) => {
-      return uploadFile(buffer, getFileName(fullUrl));
-    });
-  });
-  console.log(promises.length)
-
-  return Bluebird.all(promises)
-    .then(() => {
-      currentIndex += 50;
-      uploadToS3(currentIndex, currentIndex + 50, filesUrls);
-    })
-    .catch(e => {
-      console.log(e);
-    });
-}
-
-request.get(gihuburl)
-  .end((err, res) => {
-    console.log(err);
-    let files = res.body.files;
-
-    let filesUrls = [''];
-    filesUrls = files.map(file => {
-      return file.raw_url;
-    })
-
-    uploadToS3(currentIndex, currentIndex + 50, filesUrls);
-  });

migrations/takeThis.js

@@ -1,4 +1,4 @@
-var migrationName = '20170502_takeThis.js'; // Update per month
+var migrationName = '20170201_takeThis.js'; // Update per month
 var authorName = 'Sabe'; // in case script author needs to know when their ...
 var authorUuid = '7f14ed62-5408-4e1b-be83-ada62d504931'; //... own data is done
 
@@ -14,7 +14,7 @@ function processUsers(lastId) {
   // specify a query to limit the affected users (empty for all users):
   var query = {
     'migration':{$ne:migrationName},
-    'challenges':{$in:['69999331-d4ea-45a0-8c3f-f725d22b56c8']} // Update per month
+    'challenges':{$in:['b1d436b5-c784-42e3-9b07-7072479a6f8e']} // Update per month
   };
 
   if (lastId) {

migrations/tasks/tasks-set-yesterdailies.js

@@ -1,83 +0,0 @@
-var migrationName = 'tasks-set-yesterdaily';
-var authorName = 'TheHollidayInn'; // in case script author needs to know when their ...
-var authorUuid = ''; //... own data is done
-
-/*
- * Iterates over all tasks and sets the yseterDaily field to True
- */
-
-import monk from 'monk';
-
-var connectionString = 'mongodb://localhost:27017/habitrpg?auto_reconnect=true'; // FOR TEST DATABASE
-var dbTasks = monk(connectionString).get('tasks', { castIds: false });
-
-function processTasks(lastId) {
-  // specify a query to limit the affected tasks (empty for all tasks):
-  var query = {
-    yesterDaily: false,
-  };
-
-  if (lastId) {
-    query._id = {
-      $gt: lastId
-    }
-  }
-
-  dbTasks.find(query, {
-    sort: {_id: 1},
-    limit: 250,
-    fields: [ // specify fields we are interested in to limit retrieved data (empty if we're not reading data):
-    ],
-  })
-  .then(updateTasks)
-  .catch(function (err) {
-    console.log(err);
-    return exiting(1, 'ERROR! ' + err);
-  });
-}
-
-var progressCount = 1000;
-var count = 0;
-
-function updateTasks (tasks) {
-  if (!tasks || tasks.length === 0) {
-    console.warn('All appropriate tasks found and modified.');
-    displayData();
-    return;
-  }
-
-  var taskPromises = tasks.map(updatetask);
-  var lasttask = tasks[tasks.length - 1];
-
-  return Promise.all(taskPromises)
-  .then(function () {
-    processtasks(lasttask._id);
-  });
-}
-
-function updatetask (task) {
-  count++;
-  var set = {'yesterDaily': true};
-
-  dbTasks.update({_id: task._id}, {$set:set});
-
-  if (count % progressCount == 0) console.warn(count + ' ' + task._id);
-  if (task._id == authorUuid) console.warn(authorName + ' processed');
-}
-
-function displayData() {
-  console.warn('\n' + count + ' tasks processed\n');
-  return exiting(0);
-}
-
-function exiting(code, msg) {
-  code = code || 0; // 0 = success
-  if (code && !msg) { msg = 'ERROR!'; }
-  if (msg) {
-    if (code) { console.error(msg); }
-    else      { console.log(  msg); }
-  }
-  process.exit(code);
-}
-
-module.exports = processtasks;

migrations/users/users-to-test.js

@@ -1,109 +0,0 @@
-var migrationName = 'UserFromProdToTest';
-var authorName = 'TheHollidayInn'; // in case script author needs to know when their ...
-var authorUuid = ''; //... own data is done
-
-/*
- * This migraition will copy user data from prod to test
- */
-
-var monk = require('monk');
-var testConnectionSting = ''; // FOR TEST DATABASE
-var usersTest = monk(testConnectionSting).get('users', { castIds: false });
-var groupsTest = monk(testConnectionSting).get('groups', { castIds: false });
-var challengesTest = monk(testConnectionSting).get('challenges', { castIds: false });
-var tasksTest = monk(testConnectionSting).get('tasks', { castIds: false });
-
-var monk2 = require('monk');
-var liveConnectString = ''; // FOR TEST DATABASE
-var userLive = monk2(liveConnectString).get('users', { castIds: false });
-var groupsLive = monk2(liveConnectString).get('groups', { castIds: false });
-var challengesLive = monk2(liveConnectString).get('challenges', { castIds: false });
-var tasksLive = monk2(liveConnectString).get('tasks', { castIds: false });
-
-import uniq from 'lodash/uniq';
-import Bluebird from 'bluebird';
-
-// Variabls for updating
-let userIds = [
-  '206039c6-24e4-4b9f-8a31-61cbb9aa3f66',
-];
-
-let groupIds = [];
-let challengeIds = [];
-let tasksIds = [];
-
-async function processUsers () {
-  let userPromises = [];
-  //{_id: {$in: userIds}}
-
-  return userLive.find({guilds: 'b0764d64-8276-45a1-afa5-5ca9a5c64ca0'})
-    .each((user, {close, pause, resume}) => {
-      if (user.guilds.length > 0) groupIds = groupIds.concat(user.guilds);
-      if (user.party._id) groupIds.push(user.party._id);
-      if (user.challenges.length > 0) challengeIds = challengeIds.concat(user.challenges);
-      if (user.tasksOrder.rewards.length > 0) tasksIds = tasksIds.concat(user.tasksOrder.rewards);
-      if (user.tasksOrder.todos.length > 0) tasksIds = tasksIds.concat(user.tasksOrder.todos);
-      if (user.tasksOrder.dailys.length > 0) tasksIds = tasksIds.concat(user.tasksOrder.dailys);
-      if (user.tasksOrder.habits.length > 0) tasksIds = tasksIds.concat(user.tasksOrder.habits);
-
-      let userPromise = usersTest.update({'_id': user._id}, user, {upsert:true});
-      userPromises.push(userPromise);
-    }).then(() => {
-      return Bluebird.all(userPromises);
-    })
-    .then(() => {
-      console.log("Done User");
-    });
-}
-
-function processGroups () {
-  let promises = [];
-  let groupsToQuery = uniq(groupIds);
-  return groupsLive.find({_id: {$in: groupsToQuery}})
-    .each((group, {close, pause, resume}) => {
-      let promise = groupsTest.update({_id: group._id}, group, {upsert:true});
-      promises.push(promise);
-    }).then(() => {
-      return Bluebird.all(promises);
-    })
-    .then(() => {
-      console.log("Done Group");
-    });
-}
-
-function processChallenges () {
-  let promises = [];
-  let challengesToQuery = uniq(challengeIds);
-  return challengesLive.find({_id: {$in: challengesToQuery}})
-    .each((challenge, {close, pause, resume}) => {
-      let promise = challengesTest.update({_id: challenge._id}, challenge, {upsert:true});
-      promises.push(promise);
-    }).then(() => {
-      return Bluebird.all(promises);
-    })
-    .then(() => {
-      console.log("Done Challenge");
-    });
-}
-
-function processTasks () {
-  let promises = [];
-  let tasksToQuery = uniq(tasksIds);
-  return tasksLive.find({_id: {$in: tasksToQuery}})
-    .each((task, {close, pause, resume}) => {
-      let promise = tasksTest.update({_id: task._id}, task, {upsert:true});
-      promises.push(promise);
-    }).then(() => {
-      return Bluebird.all(promises);
-    })
-    .then(() => {
-      console.log("Done Tasks");
-    });
-}
-
-module.exports = async function prodToTest () {
-  await processUsers();
-  await processGroups();
-  await processChallenges();
-  await processTasks();
-};

package.json

@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.4.0",
+  "version": "3.83.4",
   "main": "./website/server/index.js",
   "dependencies": {
     "@slack/client": "^3.8.1",
@@ -13,13 +13,10 @@
     "async": "^1.5.0",
     "autoprefixer": "^6.4.0",
     "aws-sdk": "^2.0.25",
-    "axios": "^0.16.0",
-    "axios-progress-bar": "^0.1.7",
+    "axios": "^0.15.3",
     "babel-core": "^6.0.0",
-    "babel-eslint": "^7.2.3",
     "babel-loader": "^6.0.0",
     "babel-plugin-syntax-async-functions": "^6.13.0",
-    "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babel-plugin-transform-async-to-module-method": "^6.8.0",
     "babel-plugin-transform-object-rest-spread": "^6.16.0",
     "babel-plugin-transform-regenerator": "^6.16.1",
@@ -31,17 +28,16 @@
     "bcrypt": "^1.0.2",
     "bluebird": "^3.3.5",
     "body-parser": "^1.15.0",
-    "bootstrap": "4.0.0-alpha.6",
-    "bootstrap-vue": "1.0.0-beta.7",
+    "bootstrap": "^4.0.0-alpha.6",
+    "bower": "~1.3.12",
     "browserify": "~12.0.1",
     "compression": "^1.6.1",
     "connect-ratelimit": "0.0.7",
     "cookie-session": "^1.2.0",
     "coupon-code": "^0.4.5",
-    "cross-env": "^4.0.0",
-    "css-loader": "^0.28.0",
+    "css-loader": "^0.26.1",
     "csv-stringify": "^1.0.2",
-    "cwait": "~1.0.1",
+    "cwait": "^1.0.0",
     "domain-middleware": "~0.1.0",
     "estraverse": "^4.1.1",
     "express": "~4.14.0",
@@ -52,28 +48,36 @@
     "file-loader": "^0.10.0",
     "glob": "^4.3.5",
     "got": "^6.1.1",
+    "grunt": "~0.4.1",
+    "grunt-cli": "~0.1.9",
+    "grunt-contrib-clean": "~0.6.0",
+    "grunt-contrib-copy": "~0.6.0",
+    "grunt-contrib-cssmin": "~0.10.0",
+    "grunt-contrib-stylus": "~0.20.0",
+    "grunt-contrib-uglify": "~0.6.0",
+    "grunt-contrib-watch": "~0.6.1",
+    "grunt-hashres": "habitrpg/grunt-hashres#v0.4.2",
     "gulp": "^3.9.0",
     "gulp-babel": "^6.1.2",
+    "gulp-grunt": "^0.5.2",
     "gulp-imagemin": "^2.4.0",
     "gulp-nodemon": "^2.0.4",
     "gulp-sourcemaps": "^1.6.0",
     "gulp-uglify": "^1.4.2",
     "gulp.spritesmith": "^4.1.0",
     "habitica-markdown": "^1.3.0",
-    "hellojs": "^1.15.1",
     "html-webpack-plugin": "^2.8.1",
     "image-size": "~0.3.2",
     "in-app-purchase": "^1.1.6",
-    "intro.js": "^2.6.0",
     "jade": "~1.11.0",
-    "jquery": ">=3.0.0",
+    "jquery": "^3.1.1",
     "js2xmlparser": "~1.0.0",
     "lodash": "^4.17.4",
     "merge-stream": "^1.0.0",
     "method-override": "^2.3.5",
     "moment": "^2.13.0",
-    "moment-recur": "git://github.com/habitrpg/moment-recur#f147ef27bbc26ca67638385f3db4a44084c76626",
-    "mongoose": "~4.8.6",
+    "moment-recur": "habitrpg/moment-recur#v1.0.6",
+    "mongoose": "^4.8.6",
     "mongoose-id-autoinc": "~2013.7.14-4",
     "morgan": "^1.7.0",
     "nconf": "~0.8.2",
@@ -89,12 +93,11 @@
     "passport-google-oauth20": "1.0.0",
     "paypal-ipn": "3.0.0",
     "paypal-rest-sdk": "^1.2.1",
-    "popper.js": "^1.11.0",
     "postcss-easy-import": "^2.0.0",
     "pretty-data": "^0.40.0",
     "ps-tree": "^1.0.0",
-    "pug": "^2.0.0-beta.12",
-    "push-notify": "git://github.com/habitrpg/push-notify#6bc2b5fdb1bdc9649b9ec1964d79ca50187fc8a9",
+    "pug": "^2.0.0-beta11",
+    "push-notify": "habitrpg/push-notify#v1.2.0",
     "pusher": "^1.3.0",
     "request": "~2.74.0",
     "rimraf": "^2.4.3",
@@ -103,12 +106,8 @@
     "sass-loader": "^6.0.2",
     "serve-favicon": "^2.3.0",
     "shelljs": "^0.7.6",
-    "sortablejs": "^1.6.1",
     "stripe": "^4.2.0",
     "superagent": "^3.4.3",
-    "svg-inline-loader": "^0.7.1",
-    "svg-url-loader": "^2.0.2",
-    "svgo-loader": "^1.2.1",
     "universal-analytics": "~0.3.2",
     "url-loader": "^0.5.7",
     "useragent": "^2.1.9",
@@ -120,43 +119,45 @@
     "vue-loader": "^11.0.0",
     "vue-mugen-scroll": "^0.2.1",
     "vue-router": "^2.0.0-rc.5",
-    "vue-style-loader": "^3.0.0",
+    "vue-style-loader": "^2.0.0",
     "vue-template-compiler": "^2.1.10",
-    "vuejs-datepicker": "git://github.com/habitrpg/vuejs-datepicker#45e607a7bccf4e3e089761b3b7b33e3f2c5dc21f",
     "webpack": "^2.2.1",
-    "webpack-merge": "^4.0.0",
+    "webpack-merge": "^2.6.1",
     "winston": "^2.1.0",
-    "winston-loggly-bulk": "^1.4.2",
     "xml2js": "^0.4.4"
   },
   "private": true,
   "engines": {
     "node": "^6.9.1",
-    "npm": "^5.0.0"
+    "npm": "^4.0.2"
   },
   "scripts": {
     "lint": "eslint --ext .js,.vue .",
-    "test": "npm run lint && gulp test && npm run client:unit && gulp apidoc",
+    "test": "npm run lint && gulp test && npm run client:unit",
     "test:build": "gulp test:prepare:build",
     "test:api-v3": "gulp test:api-v3",
     "test:api-v3:unit": "gulp test:api-v3:unit",
     "test:api-v3:integration": "gulp test:api-v3:integration",
     "test:api-v3:integration:separate-server": "NODE_ENV=test gulp test:api-v3:integration:separate-server",
-    "test:sanity": "istanbul cover --dir coverage/sanity --report lcovonly node_modules/mocha/bin/_mocha -- test/sanity --recursive",
-    "test:common": "istanbul cover --dir coverage/common --report lcovonly node_modules/mocha/bin/_mocha -- test/common --recursive",
-    "test:content": "istanbul cover --dir coverage/content --report lcovonly node_modules/mocha/bin/_mocha -- test/content --recursive",
+    "test:sanity": "mocha test/sanity --recursive",
+    "test:common": "mocha test/common --recursive",
+    "test:content": "mocha test/content --recursive",
+    "test:karma": "karma start test/client-old/spec/karma.conf.js --single-run",
+    "test:karma:watch": "karma start test/client-old/spec/karma.conf.js",
+    "test:prepare:webdriver": "webdriver-manager update",
+    "test:e2e:webdriver": "webdriver-manager start",
+    "test:e2e": "protractor test/client-old/e2e/protractor.conf.js",
     "test:nodemon": "gulp test:nodemon",
     "coverage": "COVERAGE=true mocha --require register-handlers.js --reporter html-cov > coverage.html; open coverage.html",
     "sprites": "gulp sprites:compile",
-    "client:dev": "gulp bootstrap && node webpack/dev-server.js",
-    "client:build": "gulp build:client",
+    "client:dev": "node webpack/dev-server.js",
+    "client:build": "node webpack/build.js",
     "client:unit": "cross-env NODE_ENV=test karma start test/client/unit/karma.conf.js --single-run",
     "client:unit:watch": "cross-env NODE_ENV=test karma start test/client/unit/karma.conf.js",
     "client:e2e": "node test/client/e2e/runner.js",
     "client:test": "npm run client:unit && npm run client:e2e",
-    "start": "gulp nodemon",
-    "postinstall": "gulp build",
-    "apidoc": "gulp apidoc"
+    "start": "gulp run:dev",
+    "postinstall": "bower --config.interactive=false install -f; gulp build; npm run client:build"
   },
   "devDependencies": {
     "babel-plugin-istanbul": "^4.0.0",
@@ -166,6 +167,7 @@
     "chromedriver": "^2.27.2",
     "connect-history-api-fallback": "^1.1.0",
     "coveralls": "^2.11.2",
+    "cross-env": "^3.1.4",
     "cross-spawn": "^5.0.1",
     "csv": "~0.3.6",
     "deep-diff": "~0.1.4",
@@ -178,9 +180,10 @@
     "event-stream": "^3.2.2",
     "eventsource-polyfill": "^0.9.6",
     "expect.js": "~0.2.0",
+    "grunt-karma": "~0.12.1",
     "http-proxy-middleware": "^0.17.0",
     "inject-loader": "^3.0.0-beta4",
-    "istanbul": "^1.1.0-alpha.1",
+    "istanbul": "^0.3.14",
     "karma": "^1.3.0",
     "karma-babel-preprocessor": "^6.0.1",
     "karma-chai-plugins": "~0.6.0",
@@ -188,21 +191,20 @@
     "karma-mocha": "^0.2.0",
     "karma-mocha-reporter": "^1.1.1",
     "karma-phantomjs-launcher": "^1.0.0",
-    "karma-sinon-chai": "~1.2.0",
+    "karma-sinon-chai": "^1.2.0",
     "karma-sinon-stub-promise": "^1.0.0",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.24",
     "karma-webpack": "^2.0.2",
     "lcov-result-merger": "^1.0.2",
     "lolex": "^1.4.0",
-    "mocha": "^3.2.0",
+    "mocha": "^2.3.3",
     "mongodb": "^2.0.46",
     "mongoskin": "~2.1.0",
     "monk": "^4.0.0",
     "nightwatch": "^0.9.12",
     "phantomjs-prebuilt": "^2.1.12",
     "protractor": "^3.1.1",
-    "raw-loader": "^0.5.1",
     "require-again": "^2.0.0",
     "rewire": "^2.3.3",
     "selenium-server": "^3.0.1",

scripts/paypalBillingSetup.js

@@ -1,5 +1,3 @@
-require("babel-register");
-require("babel-polyfill");
 // This file is used for creating paypal billing plans. PayPal doesn't have a web interface for setting up recurring
 // payment plan definitions, instead you have to create it via their REST SDK and keep it updated the same way. So this
 // file will be used once for initing your billing plan (then you get the resultant plan.id to store in config.json),
@@ -9,10 +7,10 @@ var path = require('path');
 var nconf = require('nconf');
 var _ = require('lodash');
 var paypal = require('paypal-rest-sdk');
-var blocks = require('../website/common').content.subscriptionBlocks;
+var blocks = require('../../../../common').content.subscriptionBlocks;
 var live = nconf.get('PAYPAL:mode')=='live';
 
-nconf.argv().env().file('user', path.join(path.resolve(__dirname, '../config.json')));
+nconf.argv().env().file('user', path.join(path.resolve(__dirname, '../../../config.json')));
 
 var OP = 'create'; // list create update remove
 
@@ -51,8 +49,6 @@ _.each(blocks, function(block){
   });
 })
 
-// @TODO: Add cli library for this
-
 switch(OP) {
   case "list":
     paypal.billingPlan.list({status: 'ACTIVE'}, function(err, plans){
@@ -95,17 +91,4 @@ switch(OP) {
     });
     break;
   case "remove": break;
-
-  case 'create-webprofile':
-    let webexpinfo = {
-      "name": "HabiticaProfile",
-      "input_fields": {
-        "no_shipping": 1,
-      },
-    };
-
-    paypal.webProfile.create(webexpinfo, (error, result) => {
-      console.log(error, result)
-    })
-    break;
 }

test/README.md

@@ -1 +0,0 @@
-For information about writing and running tests, see [Using Your Local Install to Modify Habitica's Website and API](http://habitica.wikia.com/wiki/Using_Your_Local_Install_to_Modify_Habitica%27s_Website_and_API).

test/api/README.md

@@ -0,0 +1,123 @@
+# So you want to write API integration tests?
+
+@TODO rewrite
+
+That's great! This README will serve as a quick primer for style conventions and practices for these tests.
+
+## What is this?
+
+These are integration tests for the Habitica API. They are performed by making HTTP requests to the API's endpoints and asserting on the data that is returned.
+
+If the javascript looks weird to you, that's because it's written in [ES2015](http://www.ecma-international.org/ecma-262/6.0/) and transpiled by [Babel](https://babeljs.io/docs/learn-es2015/).
+
+## How to run the tests
+
+First, install gulp.
+
+```bash
+$ npm install -g gulp
+```
+
+To run the api tests, make sure the mongo db is up and running and then type this on the command line:
+
+```bash
+$ gulp test:api-v2
+```
+
+It may take a little while to get going, since it requires the web server to start up before the tests can run.
+
+You can also run a watch command for the api tests. This will allow the tests to re-run automatically when you make changes in the `/test/api/v2/`.
+
+```bash
+$ gulp test:api-v2:watch
+```
+
+One caveat. If you have a severe syntax error in your files, the tests may fail to run, but they won't alert you that they are not running. If you ever find your test hanging for a while, run this to get the stackstrace. Once you've fixed the problem, you can resume running the watch comand.
+
+```bash
+$ gulp test:api:safe
+```
+
+If you'd like to run the tests individually and inspect the output from the server, in one pane you can run:
+
+```bash
+$ gulp test:nodemon
+```
+
+And run your tests in another pane:
+
+```bash
+$ mocha path/to/file.js
+
+# Mark a test with the `.only` attribute
+$ mocha
+```
+
+## Structure
+
+Each top level route has it's own directory. So, all the routes that begin with `/groups/` live in `/test/api/groups/`.
+
+Each test should:
+
+  * encompase a single route
+  * begin with the REST parameter for the route
+  * display the full name of the route, swapping out `/` for `_`
+  * end with test.js
+
+So, for the `POST` route `/groups/:id/leave`, it would be
+
+```bash
+POST-groups_id_leave.test.js
+```
+
+## Promises
+
+To mitigate [callback hell](http://callbackhell.com/) :imp:, we've written a helper method to generate a user object that can make http requests that [return promises](https://babeljs.io/docs/learn-es2015/#promises).  This makes it very easy to chain together commands. All you need to do to make a subsequent request is return another promise and then call `.then((result) => {})` on the surrounding block, like so:
+
+```js
+it('does something', () => {
+  let user;
+
+  return generateUser().then((_user) => { // We return the initial promise so this test can be run asyncronously
+    user = _user;
+
+    return user.post('/groups', {
+      type: 'party',
+    });
+  }).then((party) => { // the result of the promise above is the argument of the function
+    return user.put(`/groups/${party._id}`, {
+      name: 'My party',
+    });
+  }).then((result) => {
+    return user.get('/groups/party');
+  }).then((party) => {
+    expect(party.name).to.eql('My party');
+  });
+});
+```
+
+If the test is simple, you can use the [chai-as-promised](http://chaijs.com/plugins/chai-as-promised) `return expect(somePromise).to.eventually` syntax to make your assertion.
+
+```js
+it('makes the party creator the leader automatically', () => {
+  return expect(user.post('/groups', {
+    type: 'party',
+  })).to.eventually.have.deep.property('leader._id', user._id);
+});
+```
+
+If the test is checking that the request returns an error, use the `.eventually.be.rejected.and.eql` syntax.
+
+```js
+it('returns an error', () => {
+  return expect(user.get('/groups/id-of-a-party-that-user-does-not-belong-to'))
+    .to.eventually.be.rejected.and.eql({
+      code: 404,
+      text: t('messageGroupNotFound'),
+    });
+});
+```
+
+## Questions?
+
+Ask in the [Aspiring Coder's Guild](https://habitica.com/#/options/groups/guilds/68d4a01e-db97-4786-8ee3-05d612c5af6f)!

test/api/v3/README.md

@@ -0,0 +1,4 @@
+# How to run tests:
+
+1. `npm test` is equivalent to `gulp test:api-v3` which will run, in order, `gulp lint`, `gulp test:api-v3:unit` and `gulp test:api-v3:integration`. If one of these fails, the whole `npm test` command blocks and fails.  Each of these commands can also be run as a standalone command. 
+2. To run the server and the integrations tests in two different terminals (to better inspect the output in the server) run `npm start` in one and `npm test:api-v3:integration:separate-server` in the other

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

@@ -48,10 +48,8 @@ describe('GET /challenges/:challengeId', () => {
       });
       expect(chal.group).to.eql({
         _id: group._id,
-        categories: [],
         id: group.id,
         name: group.name,
-        summary: group.name,
         type: group.type,
         privacy: group.privacy,
         leader: groupLeader.id,
@@ -102,10 +100,8 @@ describe('GET /challenges/:challengeId', () => {
       });
       expect(chal.group).to.eql({
         _id: group._id,
-        categories: [],
         id: group.id,
         name: group.name,
-        summary: group.name,
         type: group.type,
         privacy: group.privacy,
         leader: groupLeader.id,
@@ -157,9 +153,7 @@ describe('GET /challenges/:challengeId', () => {
       expect(chal.group).to.eql({
         _id: group._id,
         id: group.id,
-        categories: [],
         name: group.name,
-        summary: group.name,
         type: group.type,
         privacy: group.privacy,
         leader: groupLeader.id,

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

@@ -142,22 +142,4 @@ describe('GET /challenges/:challengeId/members', () => {
     let resIds = res.concat(res2).map(member => member._id);
     expect(resIds).to.eql(expectedIds.sort());
   });
-
-  it('supports using req.query.search to get search members', async () => {
-    let group = await generateGroup(user, {type: 'party', name: generateUUID()});
-    let challenge = await generateChallenge(user, group);
-
-    let usersToGenerate = [];
-    for (let i = 0; i < 3; i++) {
-      usersToGenerate.push(generateUser({challenges: [challenge._id]}));
-    }
-    let generatedUsers = await Promise.all(usersToGenerate);
-    let profileNames = generatedUsers.map(generatedUser => generatedUser.profile.name);
-
-    let firstProfileName = profileNames[0];
-    let nameToSearch = firstProfileName.substring(0, 4);
-
-    let response = await user.get(`/challenges/${challenge._id}/members?search=${nameToSearch}`);
-    expect(response[0].profile.name).to.eql(firstProfileName);
-  });
 });

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

@@ -41,12 +41,10 @@ describe('GET challenges/user', () => {
       });
       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,
       });
     });
@@ -63,12 +61,10 @@ describe('GET challenges/user', () => {
       });
       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,
       });
       let foundChallenge2 = _.find(challenges, { _id: challenge2._id });
@@ -80,12 +76,10 @@ describe('GET challenges/user', () => {
       });
       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,
       });
     });
@@ -102,12 +96,10 @@ describe('GET challenges/user', () => {
       });
       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,
       });
       let foundChallenge2 = _.find(challenges, { _id: challenge2._id });
@@ -119,26 +111,14 @@ describe('GET challenges/user', () => {
       });
       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 not return challenges in user groups if we send member true param', async () => {
-      let challenges = await member.get(`/challenges/user?member=${true}`);
-
-      let foundChallenge1 = _.find(challenges, { _id: challenge._id });
-      expect(foundChallenge1).to.not.exist;
-
-      let 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');
 
@@ -157,7 +137,6 @@ describe('GET challenges/user', () => {
       let { group, groupLeader } = await createAndPopulateGroup({
         groupDetails: {
           name: 'TestPrivateGuild',
-          summary: 'summary for TestPrivateGuild',
           type: 'guild',
           privacy: 'private',
         },
@@ -179,7 +158,6 @@ describe('GET challenges/user', () => {
       let { group, groupLeader } = await createAndPopulateGroup({
         groupDetails: {
           name: 'TestGuild',
-          summary: 'summary for TestGuild',
           type: 'guild',
           privacy: 'public',
         },

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

@@ -304,15 +304,5 @@ describe('POST /challenges', () => {
 
       await expect(groupLeader.sync()).to.eventually.have.property('challenges').to.include(challenge._id);
     });
-
-    it('awards achievement if this is creator\'s first challenge', async () => {
-      await groupLeader.post('/challenges', {
-        group: group._id,
-        name: 'Test Challenge',
-        shortName: 'TC Label',
-      });
-      groupLeader = await groupLeader.sync();
-      expect(groupLeader.achievements.joinedChallenge).to.be.true;
-    });
   });
 });

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

@@ -123,12 +123,5 @@ describe('POST /challenges/:challengeId/join', () => {
 
       await expect(authorizedUser.get('/tags')).to.eventually.have.length(userTagsLength + 1);
     });
-
-    it('awards achievement if this is user\'s first challenge', async () => {
-      await authorizedUser.post(`/challenges/${challenge._id}/join`);
-
-      await authorizedUser.sync();
-      expect(authorizedUser.achievements.joinedChallenge).to.be.true;
-    });
   });
 });

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

@@ -32,20 +32,18 @@ describe('POST /challenges/:challengeId/leave', () => {
     let group;
     let challenge;
     let notInChallengeUser;
-    let notInGroupLeavingUser;
     let leavingUser;
     let taskText;
 
     beforeEach(async () => {
       let populatedGroup = await createAndPopulateGroup({
-        members: 3,
+        members: 2,
       });
 
       groupLeader = populatedGroup.groupLeader;
       group = populatedGroup.group;
       leavingUser = populatedGroup.members[0];
       notInChallengeUser = populatedGroup.members[1];
-      notInGroupLeavingUser = populatedGroup.members[2];
 
       challenge = await generateChallenge(groupLeader, group);
 
@@ -57,16 +55,17 @@ describe('POST /challenges/:challengeId/leave', () => {
 
       await leavingUser.post(`/challenges/${challenge._id}/join`);
 
-      await notInGroupLeavingUser.post(`/challenges/${challenge._id}/join`);
-      await notInGroupLeavingUser.post(`/groups/${group._id}/leave`, {
-        keepChallenges: 'remain-in-challenges',
-      });
-
       await challenge.sync();
     });
 
-    it('lets user leave when not a member of the challenge group', async () => {
-      await expect(notInGroupLeavingUser.post(`/challenges/${challenge._id}/leave`)).to.eventually.be.ok;
+    it('returns an error when user doesn\'t have permissions to view the challenge', async () => {
+      let unauthorizedUser = await generateUser();
+
+      await expect(unauthorizedUser.post(`/challenges/${challenge._id}/leave`)).to.eventually.be.rejected.and.eql({
+        code: 404,
+        error: 'NotFound',
+        message: t('challengeNotFound'),
+      });
     });
 
     it('returns an error when user isn\'t a member of the challenge', async () => {

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

@@ -100,8 +100,8 @@ describe('POST /challenges/:challengeId/winner/:winnerId', () => {
       await sleep(0.5);
 
       await expect(winningUser.sync()).to.eventually.have.deep.property('achievements.challenges').to.include(challenge.name);
-      expect(winningUser.notifications.length).to.equal(2); // 2 because winningUser just joined the challenge, which now awards an achievement
-      expect(winningUser.notifications[1].type).to.equal('WON_CHALLENGE');
+      expect(winningUser.notifications.length).to.equal(1);
+      expect(winningUser.notifications[0].type).to.equal('WON_CHALLENGE');
     });
 
     it('gives winner gems as reward', async () => {
@@ -114,26 +114,6 @@ describe('POST /challenges/:challengeId/winner/:winnerId', () => {
       await expect(winningUser.sync()).to.eventually.have.property('balance', oldBalance + challenge.prize / 4);
     });
 
-    it('doesn\'t gives winner gems if group policy prevents it', async () => {
-      let oldBalance = winningUser.balance;
-      let oldLeaderBalance = (await groupLeader.sync()).balance;
-
-      await winningUser.update({
-        'purchased.plan.customerId': 'group-plan',
-      });
-      await group.update({
-        'leaderOnly.getGems': true,
-        'purchased.plan.customerId': 123,
-      });
-
-      await groupLeader.post(`/challenges/${challenge._id}/selectWinner/${winningUser._id}`);
-
-      await sleep(0.5);
-
-      await expect(winningUser.sync()).to.eventually.have.property('balance', oldBalance);
-      await expect(groupLeader.sync()).to.eventually.have.property('balance', oldLeaderBalance + challenge.prize / 4);
-    });
-
     it('doesn\'t refund gems to group leader', async () => {
       let oldBalance = (await groupLeader.sync()).balance;
 

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

@@ -84,10 +84,6 @@ describe('POST /chat/:chatId/flag', () => {
       type: 'party',
       privacy: 'private',
     });
-    await user.post(`/groups/${privateGroup._id}/invite`, {
-      uuids: [anotherUser._id],
-    });
-    await anotherUser.post(`/groups/${privateGroup._id}/join`);
     let { message } = await user.post(`/groups/${privateGroup._id}/chat`, {message: TEST_MESSAGE});
 
     let flagResult = await admin.post(`/groups/${privateGroup._id}/chat/${message.id}/flag`);
@@ -95,7 +91,7 @@ describe('POST /chat/:chatId/flag', () => {
     expect(flagResult.flags[admin._id]).to.equal(true);
     expect(flagResult.flagCount).to.equal(5);
 
-    let groupWithFlags = await anotherUser.get(`/groups/${privateGroup._id}`);
+    let groupWithFlags = await user.get(`/groups/${privateGroup._id}`);
     let messageToCheck = find(groupWithFlags.chat, {id: message.id});
 
     expect(messageToCheck).to.not.exist;
@@ -129,20 +125,4 @@ describe('POST /chat/:chatId/flag', () => {
         message: t('messageGroupChatFlagAlreadyReported'),
       });
   });
-
-  it('shows a hidden message to the original poster', async () => {
-    let { message } = await user.post(`/groups/${group._id}/chat`, {message: TEST_MESSAGE});
-
-    await admin.post(`/groups/${group._id}/chat/${message.id}/flag`);
-
-    let groupWithFlags = await user.get(`/groups/${group._id}`);
-    let messageToCheck = find(groupWithFlags.chat, {id: message.id});
-
-    expect(messageToCheck).to.exist;
-
-    let auGroupWithFlags = await anotherUser.get(`/groups/${group._id}`);
-    let auMessageToCheck = find(auGroupWithFlags.chat, {id: message.id});
-
-    expect(auMessageToCheck).to.not.exist;
-  });
 });

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

@@ -4,28 +4,11 @@ import {
   sleep,
   server,
 } from '../../../../helpers/api-v3-integration.helper';
-import {
-  SPAM_MESSAGE_LIMIT,
-  SPAM_MIN_EXEMPT_CONTRIB_LEVEL,
-  TAVERN_ID,
-} from '../../../../../website/server/models/group';
 import { v4 as generateUUID } from 'uuid';
-import { getMatchesByWordArray, removePunctuationFromString } from '../../../../../website/server/libs/stringUtils';
-import bannedWords from '../../../../../website/server/libs/bannedWords';
-import * as email from '../../../../../website/server/libs/email';
-import { IncomingWebhook } from '@slack/client';
-import nconf from 'nconf';
-
-const BASE_URL = nconf.get('BASE_URL');
 
 describe('POST /chat', () => {
-  let user, groupWithChat, member, additionalMember;
+  let user, groupWithChat, userWithChatRevoked, member;
   let testMessage = 'Test Message';
-  let testBannedWordMessage = 'TEST_PLACEHOLDER_SWEAR_WORD_HERE';
-  let testSlurMessage = 'message with TEST_PLACEHOLDER_SLUR_WORD_HERE';
-  let bannedWordErrorMessage = t('bannedWordUsed').split('.');
-  bannedWordErrorMessage[0] += ` (${removePunctuationFromString(testBannedWordMessage.toLowerCase())})`;
-  bannedWordErrorMessage = bannedWordErrorMessage.join('.');
 
   before(async () => {
     let { group, groupLeader, members } = await createAndPopulateGroup({
@@ -36,10 +19,11 @@ describe('POST /chat', () => {
       },
       members: 2,
     });
+
     user = groupLeader;
     groupWithChat = group;
+    userWithChatRevoked = await members[0].update({'flags.chatRevoked': true});
     member = members[0];
-    additionalMember = members[1];
   });
 
   it('Returns an error when no message is provided', async () => {
@@ -78,225 +62,10 @@ describe('POST /chat', () => {
   });
 
   it('returns an error when chat privileges are revoked when sending a message to a public guild', async () => {
-    let userWithChatRevoked = await member.update({'flags.chatRevoked': true});
     await expect(userWithChatRevoked.post(`/groups/${groupWithChat._id}/chat`, { message: testMessage})).to.eventually.be.rejected.and.eql({
-      code: 401,
-      error: 'NotAuthorized',
-      message: t('chatPrivilegesRevoked'),
-    });
-  });
-
-  context('banned word', () => {
-    it('returns an error when chat message contains a banned word in tavern', async () => {
-      await expect(user.post('/groups/habitrpg/chat', { message: testBannedWordMessage}))
-        .to.eventually.be.rejected.and.eql({
-          code: 400,
-          error: 'BadRequest',
-          message: bannedWordErrorMessage,
-        });
-    });
-
-    it('errors when word is part of a phrase', async () => {
-      let wordInPhrase = `phrase ${testBannedWordMessage} end`;
-      await expect(user.post('/groups/habitrpg/chat', { message: wordInPhrase}))
-      .to.eventually.be.rejected.and.eql({
-        code: 400,
-        error: 'BadRequest',
-        message: bannedWordErrorMessage,
-      });
-    });
-
-    it('errors when word is surrounded by non alphabet characters', async () => {
-      let wordInPhrase = `_!${testBannedWordMessage}@_`;
-      await expect(user.post('/groups/habitrpg/chat', { message: wordInPhrase}))
-      .to.eventually.be.rejected.and.eql({
-        code: 400,
-        error: 'BadRequest',
-        message: bannedWordErrorMessage,
-      });
-    });
-
-    it('checks error message has the banned words used', async () => {
-      let randIndex = Math.floor(Math.random() * (bannedWords.length + 1));
-      let testBannedWords = bannedWords.slice(randIndex, randIndex + 2).map((w) => w.replace(/\\/g, ''));
-      let chatMessage = `Mixing ${testBannedWords[0]} and ${testBannedWords[1]} is bad for you.`;
-      await expect(user.post('/groups/habitrpg/chat', { message: chatMessage}))
-        .to.eventually.be.rejected
-        .and.have.property('message')
-        .that.includes(testBannedWords.join(', '));
-    });
-
-    it('check all banned words are matched', async () => {
-      let message = bannedWords.join(',').replace(/\\/g, '');
-      let matches = getMatchesByWordArray(message, bannedWords);
-      expect(matches.length).to.equal(bannedWords.length);
-    });
-
-    it('does not error when bad word is suffix of a word', async () => {
-      let wordAsSuffix = `prefix${testBannedWordMessage}`;
-      let message = await user.post('/groups/habitrpg/chat', { message: wordAsSuffix});
-
-      expect(message.message.id).to.exist;
-    });
-
-    it('does not error when bad word is prefix of a word', async () => {
-      let wordAsPrefix = `${testBannedWordMessage}suffix`;
-      let message = await user.post('/groups/habitrpg/chat', { message: wordAsPrefix});
-
-      expect(message.message.id).to.exist;
-    });
-
-    it('does not error when sending a chat message containing a banned word to a party', async () => {
-      let { group, members } = await createAndPopulateGroup({
-        groupDetails: {
-          name: 'Party',
-          type: 'party',
-          privacy: 'private',
-        },
-        members: 1,
-      });
-
-      let message = await members[0].post(`/groups/${group._id}/chat`, { message: testBannedWordMessage});
-
-      expect(message.message.id).to.exist;
-    });
-
-    it('does not error when sending a chat message containing a banned word to a public guild', async () => {
-      let { group, members } = await createAndPopulateGroup({
-        groupDetails: {
-          name: 'public guild',
-          type: 'guild',
-          privacy: 'public',
-        },
-        members: 1,
-      });
-
-      let message = await members[0].post(`/groups/${group._id}/chat`, { message: testBannedWordMessage});
-
-      expect(message.message.id).to.exist;
-    });
-
-    it('does not error when sending a chat message containing a banned word to a private guild', async () => {
-      let { group, members } = await createAndPopulateGroup({
-        groupDetails: {
-          name: 'private guild',
-          type: 'guild',
-          privacy: 'private',
-        },
-        members: 1,
-      });
-
-      let message = await members[0].post(`/groups/${group._id}/chat`, { message: testBannedWordMessage});
-
-      expect(message.message.id).to.exist;
-    });
-  });
-
-  context('banned slur', () => {
-    beforeEach(() => {
-      sandbox.spy(email, 'sendTxn');
-      sandbox.stub(IncomingWebhook.prototype, 'send');
-    });
-
-    afterEach(() => {
-      sandbox.restore();
-    });
-
-    it('errors and revokes privileges when chat message contains a banned slur', async () => {
-      await expect(user.post(`/groups/${groupWithChat._id}/chat`, { message: testSlurMessage})).to.eventually.be.rejected.and.eql({
-        code: 400,
-        error: 'BadRequest',
-        message: t('bannedSlurUsed'),
-      });
-
-      // Email sent to mods
-      await sleep(0.5);
-      expect(email.sendTxn).to.be.calledOnce;
-      expect(email.sendTxn.args[0][1]).to.be.eql('slur-report-to-mods');
-
-      // Slack message to mods
-      expect(IncomingWebhook.prototype.send).to.be.calledOnce;
-      /* eslint-disable camelcase */
-      expect(IncomingWebhook.prototype.send).to.be.calledWith({
-        text: `${user.profile.name} (${user.id}) tried to post a slur`,
-        attachments: [{
-          fallback: 'Slur Message',
-          color: 'danger',
-          author_name: `${user.profile.name} - ${user.auth.local.email} - ${user._id}`,
-          title: 'Slur in Test Guild',
-          title_link: `${BASE_URL}/groups/guild/${groupWithChat.id}`,
-          text: testSlurMessage,
-          // footer: sandbox.match(/<.*?groupId=group-id&chatId=chat-id\|Flag this message>/),
-          mrkdwn_in: [
-            'text',
-          ],
-        }],
-      });
-      /* eslint-enable camelcase */
-
-      // Chat privileges are revoked
-      await expect(user.post(`/groups/${groupWithChat._id}/chat`, { message: testMessage})).to.eventually.be.rejected.and.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('chatPrivilegesRevoked'),
-      });
-
-      // Restore chat privileges to continue testing
-      user.flags.chatRevoked = false;
-      await user.update({'flags.chatRevoked': false});
-    });
-
-    it('does not allow slurs in private groups', async () => {
-      let { group, members } = await createAndPopulateGroup({
-        groupDetails: {
-          name: 'Party',
-          type: 'party',
-          privacy: 'private',
-        },
-        members: 1,
-      });
-
-      await expect(members[0].post(`/groups/${group._id}/chat`, { message: testSlurMessage})).to.eventually.be.rejected.and.eql({
-        code: 400,
-        error: 'BadRequest',
-        message: t('bannedSlurUsed'),
-      });
-
-      // Email sent to mods
-      await sleep(0.5);
-      expect(email.sendTxn).to.be.calledThrice;
-      expect(email.sendTxn.args[2][1]).to.be.eql('slur-report-to-mods');
-
-      // Slack message to mods
-      expect(IncomingWebhook.prototype.send).to.be.calledOnce;
-      /* eslint-disable camelcase */
-      expect(IncomingWebhook.prototype.send).to.be.calledWith({
-        text: `${members[0].profile.name} (${members[0].id}) tried to post a slur`,
-        attachments: [{
-          fallback: 'Slur Message',
-          color: 'danger',
-          author_name: `${members[0].profile.name} - ${members[0].auth.local.email} - ${members[0]._id}`,
-          title: 'Slur in Party - (private party)',
-          title_link: undefined,
-          text: testSlurMessage,
-          // footer: sandbox.match(/<.*?groupId=group-id&chatId=chat-id\|Flag this message>/),
-          mrkdwn_in: [
-            'text',
-          ],
-        }],
-      });
-      /* eslint-enable camelcase */
-
-      // Chat privileges are revoked
-      await expect(members[0].post(`/groups/${groupWithChat._id}/chat`, { message: testMessage})).to.eventually.be.rejected.and.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('chatPrivilegesRevoked'),
-      });
-
-      // Restore chat privileges to continue testing
-      members[0].flags.chatRevoked = false;
-      await members[0].update({'flags.chatRevoked': false});
+      code: 404,
+      error: 'NotFound',
+      message: 'Your chat privileges have been revoked.',
     });
   });
 
@@ -404,30 +173,4 @@ describe('POST /chat', () => {
     expect(message.message.id).to.exist;
     expect(memberWithNotification.newMessages[`${group._id}`]).to.exist;
   });
-
-  context('Spam prevention', () => {
-    it('Returns an error when the user has been posting too many messages', async () => {
-      // Post as many messages are needed to reach the spam limit
-      for (let i = 0; i < SPAM_MESSAGE_LIMIT; i++) {
-        let result = await additionalMember.post(`/groups/${TAVERN_ID}/chat`, { message: testMessage }); // eslint-disable-line no-await-in-loop
-        expect(result.message.id).to.exist;
-      }
-
-      await expect(additionalMember.post(`/groups/${TAVERN_ID}/chat`, { message: testMessage })).to.eventually.be.rejected.and.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('messageGroupChatSpam'),
-      });
-    });
-
-    it('contributor should not receive spam alert', async () => {
-      let userSocialite = await member.update({'contributor.level': SPAM_MIN_EXEMPT_CONTRIB_LEVEL, 'flags.chatRevoked': false});
-
-      // Post 1 more message than the spam limit to ensure they do not reach the limit
-      for (let i = 0; i < SPAM_MESSAGE_LIMIT + 1; i++) {
-        let result = await userSocialite.post(`/groups/${TAVERN_ID}/chat`, { message: testMessage }); // eslint-disable-line no-await-in-loop
-        expect(result.message.id).to.exist;
-      }
-    });
-  });
 });

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

@@ -4,7 +4,7 @@ import {
 } from '../../../../helpers/api-v3-integration.helper';
 import { v4 as generateUUID } from 'uuid';
 
-xdescribe('GET /export/avatar-:memberId.html', () => {
+describe('GET /export/avatar-:memberId.html', () => {
   let user;
 
   before(async () => {

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

@@ -1,32 +0,0 @@
-import {
-  generateUser,
-  generateGroup,
-} from '../../../../helpers/api-v3-integration.helper';
-
-describe('GET /group-plans', () => {
-  let user;
-  let groupPlan;
-
-  before(async () => {
-    user = await generateUser({balance: 4});
-    groupPlan = await generateGroup(user,
-      {
-        name: 'public guild - is member',
-        type: 'guild',
-        privacy: 'public',
-      },
-      {
-        purchased: {
-          plan: {
-            customerId: 'existings',
-          },
-        },
-      });
-  });
-
-  it('returns group plans for the user', async () => {
-    let groupPlans = await user.get('/group-plans');
-
-    expect(groupPlans[0]._id).to.eql(groupPlan._id);
-  });
-});

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

@@ -16,12 +16,6 @@ describe('GET /groups', () => {
   const NUMBER_OF_USERS_PRIVATE_GUILDS = 1;
   const NUMBER_OF_GROUPS_USER_CAN_VIEW = 5;
   const GUILD_PER_PAGE = 30;
-  let categories = [{
-    slug: 'newCat',
-    name: 'New Category',
-  }];
-  let publicGuildNotMember;
-  let privateGuildUserIsMemberOf;
 
   before(async () => {
     await resetHabiticaDB();
@@ -37,18 +31,16 @@ describe('GET /groups', () => {
     await leader.post(`/groups/${publicGuildUserIsMemberOf._id}/invite`, { uuids: [user._id]});
     await user.post(`/groups/${publicGuildUserIsMemberOf._id}/join`);
 
-    publicGuildNotMember = await generateGroup(leader, {
+    await generateGroup(leader, {
       name: 'public guild - is not member',
       type: 'guild',
       privacy: 'public',
-      categories,
     });
 
-    privateGuildUserIsMemberOf = await generateGroup(leader, {
+    let privateGuildUserIsMemberOf = await generateGroup(leader, {
       name: 'private guild - is member',
       type: 'guild',
       privacy: 'private',
-      categories,
     });
     await leader.post(`/groups/${privateGuildUserIsMemberOf._id}/invite`, { uuids: [user._id]});
     await user.post(`/groups/${privateGuildUserIsMemberOf._id}/join`);
@@ -108,50 +100,6 @@ describe('GET /groups', () => {
       .to.eventually.have.a.lengthOf(NUMBER_OF_PUBLIC_GUILDS);
   });
 
-  describe('filters', () => {
-    it('returns public guilds filtered by category', async () => {
-      let guilds = await user.get(`/groups?type=publicGuilds&categories=${categories[0].slug}`);
-
-      expect(guilds[0]._id).to.equal(publicGuildNotMember._id);
-    });
-
-    it('returns private guilds filtered by category', async () => {
-      let guilds = await user.get(`/groups?type=privateGuilds&categories=${categories[0].slug}`);
-
-      expect(guilds[0]._id).to.equal(privateGuildUserIsMemberOf._id);
-    });
-
-    it('filters public guilds by size', async () => {
-      await generateGroup(user, {
-        name: 'guild1',
-        type: 'guild',
-        privacy: 'public',
-        memberCount: 1,
-      });
-
-      // @TODO: anyway to set higher memberCount in tests right now?
-
-      let guilds = await user.get('/groups?type=publicGuilds&minMemberCount=3');
-
-      expect(guilds.length).to.equal(0);
-    });
-
-    it('filters private guilds by size', async () => {
-      await generateGroup(user, {
-        name: 'guild1',
-        type: 'guild',
-        privacy: 'private',
-        memberCount: 1,
-      });
-
-      // @TODO: anyway to set higher memberCount in tests right now?
-
-      let guilds = await user.get('/groups?type=privateGuilds&minMemberCount=3');
-
-      expect(guilds.length).to.equal(0);
-    });
-  });
-
   describe('public guilds pagination', () => {
     it('req.query.paginate must be a boolean string', async () => {
       await expect(user.get('/groups?paginate=aString&type=publicGuilds'))
@@ -201,8 +149,8 @@ describe('GET /groups', () => {
       await expect(user.get('/groups?type=publicGuilds&paginate=true&page=1'))
         .to.eventually.have.a.lengthOf(GUILD_PER_PAGE);
       let page2 = await expect(user.get('/groups?type=publicGuilds&paginate=true&page=2'))
-        .to.eventually.have.a.lengthOf(1 + 3); // 1 created now, 3 by other tests
-      expect(page2[3].name).to.equal('guild with less members');
+        .to.eventually.have.a.lengthOf(1 + 2); // 1 created now, 2 by other tests
+      expect(page2[2].name).to.equal('guild with less members');
     });
   });
 

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

@@ -63,17 +63,15 @@ describe('GET /groups/:groupId/invites', () => {
   });
 
   it('returns only first 30 invites', async () => {
-    let leader = await generateUser({balance: 4});
-    let group = await generateGroup(leader, {type: 'guild', privacy: 'public', name: generateUUID()});
-
+    let group = await generateGroup(user, {type: 'party', name: generateUUID()});
     let invitesToGenerate = [];
     for (let i = 0; i < 31; i++) {
       invitesToGenerate.push(generateUser());
     }
     let generatedInvites = await Promise.all(invitesToGenerate);
-    await leader.post(`/groups/${group._id}/invite`, {uuids: generatedInvites.map(invite => invite._id)});
+    await user.post(`/groups/${group._id}/invite`, {uuids: generatedInvites.map(invite => invite._id)});
 
-    let res = await leader.get(`/groups/${group._id}/invites`);
+    let res = await user.get('/groups/party/invites');
     expect(res.length).to.equal(30);
     res.forEach(member => {
       expect(member).to.have.all.keys(['_id', 'id', 'profile']);

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

@@ -66,25 +66,11 @@ describe('GET /groups/:groupId/members', () => {
     expect(res[0].profile).to.have.all.keys(['name']);
   });
 
-  it('req.query.includeAllPublicFields === true works with guilds', async () => {
+  it('req.query.includeAllPublicFields === true only works with parties', async () => {
     let group = await generateGroup(user, {type: 'guild', name: generateUUID()});
-    let [memberRes] = await user.get(`/groups/${group._id}/members?includeAllPublicFields=true`);
-
-    expect(memberRes).to.have.all.keys([ // works as: object has all and only these keys
-      '_id', 'id', 'preferences', 'profile', 'stats', 'achievements', 'party',
-      'backer', 'contributor', 'auth', 'items', 'inbox',
-    ]);
-    expect(Object.keys(memberRes.auth)).to.eql(['timestamps']);
-    expect(Object.keys(memberRes.preferences).sort()).to.eql([
-      'size', 'hair', 'skin', 'shirt',
-      'chair', 'costume', 'sleep', 'background', 'tasks',
-    ].sort());
-
-    expect(memberRes.stats.maxMP).to.exist;
-    expect(memberRes.stats.maxHealth).to.equal(common.maxHealth);
-    expect(memberRes.stats.toNextLevel).to.equal(common.tnl(memberRes.stats.lvl));
-    expect(memberRes.inbox.optOut).to.exist;
-    expect(memberRes.inbox.messages).to.not.exist;
+    let res = await user.get(`/groups/${group._id}/members?includeAllPublicFields=true`);
+    expect(res[0]).to.have.all.keys(['_id', 'id', 'profile']);
+    expect(res[0].profile).to.have.all.keys(['name']);
   });
 
   it('populates all public fields if req.query.includeAllPublicFields === true and it is a party', async () => {

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

@@ -1,93 +0,0 @@
-import {
-  createAndPopulateGroup,
-  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
-import { find } from 'lodash';
-
-describe('POST /group/:groupId/remove-manager', () => {
-  let leader, nonLeader, groupToUpdate;
-  let groupName = 'Test Public Guild';
-  let groupType = 'guild';
-  let nonManager;
-
-  function findAssignedTask (memberTask) {
-    return memberTask.group.id === groupToUpdate._id;
-  }
-
-  beforeEach(async () => {
-    let { group, groupLeader, members } = await createAndPopulateGroup({
-      groupDetails: {
-        name: groupName,
-        type: groupType,
-        privacy: 'public',
-      },
-      members: 1,
-    });
-
-    groupToUpdate = group;
-    leader = groupLeader;
-    nonLeader = members[0];
-    nonManager = members[0];
-  });
-
-  it('returns an error when a non group leader tries to add member', async () => {
-    await expect(nonLeader.post(`/groups/${groupToUpdate._id}/remove-manager`, {
-      managerId: nonLeader._id,
-    })).to.eventually.be.rejected.and.eql({
-      code: 401,
-      error: 'NotAuthorized',
-      message: t('messageGroupOnlyLeaderCanUpdate'),
-    });
-  });
-
-  it('returns an error when manager does not exist', async () => {
-    await expect(leader.post(`/groups/${groupToUpdate._id}/remove-manager`, {
-      managerId: nonManager._id,
-    })).to.eventually.be.rejected.and.eql({
-      code: 401,
-      error: 'NotAuthorized',
-      message: t('userIsNotManager'),
-    });
-  });
-
-  it('allows a leader to remove managers', async () => {
-    await leader.post(`/groups/${groupToUpdate._id}/add-manager`, {
-      managerId: nonLeader._id,
-    });
-
-    let updatedGroup = await leader.post(`/groups/${groupToUpdate._id}/remove-manager`, {
-      managerId: nonLeader._id,
-    });
-
-    expect(updatedGroup.managers[nonLeader._id]).to.not.exist;
-  });
-
-  it('removes group approval notifications from a manager that is removed', async () => {
-    await leader.post(`/groups/${groupToUpdate._id}/add-manager`, {
-      managerId: nonLeader._id,
-    });
-    let task = await leader.post(`/tasks/group/${groupToUpdate._id}`, {
-      text: 'test todo',
-      type: 'todo',
-      requiresApproval: true,
-    });
-    await nonLeader.post(`/tasks/${task._id}/assign/${leader._id}`);
-    let memberTasks = await leader.get('/tasks/user');
-    let syncedTask = find(memberTasks, findAssignedTask);
-    await expect(leader.post(`/tasks/${syncedTask._id}/score/up`))
-      .to.eventually.be.rejected.and.to.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('taskApprovalHasBeenRequested'),
-      });
-
-    let updatedGroup = await leader.post(`/groups/${groupToUpdate._id}/remove-manager`, {
-      managerId: nonLeader._id,
-    });
-
-    await nonLeader.sync();
-
-    expect(nonLeader.notifications.length).to.equal(0);
-    expect(updatedGroup.managers[nonLeader._id]).to.not.exist;
-  });
-});

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

@@ -74,18 +74,6 @@ describe('POST /group', () => {
       expect(updatedUser.guilds).to.include(guild._id);
     });
 
-    it('awards the Joined Guild achievement', async () => {
-      await user.post('/groups', {
-        name: 'some guild',
-        type: 'guild',
-        privacy: 'public',
-      });
-
-      let updatedUser = await user.get('/user');
-
-      expect(updatedUser.achievements.joinedGuild).to.eql(true);
-    });
-
     context('public guild', () => {
       it('creates a group', async () => {
         let groupName = 'Test Public Guild';

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

@@ -68,12 +68,6 @@ describe('POST /group/:groupId/join', () => {
 
       await expect(joiningUser.get(`/groups/${publicGuild._id}`)).to.eventually.have.property('memberCount', oldMemberCount + 1);
     });
-
-    it('awards Joined Guild achievement', async () => {
-      await joiningUser.post(`/groups/${publicGuild._id}/join`);
-
-      await expect(joiningUser.get('/user')).to.eventually.have.deep.property('achievements.joinedGuild', true);
-    });
   });
 
   context('Joining a private guild', () => {
@@ -153,14 +147,8 @@ describe('POST /group/:groupId/join', () => {
           }),
         };
 
-        expect(inviter.notifications[1].type).to.eql('GROUP_INVITE_ACCEPTED');
-        expect(inviter.notifications[1].data).to.eql(expectedData);
-      });
-
-      it('awards Joined Guild achievement', async () => {
-        await invitedUser.post(`/groups/${guild._id}/join`);
-
-        await expect(invitedUser.get('/user')).to.eventually.have.deep.property('achievements.joinedGuild', true);
+        expect(inviter.notifications[0].type).to.eql('GROUP_INVITE_ACCEPTED');
+        expect(inviter.notifications[0].data).to.eql(expectedData);
       });
     });
   });
@@ -220,7 +208,7 @@ describe('POST /group/:groupId/join', () => {
       it('clears invitation from user when joining party', async () => {
         await invitedUser.post(`/groups/${party._id}/join`);
 
-        await expect(invitedUser.get('/user')).to.eventually.not.have.deep.property('invitations.parties[0].id');
+        await expect(invitedUser.get('/user')).to.eventually.not.have.deep.property('invitations.party.id');
       });
 
       it('increments memberCount when joining party', async () => {

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

@@ -247,7 +247,7 @@ describe('POST /groups/:groupId/leave', () => {
 
         let userWithoutInvitation = await invitedUser.get('/user');
 
-        expect(userWithoutInvitation.invitations.parties[0]).to.be.empty;
+        expect(userWithoutInvitation.invitations.party).to.be.empty;
       });
     });
 

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

@@ -107,7 +107,7 @@ describe('POST /group/:groupId/reject-invite', () => {
     it('clears invitation from user', async () => {
       await invitedUser.post(`/groups/${party._id}/reject-invite`);
 
-      await expect(invitedUser.get('/user')).to.eventually.not.have.deep.property('invitations.parties[0].id');
+      await expect(invitedUser.get('/user')).to.eventually.not.have.deep.property('invitations.party.id');
     });
   });
 });

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

@@ -11,7 +11,6 @@ describe('POST /groups/:groupId/removeMember/:memberId', () => {
   let guild;
   let member;
   let member2;
-  let adminUser;
 
   beforeEach(async () => {
     let { group, groupLeader, invitees, members } = await createAndPopulateGroup({
@@ -29,7 +28,6 @@ describe('POST /groups/:groupId/removeMember/:memberId', () => {
     invitedUser = invitees[0];
     member = members[0];
     member2 = members[1];
-    adminUser = await generateUser({ 'contributor.admin': true });
   });
 
   context('All Groups', () => {
@@ -44,7 +42,7 @@ describe('POST /groups/:groupId/removeMember/:memberId', () => {
         });
     });
 
-    it('returns an error when user is a non-leader member of a group and not an admin', async () => {
+    it('returns an error when user is a non-leader member of a group', async () => {
       expect(member2.post(`/groups/${guild._id}/removeMember/${member._id}`))
         .to.eventually.be.rejected.and.eql({
           code: 401,
@@ -89,30 +87,7 @@ describe('POST /groups/:groupId/removeMember/:memberId', () => {
 
       let invitedUserWithoutInvite = await invitedUser.get('/user');
 
-      expect(_.findIndex(invitedUserWithoutInvite.invitations.guilds, { id: guild._id })).eql(-1);
-    });
-
-    it('allows an admin to remove other members', async () => {
-      await adminUser.post(`/groups/${guild._id}/removeMember/${member._id}`);
-      let memberRemoved = await member.get('/user');
-
-      expect(memberRemoved.guilds.indexOf(guild._id)).eql(-1);
-    });
-
-    it('allows an admin to remove other invites', async () => {
-      await adminUser.post(`/groups/${guild._id}/removeMember/${invitedUser._id}`);
-
-      let invitedUserWithoutInvite = await invitedUser.get('/user');
-
-      expect(_.findIndex(invitedUserWithoutInvite.invitations.guilds, { id: guild._id })).eql(-1);
-    });
-
-    it('does not allow an admin to remove a leader', async () => {
-      expect(adminUser.post(`/groups/${guild._id}/removeMember/${leader._id}`))
-        .to.eventually.be.rejected.and.eql({
-          code: 401,
-          text: t('cannotRemoveCurrentLeader'),
-        });
+      expect(_.findIndex(invitedUserWithoutInvite.invitations.guilds, {id: guild._id})).eql(-1);
     });
 
     it('sends email to user with rescinded invite', async () => {
@@ -177,13 +152,13 @@ describe('POST /groups/:groupId/removeMember/:memberId', () => {
     });
 
     it('can remove other invites', async () => {
-      expect(partyInvitedUser.invitations.parties[0]).to.not.be.empty;
+      expect(partyInvitedUser.invitations.party).to.not.be.empty;
 
       await partyLeader.post(`/groups/${party._id}/removeMember/${partyInvitedUser._id}`);
 
       let invitedUserWithoutInvite = await partyInvitedUser.get('/user');
 
-      expect(invitedUserWithoutInvite.invitations.parties[0]).to.be.empty;
+      expect(invitedUserWithoutInvite.invitations.party).to.be.empty;
     });
 
     it('removes new messages from a member who is removed', async () => {

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

@@ -4,11 +4,8 @@ import {
   translate as t,
 } from '../../../../helpers/api-v3-integration.helper';
 import { v4 as generateUUID } from 'uuid';
-import nconf from 'nconf';
 
 const INVITES_LIMIT = 100;
-const PARTY_LIMIT_MEMBERS = 30;
-const MAX_EMAIL_INVITES_BY_USER = 200;
 
 describe('Post /groups/:groupId/invite', () => {
   let inviter;
@@ -207,37 +204,13 @@ describe('Post /groups/:groupId/invite', () => {
       });
     });
 
-    it('returns an error when a user has sent the max number of email invites', async () => {
-      let inviterWithMax = await generateUser({
-        invitesSent: MAX_EMAIL_INVITES_BY_USER,
-        balance: 4,
-      });
-      let tmpGroup = await inviterWithMax.post('/groups', {
-        name: groupName,
-        type: 'guild',
-      });
-
-      await expect(inviterWithMax.post(`/groups/${tmpGroup._id}/invite`, {
-        emails: [testInvite],
-        inviter: 'inviter name',
-      }))
-      .to.eventually.be.rejected.and.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('inviteLimitReached', {techAssistanceEmail: nconf.get('EMAILS:TECH_ASSISTANCE_EMAIL')}),
-      });
-    });
-
     it('invites a user to a group by email', async () => {
       let res = await inviter.post(`/groups/${group._id}/invite`, {
         emails: [testInvite],
         inviter: 'inviter name',
       });
 
-      let updatedUser = await inviter.sync();
-
       expect(res).to.exist;
-      expect(updatedUser.invitesSent).to.eql(1);
     });
 
     it('invites multiple users to a group by email', async () => {
@@ -245,10 +218,7 @@ describe('Post /groups/:groupId/invite', () => {
         emails: [testInvite, {name: 'test2', email: 'test2@habitica.com'}],
       });
 
-      let updatedUser = await inviter.sync();
-
       expect(res).to.exist;
-      expect(updatedUser.invitesSent).to.eql(2);
     });
   });
 
@@ -351,19 +321,6 @@ describe('Post /groups/:groupId/invite', () => {
       });
     });
 
-    it('allows 30+ members in a guild', async () => {
-      let invitesToGenerate = [];
-      // Generate 30 users to invite (30 + leader = 31 members)
-      for (let i = 0; i < PARTY_LIMIT_MEMBERS; i++) {
-        invitesToGenerate.push(generateUser());
-      }
-      let generatedInvites = await Promise.all(invitesToGenerate);
-      // Invite users
-      expect(await inviter.post(`/groups/${group._id}/invite`, {
-        uuids: generatedInvites.map(invite => invite._id),
-      })).to.be.an('array');
-    });
-
     // @TODO: Add this after we are able to mock the group plan route
     xit('returns an error when a non-leader invites to a group plan', async () => {
       let userToInvite = await generateUser();
@@ -440,38 +397,7 @@ describe('Post /groups/:groupId/invite', () => {
       await inviter.post(`/groups/${party._id}/invite`, {
         uuids: [userToInvite._id],
       });
-      expect((await userToInvite.get('/user')).invitations.parties[0].id).to.equal(party._id);
-    });
-
-    it('allow inviting a user to 2 different parties', async () => {
-      // Create another inviter
-      let inviter2 = await generateUser();
-
-      // Create user to invite
-      let userToInvite = await generateUser();
-
-      // Create second group
-      let party2 = await inviter2.post('/groups', {
-        name: 'Test Party 2',
-        type: 'party',
-      });
-
-      // Invite to first party
-      await inviter.post(`/groups/${party._id}/invite`, {
-        uuids: [userToInvite._id],
-      });
-
-      // Invite to second party
-      await inviter2.post(`/groups/${party2._id}/invite`, {
-        uuids: [userToInvite._id],
-      });
-
-      // Get updated user
-      let invitedUser = await userToInvite.get('/user');
-
-      expect(invitedUser.invitations.parties.length).to.equal(2);
-      expect(invitedUser.invitations.parties[0].id).to.equal(party._id);
-      expect(invitedUser.invitations.parties[1].id).to.equal(party2._id);
+      expect((await userToInvite.get('/user')).invitations.party.id).to.equal(party._id);
     });
 
     it('allow inviting a user if party id is not associated with a real party', async () => {
@@ -482,38 +408,7 @@ describe('Post /groups/:groupId/invite', () => {
       await inviter.post(`/groups/${party._id}/invite`, {
         uuids: [userToInvite._id],
       });
-      expect((await userToInvite.get('/user')).invitations.parties[0].id).to.equal(party._id);
-    });
-
-    it('allows 30 members in a party', async () => {
-      let invitesToGenerate = [];
-      // Generate 29 users to invite (29 + leader = 30 members)
-      for (let i = 0; i < PARTY_LIMIT_MEMBERS - 1; i++) {
-        invitesToGenerate.push(generateUser());
-      }
-      let generatedInvites = await Promise.all(invitesToGenerate);
-      // Invite users
-      expect(await inviter.post(`/groups/${party._id}/invite`, {
-        uuids: generatedInvites.map(invite => invite._id),
-      })).to.be.an('array');
-    });
-
-    it('does not allow 30+ members in a party', async () => {
-      let invitesToGenerate = [];
-      // Generate 30 users to invite (30 + leader = 31 members)
-      for (let i = 0; i < PARTY_LIMIT_MEMBERS; i++) {
-        invitesToGenerate.push(generateUser());
-      }
-      let generatedInvites = await Promise.all(invitesToGenerate);
-      // Invite users
-      await expect(inviter.post(`/groups/${party._id}/invite`, {
-        uuids: generatedInvites.map(invite => invite._id),
-      }))
-      .to.eventually.be.rejected.and.eql({
-        code: 400,
-        error: 'BadRequest',
-        message: t('partyExceedsMembersLimit', {maxMembersParty: PARTY_LIMIT_MEMBERS}),
-      });
+      expect((await userToInvite.get('/user')).invitations.party.id).to.equal(party._id);
     });
   });
 });

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

@@ -1,85 +0,0 @@
-import {
-  generateUser,
-  createAndPopulateGroup,
-  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
-
-describe('POST /group/:groupId/add-manager', () => {
-  let leader, nonLeader, groupToUpdate;
-  let groupName = 'Test Public Guild';
-  let groupType = 'guild';
-  let nonMember;
-
-  context('Guilds', () => {
-    beforeEach(async () => {
-      let { group, groupLeader, members } = await createAndPopulateGroup({
-        groupDetails: {
-          name: groupName,
-          type: groupType,
-          privacy: 'public',
-        },
-        members: 1,
-      });
-
-      groupToUpdate = group;
-      leader = groupLeader;
-      nonLeader = members[0];
-      nonMember = await generateUser();
-    });
-
-    it('returns an error when a non group leader tries to add member', async () => {
-      await expect(nonLeader.post(`/groups/${groupToUpdate._id}/add-manager`, {
-        managerId: nonLeader._id,
-      })).to.eventually.be.rejected.and.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('messageGroupOnlyLeaderCanUpdate'),
-      });
-    });
-
-    it('returns an error when trying to promote a non member', async () => {
-      await expect(leader.post(`/groups/${groupToUpdate._id}/add-manager`, {
-        managerId: nonMember._id,
-      })).to.eventually.be.rejected.and.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('userMustBeMember'),
-      });
-    });
-
-    it('allows a leader to add managers', async () => {
-      let updatedGroup = await leader.post(`/groups/${groupToUpdate._id}/add-manager`, {
-        managerId: nonLeader._id,
-      });
-
-      expect(updatedGroup.managers[nonLeader._id]).to.be.true;
-    });
-  });
-
-  context('Party', () => {
-    let party, partyLeader, partyNonLeader;
-
-    beforeEach(async () => {
-      let { group, groupLeader, members } = await createAndPopulateGroup({
-        groupDetails: {
-          name: groupName,
-          type: 'party',
-          privacy: 'private',
-        },
-        members: 1,
-      });
-
-      party = group;
-      partyLeader = groupLeader;
-      partyNonLeader = members[0];
-    });
-
-    it('allows leader of party to add managers', async () => {
-      let updatedGroup = await partyLeader.post(`/groups/${party._id}/add-manager`, {
-        managerId: partyNonLeader._id,
-      });
-
-      expect(updatedGroup.managers[partyNonLeader._id]).to.be.true;
-    });
-  });
-});

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

@@ -1,11 +1,10 @@
 import {
   createAndPopulateGroup,
-  generateUser,
   translate as t,
 } from '../../../../helpers/api-v3-integration.helper';
 
 describe('PUT /group', () => {
-  let leader, nonLeader, groupToUpdate, adminUser;
+  let leader, nonLeader, groupToUpdate;
   let groupName = 'Test Public Guild';
   let groupType = 'guild';
   let groupUpdatedName = 'Test Public Guild Updated';
@@ -19,13 +18,13 @@ describe('PUT /group', () => {
       },
       members: 1,
     });
-    adminUser = await generateUser({ 'contributor.admin': true });
+
     groupToUpdate = group;
     leader = groupLeader;
     nonLeader = members[0];
   });
 
-  it('returns an error when a user that is not an admin or group leader tries to update', async () => {
+  it('returns an error when a non group leader tries to update', async () => {
     await expect(nonLeader.put(`/groups/${groupToUpdate._id}`, {
       name: groupUpdatedName,
     })).to.eventually.be.rejected.and.eql({
@@ -45,29 +44,6 @@ describe('PUT /group', () => {
     expect(updatedGroup.name).to.equal(groupUpdatedName);
   });
 
-  it('updates a group categories', async () => {
-    let categories = [{
-      slug: 'newCat',
-      name: 'New Category',
-    }];
-
-    let updatedGroup = await leader.put(`/groups/${groupToUpdate._id}`, {
-      categories,
-    });
-
-    expect(updatedGroup.categories[0].slug).to.eql(categories[0].slug);
-    expect(updatedGroup.categories[0].name).to.eql(categories[0].name);
-  });
-
-  it('allows an admin to update a guild', async () => {
-    let updatedGroup = await adminUser.put(`/groups/${groupToUpdate._id}`, {
-      name: groupUpdatedName,
-    });
-    expect(updatedGroup.leader._id).to.eql(leader._id);
-    expect(updatedGroup.leader.profile.name).to.eql(leader.profile.name);
-    expect(updatedGroup.name).to.equal(groupUpdatedName);
-  });
-
   it('allows a leader to change leaders', async () => {
     let updatedGroup = await leader.put(`/groups/${groupToUpdate._id}`, {
       name: groupUpdatedName,

test/api/v3/integration/members/GET-objections_interaction.test.js

@@ -1,64 +0,0 @@
-import {
-  generateUser,
-  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
-import { v4 as generateUUID } from 'uuid';
-
-describe('GET /members/:toUserId/objections/:interaction', () => {
-  let user;
-
-  before(async () => {
-    user = await generateUser();
-  });
-
-  it('validates req.params.memberId', async () => {
-    await expect(
-      user.get('/members/invalidUUID/objections/send-private-message')
-    ).to.eventually.be.rejected.and.eql({
-      code: 400,
-      error: 'BadRequest',
-      message: t('invalidReqParams'),
-    });
-  });
-
-  it('handles non-existing members', async () => {
-    let dummyId = generateUUID();
-    await expect(
-      user.get(`/members/${dummyId}/objections/send-private-message`)
-    ).to.eventually.be.rejected.and.eql({
-      code: 404,
-      error: 'NotFound',
-      message: t('userWithIDNotFound', {userId: dummyId}),
-    });
-  });
-
-  it('handles non-existing interactions', async () => {
-    let receiver = await generateUser();
-
-    await expect(
-      user.get(`/members/${receiver._id}/objections/hug-a-whole-forest-of-trees`)
-    ).to.eventually.be.rejected.and.eql({
-      code: 400,
-      error: 'BadRequest',
-      message: t('invalidReqParams'),
-    });
-  });
-
-  it('returns an empty array if there are no objections', async () => {
-    let receiver = await generateUser();
-
-    await expect(
-      user.get(`/members/${receiver._id}/objections/send-private-message`)
-    ).to.eventually.be.fulfilled.and.eql([]);
-  });
-
-  it('returns an array of objections if any exist', async () => {
-    let receiver = await generateUser({'inbox.blocks': [user._id]});
-
-    await expect(
-      user.get(`/members/${receiver._id}/objections/send-private-message`)
-    ).to.eventually.be.fulfilled.and.eql([
-      t('notAuthorizedToSendMessageToThisUser'),
-    ]);
-  });
-});

test/api/v3/integration/members/POST-send_private_message.test.js

@@ -82,20 +82,6 @@ describe('POST /members/send-private-message', () => {
     });
   });
 
-  it('returns an error when chat privileges are revoked', async () => {
-    let userWithChatRevoked = await generateUser({'flags.chatRevoked': true});
-    let receiver = await generateUser();
-
-    await expect(userWithChatRevoked.post('/members/send-private-message', {
-      message: messageToSend,
-      toUserId: receiver._id,
-    })).to.eventually.be.rejected.and.eql({
-      code: 401,
-      error: 'NotAuthorized',
-      message: t('chatPrivilegesRevoked'),
-    });
-  });
-
   it('sends a private message to a user', async () => {
     let receiver = await generateUser();
 

test/api/v3/integration/members/POST-transfer_gems.test.js

@@ -43,7 +43,7 @@ describe('POST /members/transfer-gems', () => {
     });
   });
 
-  it('returns error when recipient is not found', async () => {
+  it('returns error when to user is not found', async () => {
     await expect(userToSendMessage.post('/members/transfer-gems', {
       message,
       gemAmount,
@@ -55,7 +55,7 @@ describe('POST /members/transfer-gems', () => {
     });
   });
 
-  it('returns error when user attempts to send gems to themselves', async () => {
+  it('returns error when to user attempts to send gems to themselves', async () => {
     await expect(userToSendMessage.post('/members/transfer-gems', {
       message,
       gemAmount,
@@ -67,64 +67,6 @@ describe('POST /members/transfer-gems', () => {
     });
   });
 
-  it('returns error when recipient has blocked the sender', async () => {
-    let receiverWhoBlocksUser = await generateUser({'inbox.blocks': [userToSendMessage._id]});
-
-    await expect(userToSendMessage.post('/members/transfer-gems', {
-      message,
-      gemAmount,
-      toUserId: receiverWhoBlocksUser._id,
-    })).to.eventually.be.rejected.and.eql({
-      code: 401,
-      error: 'NotAuthorized',
-      message: t('notAuthorizedToSendMessageToThisUser'),
-    });
-  });
-
-  it('returns error when sender has blocked recipient', async () => {
-    let sender = await generateUser({'inbox.blocks': [receiver._id]});
-
-    await expect(sender.post('/members/transfer-gems', {
-      message,
-      gemAmount,
-      toUserId: receiver._id,
-    })).to.eventually.be.rejected.and.eql({
-      code: 401,
-      error: 'NotAuthorized',
-      message: t('notAuthorizedToSendMessageToThisUser'),
-    });
-  });
-
-  it('returns an error when chat privileges are revoked', async () => {
-    let userWithChatRevoked = await generateUser({'flags.chatRevoked': true});
-
-    await expect(userWithChatRevoked.post('/members/transfer-gems', {
-      message,
-      gemAmount,
-      toUserId: receiver._id,
-    })).to.eventually.be.rejected.and.eql({
-      code: 401,
-      error: 'NotAuthorized',
-      message: t('chatPrivilegesRevoked'),
-    });
-  });
-
-  it('works when only the recipient\'s chat privileges are revoked', async () => {
-    let receiverWithChatRevoked = await generateUser({'flags.chatRevoked': true});
-
-    await expect(userToSendMessage.post('/members/transfer-gems', {
-      message,
-      gemAmount,
-      toUserId: receiverWithChatRevoked._id,
-    })).to.eventually.be.fulfilled;
-
-    let updatedReceiver = await receiverWithChatRevoked.get('/user');
-    let updatedSender = await userToSendMessage.get('/user');
-
-    expect(updatedReceiver.balance).to.equal(gemAmount / 4);
-    expect(updatedSender.balance).to.equal(0);
-  });
-
   it('returns error when there is no gemAmount', async () => {
     await expect(userToSendMessage.post('/members/transfer-gems', {
       message,
@@ -202,7 +144,7 @@ describe('POST /members/transfer-gems', () => {
     expect(updatedSender.balance).to.equal(0);
   });
 
-  it('does not require a message', async () => {
+  it('does not requrie a message', async () => {
     await userToSendMessage.post('/members/transfer-gems', {
       gemAmount,
       toUserId: receiver._id,

test/api/v3/integration/qrcodes/GET-qrcodes_user.test.js

@@ -6,7 +6,7 @@ import superagent from 'superagent';
 import nconf from 'nconf';
 
 const API_TEST_SERVER_PORT = nconf.get('PORT');
-xdescribe('GET /qr-code/user/:memberId', () => {
+describe('GET /qr-code/user/:memberId', () => {
   let user;
 
   before(async () => {

test/api/v3/integration/shops/GET-shops_backgrounds.test.js

@@ -1,25 +0,0 @@
-import {
-  generateUser,
-  translate as t,
-} from '../../../../helpers/api-integration/v3';
-
-describe('GET /shops/backgrounds', () => {
-  let user;
-
-  beforeEach(async () => {
-    user = await generateUser();
-  });
-
-  it('returns a valid shop object', async () => {
-    let shop = await user.get('/shops/backgrounds');
-    expect(shop.identifier).to.equal('backgroundShop');
-    expect(shop.text).to.eql(t('backgroundShop'));
-    expect(shop.notes).to.eql(t('backgroundShopText'));
-    expect(shop.imageName).to.equal('background_shop');
-    expect(shop.sets).to.be.an('array');
-
-    let sets = shop.sets.map(set => set.identifier);
-    expect(sets).to.include('incentiveBackgrounds');
-    expect(sets).to.include('backgrounds062014');
-  });
-});

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

@@ -1,4 +1,3 @@
-import moment from 'moment';
 import {
   generateUser,
 } from '../../../../helpers/api-integration/v3';
@@ -13,7 +12,7 @@ describe('GET /tasks/user', () => {
   it('returns all user\'s tasks', async () => {
     let createdTasks = await user.post('/tasks/user', [{text: 'test habit', type: 'habit'}, {text: 'test todo', type: 'todo'}]);
     let tasks = await user.get('/tasks/user');
-    expect(tasks.length).to.equal(createdTasks.length + 1); // Plus one for generated todo
+    expect(tasks.length).to.equal(createdTasks.length + 1); // + 1 because 1 is a default task
   });
 
   it('returns only a type of user\'s tasks if req.query.type is specified', async () => {
@@ -128,106 +127,4 @@ describe('GET /tasks/user', () => {
     let allCompletedTodos = await user.get('/tasks/user?type=_allCompletedTodos');
     expect(allCompletedTodos.length).to.equal(numberOfTodos);
   });
-
-  it('returns dailies with isDue for the date specified', async () => {
-    // @TODO Add required format
-    let startDate = moment().subtract('1', 'days').toISOString();
-    let createdTasks = await user.post('/tasks/user', [
-      {
-        text: 'test daily',
-        type: 'daily',
-        startDate,
-        frequency: 'daily',
-        everyX: 2,
-      },
-    ]);
-    let dailys = await user.get('/tasks/user?type=dailys');
-
-    expect(dailys.length).to.be.at.least(1);
-    expect(dailys[0]._id).to.equal(createdTasks._id);
-    expect(dailys[0].isDue).to.be.false;
-
-    let dailys2 = await user.get(`/tasks/user?type=dailys&dueDate=${startDate}`);
-    expect(dailys2[0]._id).to.equal(createdTasks._id);
-    expect(dailys2[0].isDue).to.be.true;
-  });
-
-  xit('returns dailies with isDue for the date specified and will add CDS offset if time is not supplied and assumes timezones', async () => {
-    let timezone = 420;
-    await user.update({
-      'preferences.dayStart': 0,
-      'preferences.timezoneOffset': timezone,
-    });
-    let 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,
-      },
-    ]);
-
-    let today = moment().format('YYYY-MM-DD');
-    let dailys = await user.get(`/tasks/user?type=dailys&dueDate=${today}`);
-    expect(dailys[0].isDue).to.be.true;
-
-    let yesterday = moment().subtract('1', 'days').format('YYYY-MM-DD');
-    let 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 () => {
-    let timezone = 240;
-    await user.update({
-      'preferences.dayStart': 0,
-      'preferences.timezoneOffset': timezone,
-    });
-    let 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,
-      },
-    ]);
-
-    let today = moment().format('YYYY-MM-DD');
-    let dailys = await user.get(`/tasks/user?type=dailys&dueDate=${today}`);
-    expect(dailys[0].isDue).to.be.true;
-
-    let yesterday = moment().subtract('1', 'days').format('YYYY-MM-DD');
-    let 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 () => {
-    let timezone = 540;
-    await user.update({
-      'preferences.dayStart': 0,
-      'preferences.timezoneOffset': timezone,
-    });
-    let 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,
-      },
-    ]);
-
-    let today = moment().format('YYYY-MM-DD');
-    let dailys = await user.get(`/tasks/user?type=dailys&dueDate=${today}`);
-    expect(dailys[0].isDue).to.be.true;
-
-    let yesterday = moment().subtract('1', 'days').format('YYYY-MM-DD');
-    let dailys2 = await user.get(`/tasks/user?type=dailys&dueDate=${yesterday}`);
-    expect(dailys2[0].isDue).to.be.false;
-  });
 });

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

@@ -208,20 +208,6 @@ describe('POST /tasks/:id/score/:direction', () => {
       expect(task.completed).to.equal(false);
     });
 
-    it('computes isDue', async () => {
-      await user.post(`/tasks/${daily._id}/score/up`);
-      let task = await user.get(`/tasks/${daily._id}`);
-
-      expect(task.isDue).to.equal(true);
-    });
-
-    it('computes nextDue', async () => {
-      await user.post(`/tasks/${daily._id}/score/up`);
-      let task = await user.get(`/tasks/${daily._id}`);
-
-      expect(task.nextDue.length).to.eql(6);
-    });
-
     it('scores up daily even if it is already completed'); // Yes?
 
     it('scores down daily even if it is already uncompleted'); // Yes?

test/api/v3/integration/tasks/POST-tasks_unlink-all_challengeId.test.js

@@ -1,109 +0,0 @@
-import {
-  generateUser,
-  generateGroup,
-  generateChallenge,
-  translate as t,
-} from '../../../../helpers/api-integration/v3';
-
-describe('POST /tasks/unlink-all/:challengeId', () => {
-  let user;
-  let guild;
-  let challenge;
-  let tasksToTest = {
-    habit: {
-      text: 'test habit',
-      type: 'habit',
-      up: false,
-      down: true,
-    },
-    todo: {
-      text: 'test todo',
-      type: 'todo',
-    },
-    daily: {
-      text: 'test daily',
-      type: 'daily',
-      frequency: 'daily',
-      everyX: 5,
-      startDate: new Date(),
-    },
-    reward: {
-      text: 'test reward',
-      type: 'reward',
-    },
-  };
-
-  beforeEach(async () => {
-    user = await generateUser();
-    guild = await generateGroup(user);
-    challenge = await generateChallenge(user, guild);
-  });
-
-  it('fails if no keep query', async () => {
-    await expect(user.post(`/tasks/unlink-all/${challenge._id}`))
-    .to.eventually.be.rejected.and.eql({
-      code: 400,
-      error: 'BadRequest',
-      message: t('invalidReqParams'),
-    });
-  });
-
-  it('fails if invalid challenge id', async () => {
-    await expect(user.post('/tasks/unlink-all/123?keep=remove-all'))
-    .to.eventually.be.rejected.and.eql({
-      code: 400,
-      error: 'BadRequest',
-      message: t('invalidReqParams'),
-    });
-  });
-
-  it('fails on an unbroken challenge', async () => {
-    await user.post(`/tasks/challenge/${challenge._id}`, tasksToTest.daily);
-    await expect(user.post(`/tasks/unlink-all/${challenge._id}?keep=remove-all`))
-    .to.eventually.be.rejected.and.eql({
-      code: 400,
-      error: 'BadRequest',
-      message: t('cantOnlyUnlinkChalTask'),
-    });
-  });
-
-  it('unlinks all tasks from a challenge and deletes them on keep=remove-all', async () => {
-    const daily = await user.post(`/tasks/challenge/${challenge._id}`, tasksToTest.daily);
-    await user.post(`/tasks/challenge/${challenge._id}`, tasksToTest.habit);
-    await user.post(`/tasks/challenge/${challenge._id}`, tasksToTest.reward);
-    await user.post(`/tasks/challenge/${challenge._id}`, tasksToTest.todo);
-    await user.del(`/challenges/${challenge._id}`);
-    const response = await user.post(`/tasks/unlink-all/${challenge._id}?keep=remove-all`);
-    expect(response).to.eql({});
-
-    await expect(user.get(`/tasks/${daily._id}`)).to.eventually.be.rejected.and.eql({
-      code: 404,
-      error: 'NotFound',
-      message: t('taskNotFound'),
-    });
-  });
-
-  it('unlinks a task from a challenge on keep=keep-all', async () => {
-    const daily = await user.post(`/tasks/challenge/${challenge._id}`, tasksToTest.daily);
-    const anotherUser = await generateUser();
-    await user.post(`/groups/${guild._id}/invite`, {
-        uuids: [anotherUser._id],
-    });
-    // Have the second user join the group and challenge
-    await anotherUser.post(`/groups/${guild._id}/join`);
-    await anotherUser.post(`/challenges/${challenge._id}/join`);
-    // Have the leader delete the challenge and unlink the tasks
-    await user.del(`/challenges/${challenge._id}`);
-    await user.post(`/tasks/unlink-all/${challenge._id}?keep=keep-all`);
-    // Get the task for the second user
-    const [, anotherUserTask] = await anotherUser.get('/tasks/user');
-    // Expect the second user to still have the task, but unlinked
-    expect(anotherUserTask.challenge).to.eql({
-      taskId: daily._id,
-      id: challenge._id,
-      shortName: challenge.shortName,
-      broken: 'CHALLENGE_DELETED',
-      winner: null,
-    });
-  });
-});

test/api/v3/integration/tasks/POST-tasks_unlink-one_taskId.test.js

@@ -1,110 +0,0 @@
-import {
-  generateUser,
-  generateGroup,
-  generateChallenge,
-  translate as t,
-} from '../../../../helpers/api-integration/v3';
-import { v4 as generateUUID } from 'uuid';
-
-describe('POST /tasks/unlink-one/:taskId', () => {
-  let user;
-  let guild;
-  let challenge;
-  let tasksToTest = {
-    habit: {
-      text: 'test habit',
-      type: 'habit',
-      up: false,
-      down: true,
-    },
-    todo: {
-      text: 'test todo',
-      type: 'todo',
-    },
-    daily: {
-      text: 'test daily',
-      type: 'daily',
-      frequency: 'daily',
-      everyX: 5,
-      startDate: new Date(),
-    },
-    reward: {
-      text: 'test reward',
-      type: 'reward',
-    },
-  };
-
-  beforeEach(async () => {
-    user = await generateUser();
-    guild = await generateGroup(user);
-    challenge = await generateChallenge(user, guild);
-  });
-
-  it('fails if no keep query', async () => {
-    const daily = await user.post(`/tasks/challenge/${challenge._id}`, tasksToTest.daily);
-    await expect(user.post(`/tasks/unlink-one/${daily._id}`))
-    .to.eventually.be.rejected.and.eql({
-      code: 400,
-      error: 'BadRequest',
-      message: t('invalidReqParams'),
-    });
-  });
-
-  it('fails if invalid task id', async () => {
-    await expect(user.post('/tasks/unlink-one/123?keep=remove'))
-    .to.eventually.be.rejected.and.eql({
-      code: 400,
-      error: 'BadRequest',
-      message: t('invalidReqParams'),
-    });
-  });
-
-  it('fails on task not found', async () => {
-    await expect(user.post(`/tasks/unlink-one/${generateUUID()}?keep=keep`))
-    .to.eventually.be.rejected.and.eql({
-      code: 404,
-      error: 'NotFound',
-      message: t('taskNotFound'),
-    });
-  });
-
-  it('fails on task unlinked to challenge', async () => {
-    let daily = await user.post('/tasks/user', tasksToTest.daily);
-    await expect(user.post(`/tasks/unlink-one/${daily._id}?keep=keep`))
-    .to.eventually.be.rejected.and.eql({
-      code: 400,
-      error: 'BadRequest',
-      message: t('cantOnlyUnlinkChalTask'),
-    });
-  });
-
-  it('fails on unbroken challenge', async () => {
-    await user.post(`/tasks/challenge/${challenge._id}`, tasksToTest.daily);
-    let [daily] = await user.get('/tasks/user');
-    await expect(user.post(`/tasks/unlink-one/${daily._id}?keep=keep`))
-    .to.eventually.be.rejected.and.eql({
-      code: 400,
-      error: 'BadRequest',
-      message: t('cantOnlyUnlinkChalTask'),
-    });
-  });
-
-  it('unlinks a task from a challenge and saves it on keep=keep', async () => {
-    await user.post(`/tasks/challenge/${challenge._id}`, tasksToTest.daily);
-    let [, daily] = await user.get('/tasks/user');
-    await user.del(`/challenges/${challenge._id}`);
-    await user.post(`/tasks/unlink-one/${daily._id}?keep=keep`);
-    [, daily] = await user.get('/tasks/user');
-    expect(daily.challenge).to.eql({});
-  });
-
-  it('unlinks a task from a challenge and deletes it on keep=remove', async () => {
-    await user.post(`/tasks/challenge/${challenge._id}`, tasksToTest.daily);
-    let [, daily] = await user.get('/tasks/user');
-    await user.del(`/challenges/${challenge._id}`);
-    await user.post(`/tasks/unlink-one/${daily._id}?keep=remove`);
-    const tasks = await user.get('/tasks/user');
-    // Only the default task should remain
-    expect(tasks.length).to.eql(1);
-  });
-});

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

@@ -131,9 +131,8 @@ describe('POST /tasks/user', () => {
       expect(task.updatedAt).not.to.equal('tomorrow');
       expect(task.challenge).not.to.equal('no');
       expect(task.completed).to.equal(false);
-      expect(task.dateCompleted).not.to.equal('never');
+      expect(task.streak).not.to.equal('never');
       expect(task.value).not.to.equal(324);
-      expect(task.yesterDaily).to.equal(true);
     });
 
     it('ignores invalid fields', async () => {
@@ -510,8 +509,6 @@ describe('POST /tasks/user', () => {
       expect(task.daysOfMonth).to.eql([15]);
       expect(task.weeksOfMonth).to.eql([3]);
       expect(new Date(task.startDate)).to.eql(now);
-      expect(task.isDue).to.be.true;
-      expect(task.nextDue.length).to.eql(6);
     });
 
     it('creates multiple dailys', async () => {
@@ -616,18 +613,6 @@ describe('POST /tasks/user', () => {
       expect((new Date(task.startDate)).getDay()).to.eql(today);
     });
 
-    it('returns an error if the start date is empty', async () => {
-      await expect(user.post('/tasks/user', {
-        text: 'test daily',
-        type: 'daily',
-        startDate: '',
-      })).to.eventually.be.rejected.and.eql({
-        code: 400,
-        error: 'BadRequest',
-        message: 'daily validation failed',
-      });
-    });
-
     it('can create checklists', async () => {
       let task = await user.post('/tasks/user', {
         text: 'test daily',

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

@@ -1,4 +1,3 @@
-import moment from 'moment';
 import {
   generateUser,
   generateGroup,
@@ -396,17 +395,12 @@ describe('PUT /tasks/:id', () => {
         notes: 'some new notes',
         frequency: 'daily',
         everyX: 5,
-        yesterDaily: false,
-        startDate: moment().add(1, 'days').toDate(),
       });
 
       expect(savedDaily.text).to.eql('some new text');
       expect(savedDaily.notes).to.eql('some new notes');
       expect(savedDaily.frequency).to.eql('daily');
       expect(savedDaily.everyX).to.eql(5);
-      expect(savedDaily.isDue).to.be.false;
-      expect(savedDaily.nextDue.length).to.eql(6);
-      expect(savedDaily.yesterDaily).to.be.false;
     });
 
     it('can update checklists (replace it)', async () => {

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

@@ -4,7 +4,7 @@ import {
 } from '../../../../../helpers/api-integration/v3';
 import { find } from 'lodash';
 
-describe('Groups DELETE /tasks/:id', () => {
+describe('DELETE /tasks/:id', () => {
   let user, guild, member, member2, task;
 
   function findAssignedTask (memberTask) {
@@ -48,21 +48,6 @@ describe('Groups DELETE /tasks/:id', () => {
       });
   });
 
-  it('allows a manager to delete a group task', async () => {
-    await user.post(`/groups/${guild._id}/add-manager`, {
-      managerId: member2._id,
-    });
-
-    await member2.del(`/tasks/${task._id}`);
-
-    await expect(user.get(`/tasks/${task._id}`))
-      .to.eventually.be.rejected.and.eql({
-        code: 404,
-        error: 'NotFound',
-        message: t('taskNotFound'),
-      });
-  });
-
   it('unlinks assigned user', async () => {
     await user.del(`/tasks/${task._id}`);
 

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

@@ -55,13 +55,4 @@ describe('GET /approvals/group/:groupId', () => {
     let approvals = await user.get(`/approvals/group/${guild._id}`);
     expect(approvals[0]._id).to.equal(syncedTask._id);
   });
-
-  it('allows managers to get a list of task that need approval', async () => {
-    await user.post(`/groups/${guild._id}/add-manager`, {
-      managerId: member._id,
-    });
-
-    let approvals = await member.get(`/approvals/group/${guild._id}`);
-    expect(approvals[0]._id).to.equal(syncedTask._id);
-  });
 });

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

@@ -5,7 +5,7 @@ import {
 import { find } from 'lodash';
 
 describe('POST /tasks/:id/approve/:userId', () => {
-  let user, guild, member, member2, task;
+  let user, guild, member, task;
 
   function findAssignedTask (memberTask) {
     return memberTask.group.id === guild._id;
@@ -17,13 +17,12 @@ describe('POST /tasks/:id/approve/:userId', () => {
         name: 'Test Guild',
         type: 'guild',
       },
-      members: 2,
+      members: 1,
     });
 
     guild = group;
     user = groupLeader;
     member = members[0];
-    member2 = members[1];
 
     task = await user.post(`/tasks/group/${guild._id}`, {
       text: 'test todo',
@@ -70,74 +69,4 @@ describe('POST /tasks/:id/approve/:userId', () => {
     expect(syncedTask.group.approval.approvingUser).to.equal(user._id);
     expect(syncedTask.group.approval.dateApproved).to.be.a('string'); // date gets converted to a string as json doesn't have a Date type
   });
-
-  it('allows a manager to approve an assigned user', async () => {
-    await user.post(`/groups/${guild._id}/add-manager`, {
-      managerId: member2._id,
-    });
-
-    await member2.post(`/tasks/${task._id}/assign/${member._id}`);
-    await member2.post(`/tasks/${task._id}/approve/${member._id}`);
-
-    let memberTasks = await member.get('/tasks/user');
-    let syncedTask = find(memberTasks, findAssignedTask);
-
-    await member.sync();
-
-    expect(member.notifications.length).to.equal(2);
-    expect(member.notifications[0].type).to.equal('GROUP_TASK_APPROVED');
-    expect(member.notifications[0].data.message).to.equal(t('yourTaskHasBeenApproved', {taskText: task.text}));
-    expect(member.notifications[1].type).to.equal('SCORED_TASK');
-    expect(member.notifications[1].data.message).to.equal(t('yourTaskHasBeenApproved', {taskText: task.text}));
-
-    expect(syncedTask.group.approval.approved).to.be.true;
-    expect(syncedTask.group.approval.approvingUser).to.equal(member2._id);
-    expect(syncedTask.group.approval.dateApproved).to.be.a('string'); // date gets converted to a string as json doesn't have a Date type
-  });
-
-  it('removes approval pending notifications from managers', async () => {
-    await user.post(`/groups/${guild._id}/add-manager`, {
-      managerId: member2._id,
-    });
-
-    await member2.post(`/tasks/${task._id}/assign/${member._id}`);
-    let memberTasks = await member.get('/tasks/user');
-    let syncedTask = find(memberTasks, findAssignedTask);
-    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();
-    expect(user.notifications.length).to.equal(2);
-    expect(user.notifications[1].type).to.equal('GROUP_TASK_APPROVAL');
-    expect(member2.notifications.length).to.equal(1);
-    expect(member2.notifications[0].type).to.equal('GROUP_TASK_APPROVAL');
-
-    await member2.post(`/tasks/${task._id}/approve/${member._id}`);
-
-    await user.sync();
-    await member2.sync();
-
-    expect(user.notifications.length).to.equal(1);
-    expect(member2.notifications.length).to.equal(0);
-  });
-
-  it('prevents double approval on a task', async () => {
-    await user.post(`/groups/${guild._id}/add-manager`, {
-      managerId: member2._id,
-    });
-
-    await member2.post(`/tasks/${task._id}/assign/${member._id}`);
-    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,
-        error: 'NotAuthorized',
-        message: t('canOnlyApproveTaskOnce'),
-      });
-  });
 });

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

@@ -5,7 +5,7 @@ import {
 import { find } from 'lodash';
 
 describe('POST /tasks/:id/score/:direction', () => {
-  let user, guild, member, member2, task;
+  let user, guild, member, task;
 
   function findAssignedTask (memberTask) {
     return memberTask.group.id === guild._id;
@@ -17,13 +17,12 @@ describe('POST /tasks/:id/score/:direction', () => {
         name: 'Test Guild',
         type: 'guild',
       },
-      members: 2,
+      members: 1,
     });
 
     guild = group;
     user = groupLeader;
     member = members[0];
-    member2 = members[1];
 
     task = await user.post(`/tasks/group/${guild._id}`, {
       text: 'test todo',
@@ -52,55 +51,18 @@ describe('POST /tasks/:id/score/:direction', () => {
 
     await user.sync();
 
-    expect(user.notifications.length).to.equal(2);
-    expect(user.notifications[1].type).to.equal('GROUP_TASK_APPROVAL');
-    expect(user.notifications[1].data.message).to.equal(t('userHasRequestedTaskApproval', {
+    expect(user.notifications.length).to.equal(1);
+    expect(user.notifications[0].type).to.equal('GROUP_TASK_APPROVAL');
+    expect(user.notifications[0].data.message).to.equal(t('userHasRequestedTaskApproval', {
       user: member.auth.local.username,
       taskName: updatedTask.text,
-      taskId: updatedTask._id,
     }, 'cs')); // This test only works if we have the notification translated
-    expect(user.notifications[1].data.groupId).to.equal(guild._id);
+    expect(user.notifications[0].data.groupId).to.equal(guild._id);
 
     expect(updatedTask.group.approval.requested).to.equal(true);
     expect(updatedTask.group.approval.requestedDate).to.be.a('string'); // date gets converted to a string as json doesn't have a Date type
   });
 
-  it('sends notifications to all managers', async () => {
-    await user.post(`/groups/${guild._id}/add-manager`, {
-      managerId: member2._id,
-    });
-    let memberTasks = await member.get('/tasks/user');
-    let syncedTask = find(memberTasks, findAssignedTask);
-
-    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
-      .to.eventually.be.rejected.and.to.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('taskApprovalHasBeenRequested'),
-      });
-    let updatedTask = await member.get(`/tasks/${syncedTask._id}`);
-    await user.sync();
-    await member2.sync();
-
-    expect(user.notifications.length).to.equal(2);
-    expect(user.notifications[1].type).to.equal('GROUP_TASK_APPROVAL');
-    expect(user.notifications[1].data.message).to.equal(t('userHasRequestedTaskApproval', {
-      user: member.auth.local.username,
-      taskName: updatedTask.text,
-      taskId: updatedTask._id,
-    }));
-    expect(user.notifications[1].data.groupId).to.equal(guild._id);
-
-    expect(member2.notifications.length).to.equal(1);
-    expect(member2.notifications[0].type).to.equal('GROUP_TASK_APPROVAL');
-    expect(member2.notifications[0].data.message).to.equal(t('userHasRequestedTaskApproval', {
-      user: member.auth.local.username,
-      taskName: updatedTask.text,
-      taskId: updatedTask._id,
-    }));
-    expect(member2.notifications[0].data.groupId).to.equal(guild._id);
-  });
-
   it('errors when approval has already been requested', async () => {
     let memberTasks = await member.get('/tasks/user');
     let syncedTask = find(memberTasks, findAssignedTask);

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

@@ -1,29 +1,16 @@
 import {
   generateUser,
-  createAndPopulateGroup,
+  generateGroup,
   translate as t,
 } from '../../../../../helpers/api-v3-integration.helper';
 import { v4 as generateUUID } from 'uuid';
 
 describe('POST /tasks/group/:groupid', () => {
-  let user, guild, manager;
-  let groupName = 'Test Public Guild';
-  let groupType = 'guild';
+  let user, guild;
 
   beforeEach(async () => {
     user = await generateUser({balance: 1});
-    let { group, groupLeader, members } = await createAndPopulateGroup({
-      groupDetails: {
-        name: groupName,
-        type: groupType,
-        privacy: 'private',
-      },
-      members: 1,
-    });
-
-    guild = group;
-    user = groupLeader;
-    manager = members[0];
+    guild = await generateGroup(user, {type: 'guild'});
   });
 
   it('returns error when group is not found', async () => {
@@ -129,27 +116,4 @@ describe('POST /tasks/group/:groupid', () => {
     expect(task.everyX).to.eql(5);
     expect(new Date(task.startDate)).to.eql(now);
   });
-
-  it('allows a manager to add a group task', async () => {
-    await user.post(`/groups/${guild._id}/add-manager`, {
-      managerId: manager._id,
-    });
-
-    let task = await manager.post(`/tasks/group/${guild._id}`, {
-      text: 'test habit',
-      type: 'habit',
-      up: false,
-      down: true,
-      notes: 1976,
-    });
-
-    let groupTask = await manager.get(`/tasks/group/${guild._id}`);
-
-    expect(groupTask[0].group.id).to.equal(guild._id);
-    expect(task.text).to.eql('test habit');
-    expect(task.notes).to.eql('1976');
-    expect(task.type).to.eql('habit');
-    expect(task.up).to.eql(false);
-    expect(task.down).to.eql(true);
-  });
 });

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

@@ -6,7 +6,7 @@ import {
 import { v4 as generateUUID } from 'uuid';
 import { find } from 'lodash';
 
-describe('POST /tasks/:taskId/assign/:memberId', () => {
+describe('POST /tasks/:taskId', () => {
   let user, guild, member, member2, task;
 
   function findAssignedTask (memberTask) {
@@ -130,19 +130,4 @@ describe('POST /tasks/:taskId/assign/:memberId', () => {
     expect(member1SyncedTask).to.exist;
     expect(member2SyncedTask).to.exist;
   });
-
-  it('allows a manager to assign tasks', async () => {
-    await user.post(`/groups/${guild._id}/add-manager`, {
-      managerId: member2._id,
-    });
-
-    await member2.post(`/tasks/${task._id}/assign/${member._id}`);
-
-    let groupTask = await member2.get(`/tasks/group/${guild._id}`);
-    let memberTasks = await member.get('/tasks/user');
-    let syncedTask = find(memberTasks, findAssignedTask);
-
-    expect(groupTask[0].group.assignedUsers).to.contain(member._id);
-    expect(syncedTask).to.exist;
-  });
 });

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

@@ -114,19 +114,4 @@ describe('POST /tasks/:taskId/unassign/:memberId', () => {
     expect(groupTask[0].group.assignedUsers).to.contain(member2._id);
     expect(member2SyncedTask).to.exist;
   });
-
-  it('allows a manager to unassign a user from a task', async () => {
-    await user.post(`/groups/${guild._id}/add-manager`, {
-      managerId: member2._id,
-    });
-
-    await member2.post(`/tasks/${task._id}/unassign/${member._id}`);
-
-    let groupTask = await member2.get(`/tasks/group/${guild._id}`);
-    let memberTasks = await member.get('/tasks/user');
-    let syncedTask = find(memberTasks, findAssignedTask);
-
-    expect(groupTask[0].group.assignedUsers).to.not.contain(member._id);
-    expect(syncedTask).to.not.exist;
-  });
 });

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

@@ -89,25 +89,4 @@ describe('PUT /tasks/:id', () => {
     expect(member2SyncedTask.up).to.eql(false);
     expect(member2SyncedTask.down).to.eql(false);
   });
-
-  it('updates the linked tasks', async () => {
-    await user.post(`/groups/${guild._id}/add-manager`, {
-      managerId: member2._id,
-    });
-
-    await member2.put(`/tasks/${task._id}`, {
-      text: 'some new text',
-      up: false,
-      down: false,
-      notes: 'some new notes',
-    });
-
-
-    let memberTasks = await member.get('/tasks/user');
-    let syncedTask = find(memberTasks, findAssignedTask);
-
-    expect(syncedTask.text).to.eql('some new text');
-    expect(syncedTask.up).to.eql(false);
-    expect(syncedTask.down).to.eql(false);
-  });
 });

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

@@ -16,336 +16,214 @@ import {
   sha1MakeSalt,
   sha1Encrypt as sha1EncryptPassword,
 } from '../../../../../website/server/libs/password';
-import * as email from '../../../../../website/server/libs/email';
-
-const DELETE_CONFIRMATION = 'DELETE';
 
 describe('DELETE /user', () => {
   let user;
   let password = 'password'; // from habitrpg/test/helpers/api-integration/v3/object-generators.js
 
-  context('user with local auth', async () => {
+  beforeEach(async () => {
+    user = await generateUser({balance: 10});
+  });
+
+  it('returns an errors if password is wrong', async () => {
+    await expect(user.del('/user', {
+      password: 'wrong-password',
+    })).to.eventually.be.rejected.and.eql({
+      code: 401,
+      error: 'NotAuthorized',
+      message: t('wrongPassword'),
+    });
+  });
+
+  it('returns an error if user has active subscription', async () => {
+    let userWithSubscription = await generateUser({'purchased.plan.customerId': 'fake-customer-id'});
+
+    await expect(userWithSubscription.del('/user', {
+      password,
+    })).to.be.rejected.and.to.eventually.eql({
+      code: 401,
+      error: 'NotAuthorized',
+      message: t('cannotDeleteActiveAccount'),
+    });
+  });
+
+  it('deletes the user\'s tasks', async () => {
+    // gets the user's tasks ids
+    let ids = [];
+    each(user.tasksOrder, (idsForOrder) => {
+      ids.push(...idsForOrder);
+    });
+
+    expect(ids.length).to.be.above(0); // make sure the user has some task to delete
+
+    await user.del('/user', {
+      password,
+    });
+
+    await Bluebird.all(map(ids, id => {
+      return expect(checkExistence('tasks', id)).to.eventually.eql(false);
+    }));
+  });
+
+  it('reduces memberCount in challenges user is linked to', async () => {
+    let populatedGroup = await createAndPopulateGroup({
+      members: 2,
+    });
+
+    let group = populatedGroup.group;
+    let authorizedUser = populatedGroup.members[1];
+
+    let challenge = await generateChallenge(populatedGroup.groupLeader, group);
+    await authorizedUser.post(`/challenges/${challenge._id}/join`);
+
+    await challenge.sync();
+
+    expect(challenge.memberCount).to.eql(2);
+
+    await authorizedUser.del('/user', {
+      password,
+    });
+
+    await challenge.sync();
+
+    expect(challenge.memberCount).to.eql(1);
+  });
+
+  it('deletes the user', async () => {
+    await user.del('/user', {
+      password,
+    });
+    await expect(checkExistence('users', user._id)).to.eventually.eql(false);
+  });
+
+  it('deletes the user with a legacy sha1 password', async () => {
+    let textPassword = 'mySecretPassword';
+    let salt = sha1MakeSalt();
+    let sha1HashedPassword = sha1EncryptPassword(textPassword, salt);
+
+    await user.update({
+      'auth.local.hashed_password': sha1HashedPassword,
+      'auth.local.passwordHashMethod': 'sha1',
+      'auth.local.salt': salt,
+    });
+
+    await user.sync();
+
+    expect(user.auth.local.passwordHashMethod).to.equal('sha1');
+    expect(user.auth.local.salt).to.equal(salt);
+    expect(user.auth.local.hashed_password).to.equal(sha1HashedPassword);
+
+    // delete the user
+    await user.del('/user', {
+      password: textPassword,
+    });
+    await expect(checkExistence('users', user._id)).to.eventually.eql(false);
+  });
+
+  context('last member of a party', () => {
+    let party;
+
     beforeEach(async () => {
-      user = await generateUser({balance: 10});
-    });
-
-    it('returns an error if password is wrong', async () => {
-      await expect(user.del('/user', {
-        password: 'wrong-password',
-      })).to.eventually.be.rejected.and.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('wrongPassword'),
+      party = await generateGroup(user, {
+        type: 'party',
+        privacy: 'private',
       });
     });
 
-    it('returns an error if password is not supplied', async () => {
-      await expect(user.del('/user', {
-        password: '',
-      })).to.eventually.be.rejected.and.eql({
-        code: 400,
-        error: 'BadRequest',
-        message: t('missingPassword'),
-      });
-    });
-
-    it('deletes the user', async () => {
+    it('deletes party when user is the only member', async () => {
       await user.del('/user', {
         password,
       });
-      await expect(checkExistence('users', user._id)).to.eventually.eql(false);
+      await expect(checkExistence('party', party._id)).to.eventually.eql(false);
     });
+  });
 
-    it('returns an error if excessive feedback is supplied', async () => {
-      let feedbackText = 'spam feedback ';
-      let feedback = feedbackText;
-      while (feedback.length < 10000) {
-        feedback = feedback + feedbackText;
-      }
+  context('last member of a private guild', () => {
+    let privateGuild;
 
-      await expect(user.del('/user', {
-        password,
-        feedback,
-      })).to.eventually.be.rejected.and.eql({
-        code: 400,
-        error: 'BadRequest',
-        message: 'Account deletion feedback is limited to 10,000 characters. For lengthy feedback, email admin@habitica.com.',
+    beforeEach(async () => {
+      privateGuild = await generateGroup(user, {
+        type: 'guild',
+        privacy: 'private',
       });
     });
 
-    it('returns an error if user has active subscription', async () => {
-      let userWithSubscription = await generateUser({'purchased.plan.customerId': 'fake-customer-id'});
-
-      await expect(userWithSubscription.del('/user', {
-        password,
-      })).to.be.rejected.and.to.eventually.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('cannotDeleteActiveAccount'),
-      });
-    });
-
-    it('deletes the user\'s tasks', async () => {
-      await user.post('/tasks/user', {
-        text: 'test habit',
-        type: 'habit',
-      });
-      await user.sync();
-
-      // gets the user's tasks ids
-      let ids = [];
-      each(user.tasksOrder, (idsForOrder) => {
-        ids.push(...idsForOrder);
-      });
-
-      expect(ids.length).to.be.above(0); // make sure the user has some task to delete
-
+    it('deletes guild when user is the only member', async () => {
       await user.del('/user', {
         password,
       });
-
-      await Bluebird.all(map(ids, id => {
-        return expect(checkExistence('tasks', id)).to.eventually.eql(false);
-      }));
+      await expect(checkExistence('groups', privateGuild._id)).to.eventually.eql(false);
     });
+  });
 
-    it('reduces memberCount in challenges user is linked to', async () => {
-      let populatedGroup = await createAndPopulateGroup({
-        members: 2,
-      });
+  context('groups user is leader of', () => {
+    let guild, oldLeader, newLeader;
 
-      let group = populatedGroup.group;
-      let authorizedUser = populatedGroup.members[1];
-
-      let challenge = await generateChallenge(populatedGroup.groupLeader, group);
-      await authorizedUser.post(`/challenges/${challenge._id}/join`);
-
-      await challenge.sync();
-
-      expect(challenge.memberCount).to.eql(2);
-
-      await authorizedUser.del('/user', {
-        password,
-      });
-
-      await challenge.sync();
-
-      expect(challenge.memberCount).to.eql(1);
-    });
-
-    it('sends feedback to the admin email', async () => {
-      sandbox.spy(email, 'sendTxn');
-
-      let feedback = 'Reasons for Deletion';
-      await user.del('/user', {
-        password,
-        feedback,
-      });
-
-      expect(email.sendTxn).to.be.calledOnce;
-
-      sandbox.restore();
-    });
-
-    it('does not send email if no feedback is supplied', async () => {
-      sandbox.spy(email, 'sendTxn');
-
-      await user.del('/user', {
-        password,
-      });
-
-      expect(email.sendTxn).to.not.be.called;
-
-      sandbox.restore();
-    });
-
-    it('deletes the user with a legacy sha1 password', async () => {
-      let textPassword = 'mySecretPassword';
-      let salt = sha1MakeSalt();
-      let sha1HashedPassword = sha1EncryptPassword(textPassword, salt);
-
-      await user.update({
-        'auth.local.hashed_password': sha1HashedPassword,
-        'auth.local.passwordHashMethod': 'sha1',
-        'auth.local.salt': salt,
-      });
-
-      await user.sync();
-
-      expect(user.auth.local.passwordHashMethod).to.equal('sha1');
-      expect(user.auth.local.salt).to.equal(salt);
-      expect(user.auth.local.hashed_password).to.equal(sha1HashedPassword);
-
-      // delete the user
-      await user.del('/user', {
-        password: textPassword,
-      });
-      await expect(checkExistence('users', user._id)).to.eventually.eql(false);
-    });
-
-    context('last member of a party', () => {
-      let party;
-
-      beforeEach(async () => {
-        party = await generateGroup(user, {
-          type: 'party',
-          privacy: 'private',
-        });
-      });
-
-      it('deletes party when user is the only member', async () => {
-        await user.del('/user', {
-          password,
-        });
-        await expect(checkExistence('party', party._id)).to.eventually.eql(false);
-      });
-    });
-
-    context('last member of a private guild', () => {
-      let privateGuild;
-
-      beforeEach(async () => {
-        privateGuild = await generateGroup(user, {
-          type: 'guild',
-          privacy: 'private',
-        });
-      });
-
-      it('deletes guild when user is the only member', async () => {
-        await user.del('/user', {
-          password,
-        });
-        await expect(checkExistence('groups', privateGuild._id)).to.eventually.eql(false);
-      });
-    });
-
-    context('groups user is leader of', () => {
-      let guild, oldLeader, newLeader;
-
-      beforeEach(async () => {
-        let { group, groupLeader, members } = await createAndPopulateGroup({
-          groupDetails: {
-            type: 'guild',
-            privacy: 'public',
-          },
-          members: 1,
-        });
-
-        guild = group;
-        newLeader = members[0];
-        oldLeader = groupLeader;
-      });
-
-      it('chooses new group leader for any group user was the leader of', async () => {
-        await oldLeader.del('/user', {
-          password,
-        });
-
-        let updatedGuild = await newLeader.get(`/groups/${guild._id}`);
-
-        expect(updatedGuild.leader).to.exist;
-        expect(updatedGuild.leader._id).to.not.eql(oldLeader._id);
-      });
-    });
-
-    context('groups user is a part of', () => {
-      let group1, group2, userToDelete, otherUser;
-
-      beforeEach(async () => {
-        userToDelete = await generateUser({balance: 10});
-
-        group1 = await generateGroup(userToDelete, {
+    beforeEach(async () => {
+      let { group, groupLeader, members } = await createAndPopulateGroup({
+        groupDetails: {
           type: 'guild',
           privacy: 'public',
-        });
-
-        let {group, members} = await createAndPopulateGroup({
-          groupDetails: {
-            type: 'guild',
-            privacy: 'public',
-          },
-          members: 3,
-        });
-
-        group2 = group;
-        otherUser = members[0];
-
-        await userToDelete.post(`/groups/${group2._id}/join`);
+        },
+        members: 1,
       });
 
-      it('removes user from all groups user was a part of', async () => {
-        await userToDelete.del('/user', {
-          password,
-        });
+      guild = group;
+      newLeader = members[0];
+      oldLeader = groupLeader;
+    });
 
-        let updatedGroup1Members = await otherUser.get(`/groups/${group1._id}/members`);
-        let updatedGroup2Members = await otherUser.get(`/groups/${group2._id}/members`);
-        let userInGroup = find(updatedGroup2Members, (member) => {
-          return member._id === userToDelete._id;
-        });
-
-        expect(updatedGroup1Members).to.be.empty;
-        expect(updatedGroup2Members).to.not.be.empty;
-        expect(userInGroup).to.not.exist;
+    it('chooses new group leader for any group user was the leader of', async () => {
+      await oldLeader.del('/user', {
+        password,
       });
+
+      let updatedGuild = await newLeader.get(`/groups/${guild._id}`);
+
+      expect(updatedGuild.leader).to.exist;
+      expect(updatedGuild.leader._id).to.not.eql(oldLeader._id);
     });
   });
 
-  context('user with Facebook auth', async () => {
+  context('groups user is a part of', () => {
+    let group1, group2, userToDelete, otherUser;
+
     beforeEach(async () => {
-      user = await generateUser({
-        auth: {
-          facebook: {
-            id: 'facebook-id',
-          },
+      userToDelete = await generateUser({balance: 10});
+
+      group1 = await generateGroup(userToDelete, {
+        type: 'guild',
+        privacy: 'public',
+      });
+
+      let {group, members} = await createAndPopulateGroup({
+        groupDetails: {
+          type: 'guild',
+          privacy: 'public',
         },
+        members: 3,
       });
+
+      group2 = group;
+      otherUser = members[0];
+
+      await userToDelete.post(`/groups/${group2._id}/join`);
     });
 
-    it('returns an error if confirmation phrase is wrong', async () => {
-      await expect(user.del('/user', {
-        password: 'just-do-it',
-      })).to.eventually.be.rejected.and.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('incorrectDeletePhrase'),
+    it('removes user from all groups user was a part of', async () => {
+      await userToDelete.del('/user', {
+        password,
       });
-    });
 
-    it('returns an error if confirmation phrase is not supplied', async () => {
-      await expect(user.del('/user', {
-        password: '',
-      })).to.eventually.be.rejected.and.eql({
-        code: 400,
-        error: 'BadRequest',
-        message: t('missingPassword'),
+      let updatedGroup1Members = await otherUser.get(`/groups/${group1._id}/members`);
+      let updatedGroup2Members = await otherUser.get(`/groups/${group2._id}/members`);
+      let userInGroup = find(updatedGroup2Members, (member) => {
+        return member._id === userToDelete._id;
       });
-    });
 
-    it('deletes a Facebook user', async () => {
-      await user.del('/user', {
-        password: DELETE_CONFIRMATION,
-      });
-      await expect(checkExistence('users', user._id)).to.eventually.eql(false);
-    });
-  });
-
-  context('user with Google auth', async () => {
-    beforeEach(async () => {
-      user = await generateUser({
-        auth: {
-          google: {
-            id: 'google-id',
-          },
-        },
-      });
-    });
-
-    it('deletes a Google user', async () => {
-      await user.del('/user', {
-        password: DELETE_CONFIRMATION,
-      });
-      await expect(checkExistence('users', user._id)).to.eventually.eql(false);
+      expect(updatedGroup1Members).to.be.empty;
+      expect(updatedGroup2Members).to.not.be.empty;
+      expect(userInGroup).to.not.exist;
     });
   });
 });

test/api/v3/integration/user/GET-user_anonymized.test.js

@@ -82,7 +82,7 @@ describe('GET /user/anonymized', () => {
     });
     // tasks
     expect(tasks2).to.exist;
-    expect(tasks2.length).to.eql(5);
+    expect(tasks2.length).to.eql(5); // +1 because generateUser() assigns one todo
     expect(tasks2[0].checklist).to.exist;
     _.forEach(tasks2, (task) => {
       expect(task.text).to.eql('task text');

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

@@ -56,7 +56,6 @@ describe('POST /user/buy/:key', () => {
         message: t('messageHealthAlreadyMax'),
       });
   });
-
   it('buys a piece of gear', async () => {
     let key = 'armor_warrior_1';
 
@@ -65,21 +64,4 @@ describe('POST /user/buy/:key', () => {
 
     expect(user.items.gear.owned.armor_warrior_1).to.eql(true);
   });
-
-  it('buys a special spell', async () => {
-    let key = 'spookySparkles';
-    let item = content.special[key];
-
-    await user.update({'stats.gp': 250});
-    let res = await user.post(`/user/buy/${key}`);
-    await user.sync();
-
-    expect(res.data).to.eql({
-      items: JSON.parse(JSON.stringify(user.items)), // otherwise dates can't be compared
-      stats: user.stats,
-    });
-    expect(res.message).to.equal(t('messageBought', {
-      itemText: item.text(),
-    }));
-  });
 });

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

@@ -221,27 +221,6 @@ describe('POST /user/class/cast/:spellId', () => {
     expect(syncedGroupTask.value).to.equal(0);
   });
 
-  it('increases both user\'s achievement values', async () => {
-    let party = await createAndPopulateGroup({
-      members: 1,
-    });
-    let leader = party.groupLeader;
-    let recipient = party.members[0];
-    await leader.update({'stats.gp': 10});
-    await leader.post(`/user/class/cast/birthday?targetId=${recipient._id}`);
-    await leader.sync();
-    await recipient.sync();
-    expect(leader.achievements.birthday).to.equal(1);
-    expect(recipient.achievements.birthday).to.equal(1);
-  });
-
-  it('only increases user\'s achievement one if target == caster', async () => {
-    await user.update({'stats.gp': 10});
-    await user.post(`/user/class/cast/birthday?targetId=${user._id}`);
-    await user.sync();
-    expect(user.achievements.birthday).to.equal(1);
-  });
-
   // 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 === \'task\'');

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

@@ -1,6 +1,5 @@
 import {
   generateUser,
-  createAndPopulateGroup,
   translate as t,
 } from '../../../../helpers/api-integration/v3';
 
@@ -32,70 +31,4 @@ describe('POST /user/purchase/:type/:key', () => {
 
     expect(user.items[type][key]).to.equal(1);
   });
-
-  it('can convert gold to gems if subscribed', async () => {
-    let oldBalance = user.balance;
-    await user.update({
-      'purchased.plan.customerId': 'group-plan',
-      'stats.gp': 1000,
-    });
-    await user.post('/user/purchase/gems/gem');
-    await user.sync();
-    expect(user.balance).to.equal(oldBalance + 0.25);
-  });
-
-  it('leader can convert gold to gems even if the group plan prevents it', async () => {
-    let { group, groupLeader } = await createAndPopulateGroup({
-      groupDetails: {
-        name: 'test',
-        type: 'guild',
-        privacy: 'private',
-      },
-    });
-    await group.update({
-      'leaderOnly.getGems': true,
-      'purchased.plan.customerId': 123,
-    });
-    await groupLeader.sync();
-    let oldBalance = groupLeader.balance;
-
-    await groupLeader.update({
-      'purchased.plan.customerId': 'group-plan',
-      'stats.gp': 1000,
-    });
-    await groupLeader.post('/user/purchase/gems/gem');
-
-    await groupLeader.sync();
-    expect(groupLeader.balance).to.equal(oldBalance + 0.25);
-  });
-
-  it('cannot convert gold to gems if the group plan prevents it', async () => {
-    let { group, members } = await createAndPopulateGroup({
-      groupDetails: {
-        name: 'test',
-        type: 'guild',
-        privacy: 'private',
-      },
-      members: 1,
-    });
-    await group.update({
-      'leaderOnly.getGems': true,
-      'purchased.plan.customerId': 123,
-    });
-    let oldBalance = members[0].balance;
-
-    await members[0].update({
-      'purchased.plan.customerId': 'group-plan',
-      'stats.gp': 1000,
-    });
-    await expect(members[0].post('/user/purchase/gems/gem'))
-      .to.eventually.be.rejected.and.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('groupPolicyCannotGetGems'),
-      });
-
-    await members[0].sync();
-    expect(members[0].balance).to.equal(oldBalance);
-  });
 });

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

@@ -2,34 +2,17 @@ import {
   generateUser,
   translate as t,
 } from '../../../../helpers/api-integration/v3';
-import content from '../../../../../website/common/script/content/index';
 
 describe('POST /user/release-both', () => {
   let user;
   let animal = 'Wolf-Base';
-  const loadPets = () => {
-    let pets = {};
-    for (let p in content.pets) {
-      pets[p] = content.pets[p];
-      pets[p] = 5;
-    }
-    return pets;
-  };
-  const loadMounts = () => {
-    let mounts = {};
-    for (let m in content.pets) {
-      mounts[m] = content.pets[m];
-      mounts[m] = true;
-    }
-    return mounts;
-  };
 
   beforeEach(async () => {
     user = await generateUser({
       'items.currentMount': animal,
       'items.currentPet': animal,
-      'items.pets': loadPets(),
-      'items.mounts': loadMounts(),
+      'items.pets': {animal: 5},
+      'items.mounts': {animal: true},
     });
   });