3.66.0

feat(content): Armoire and BGs 2017-01
fix: prevents blank messages from being posted to chat (#8257 )
2026-05-09 19:20:41 -05:00 · 2017-01-03 22:03:09 +00:00 · 2017-01-03 21:35:23 +00:00 · 2017-01-03 07:15:31 -07:00 · 2017-01-03 00:50:46 +00:00 · 2017-01-03 00:19:20 +00:00
2687 changed files with 112912 additions and 42281 deletions
@@ -0,0 +1,3 @@
+node_modules
+.git
+website
@@ -14,7 +14,7 @@ files:
    owner: root
    group: users
    content: |
-      $(ls -td /opt/elasticbeanstalk/node-install/node-* | head -1)/bin/npm install -g npm@3
+      $(ls -td /opt/elasticbeanstalk/node-install/node-* | head -1)/bin/npm install -g npm@4
 container_commands:
  01_makeBabel:
    command: "touch /tmp/.babel.json"
@@ -1,27 +1,27 @@
 # Compiled and vendored files
-common/dist/
-common/transpiled-babel/
 coverage/
 database_reports/
 website/build/
 website/transpiled-babel/
+website/common/transpiled-babel/
+dist/
+dist-client/

+# Not linted
 migrations/*
-
-# The files in website/client-old/js should be moved out and browserified
 website/client-old/
-
-# Temporarilly disabled. These should be removed when the linting errors are fixed
-website/common/script/content/index.js
-website/common/browserify.js
-
-debug-scripts/*
 scripts/*
-tasks/*.js
-gulpfile.js
-Gruntfile.js
-newrelic.js
-
-test/content/**/*
 test/server_side/**/*
 test/client-old/spec/**/*
+
+# Temporarilly disabled. These should be removed when the linting errors are fixed TODO
+website/common/script/content/index.js
+website/common/browserify.js
+test/content/**/*
+Gruntfile.js
+gulpfile.js
+gulp
+webpack
+test/client/e2e
+test/client/unit/index.js
+test/client/unit/karma.conf.js
@@ -1,10 +1,10 @@
 {
+  "root": true,
+  "env": {
+    "node": true,
+  },
  "extends": [
-    "habitrpg/server",
-    "habitrpg/babel"
+    "habitrpg",
+    "habitrpg/esnext"
  ],
-  "globals": {
-    "Promise": true,
-    "Set": false
-  }
 }
@@ -9,5 +9,6 @@ Fixes put_issue_url_here


 [//]: # (Put User ID in here - found in Settings -> API)
+
 ----
 UUID: 
@@ -14,7 +14,6 @@ npm-debug.log*
 lib
 website/client-old/bower_components
 website/client-old/new-stuff.html
-website/build
 newrelic_agent.log
 .bower-tmp
 .bower-registry
@@ -32,8 +31,11 @@ website/client-old/docs
 coverage
 coverage.html
 common/dist/scripts/*
-
-test/spec/mocks/translations.js
+dist
+dist-client
+test/client/unit/coverage
+test/client/e2e/reports
+test/client-old/spec/mocks/translations.js

 # Elastic Beanstalk Files
 .elasticbeanstalk/*
@@ -6,6 +6,7 @@ website/client-old/**
 website/client/**
 website/views/**
 website/build/**
+dist/**
 test/**
 .git/**
 Gruntfile.js
@@ -1 +1 @@
-4.3.1
+6
@@ -1,17 +1,22 @@
 language: node_js
 node_js:
-  - '4.3.1'
+  - '6'
 before_install:
-  - "npm install -g npm@3"
-  - "npm install -g gulp"
-  - "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"
+  - 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
 before_script:
-  - 'npm install -g grunt-cli mocha'
+  - npm run test:build
  - cp config.json.example config.json
-  - "until nc -z localhost 27017; do echo Waiting for MongoDB; sleep 1; done"
-  - "export DISPLAY=:99"
+  - 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"
+  - ./node_modules/.bin/lcov-result-merger 'coverage/**/*.info' | ./node_modules/coveralls/bin/coveralls.js
+script: npm run $TEST
+env:
+  matrix:
+    - TEST="lint"
+    - TEST="test:api-v3" REQUIRES_SERVER=true
+    - TEST="test:sanity"
+    - TEST="test:content"
+    - TEST="test:common"
+    - TEST="test:karma"
+    - TEST="client:unit"
@@ -17,20 +17,22 @@ RUN apt-get install -y \
    python

 # Install NodeJS
-RUN curl -sL https://deb.nodesource.com/setup_4.x | sudo -E bash -
+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 npm@3
-RUN npm install -g gulp grunt-cli bower
+RUN npm install -g gulp grunt-cli bower mocha

 # Clone Habitica repo and install dependencies
 WORKDIR /habitrpg
-RUN git clone https://github.com/HabitRPG/habitrpg.git /habitrpg
+RUN git clone https://github.com/HabitRPG/habitica.git /habitrpg
 RUN npm install
 RUN bower install --allow-root

@@ -9,10 +9,10 @@ module.exports = function(grunt) {

    karma: {
      unit: {
-        configFile: 'karma.conf.js'
+        configFile: 'test/client-old/spec/karma.conf.js'
      },
      continuous: {
-        configFile: 'karma.conf.js',
+        configFile: 'test/client-old/spec/karma.conf.js',
        singleRun: true,
        autoWatch: false
      }
@@ -57,10 +57,10 @@ module.exports = function(grunt) {
        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/'},
-          {expand: true, cwd: '', src: 'website/assets/sprites/backer-only/*.gif', dest: 'website/build/'},
-          {expand: true, cwd: '', src: 'website/assets/sprites/npc_ian.gif', dest: 'website/build/'},
-          {expand: true, cwd: '', src: 'website/assets/sprites/quest_*.gif', 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/'}
        ]
      }
@@ -77,10 +77,9 @@ module.exports = function(grunt) {
          'website/build/*.css',
          'website/build/favicon.ico',
          'website/build/favicon_192x192.png',
-          'website/build/website/assets/sprites/dist/*.png',
-          'website/build/website/assets/sprites/backer-only/*.gif',
-          'website/build/website/assets/sprites/npc_ian.gif',
-          'website/build/website/assets/sprites/quest_*.gif',
+          'website/build/*.png',
+          'website/build/static/sprites/*.png',
+          'website/build/*.gif',
          'website/build/bower_components/bootstrap/dist/fonts/*'
        ],
        dest: 'website/build/*.css'
@@ -128,15 +127,7 @@ module.exports = function(grunt) {
  // 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', ['test:prepare:translations', 'build:dev']);
-
-  grunt.registerTask('test:prepare:translations', function() {
-    var i18n  = require('./website/server/libs/i18n'),
-        fs    = require('fs');
-    fs.writeFileSync('test/client-old/spec/mocks/translations.js',
-      "if(!window.env) window.env = {};\n" +
-      "window.env.translations = " + JSON.stringify(i18n.translations['en']) + ';');
-  });
+  grunt.registerTask('build:test', ['build:dev']);

  // Load tasks
  grunt.loadNpmTasks('grunt-contrib-uglify');
@@ -146,6 +137,6 @@ module.exports = function(grunt) {
  grunt.loadNpmTasks('grunt-contrib-copy');
  grunt.loadNpmTasks('grunt-contrib-watch');
  grunt.loadNpmTasks('grunt-hashres');
-  grunt.loadNpmTasks('grunt-karma');
+  if (process.env.NODE_ENV !== 'production') grunt.loadNpmTasks('grunt-karma');

 };
@@ -1,4 +1,4 @@
-Habitica [![Build Status](https://travis-ci.org/HabitRPG/habitrpg.svg?branch=develop)](https://travis-ci.org/HabitRPG/habitrpg) [![Code Climate](https://codeclimate.com/github/HabitRPG/habitrpg.svg)](https://codeclimate.com/github/HabitRPG/habitrpg) [![Coverage Status](https://coveralls.io/repos/HabitRPG/habitrpg/badge.svg?branch=develop)](https://coveralls.io/r/HabitRPG/habitrpg?branch=develop) [![Bountysource](https://api.bountysource.com/badge/tracker?tracker_id=68393)](https://www.bountysource.com/trackers/68393-habitrpg?utm_source=68393&utm_medium=shield&utm_campaign=TRACKER_BADGE)
+Habitica [![Build Status](https://travis-ci.org/HabitRPG/habitica.svg?branch=develop)](https://travis-ci.org/HabitRPG/habitica) [![Code Climate](https://codeclimate.com/github/HabitRPG/habitrpg.svg)](https://codeclimate.com/github/HabitRPG/habitrpg) [![Coverage Status](https://coveralls.io/repos/HabitRPG/habitrpg/badge.svg?branch=develop)](https://coveralls.io/r/HabitRPG/habitrpg?branch=develop) [![Bountysource](https://api.bountysource.com/badge/tracker?tracker_id=68393)](https://www.bountysource.com/trackers/68393-habitrpg?utm_source=68393&utm_medium=shield&utm_campaign=TRACKER_BADGE)
 ===============

 [Habitica](https://habitica.com) is an open source habit building program which treats your life like a Role Playing Game. Level up as you succeed, lose HP as you fail, earn money to buy weapons and armor.
@@ -10,21 +10,3 @@ For an introduction to the technologies used and how the software is organized,
 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.
-
-## Debug Scripts
-
-In the `./debug-scripts/` folder, there are a few files. Here's a sample:
-
-```bash
-grant-all-equipment.js
-grant-all-mounts.js
-grant-all-pets.js
-```
-
-You can run them by doing:
-
-```bash
-node debug-scripts/name-of-script.js
-```
-
-If there are more arguments required to make the script work, it will print out the usage and an explanation of what the script does.
@@ -36,14 +36,15 @@
    "jquery-ui": "1.10.3",
    "jquery.cookie": "1.4.0",
    "js-emoji": "snicker/js-emoji#f25d8a303f",
-    "ngInfiniteScroll": "1.0.0",
+    "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.1.0"
+    "pusher-websocket-iso": "pusher#^3.2.0",
+    "taggle": "^1.11.1"
  },
  "devDependencies": {
    "angular-mocks": "1.3.9"
@@ -7,6 +7,8 @@
    "FACEBOOK_ANALYTICS":"1234567890123456",
    "FACEBOOK_KEY":"123456789012345",
    "FACEBOOK_SECRET":"aaaabbbbccccddddeeeeffff00001111",
+    "GOOGLE_CLIENT_ID":"123456789012345",
+    "GOOGLE_CLIENT_SECRET":"aaaabbbbccccddddeeeeffff00001111",
    "NODE_DB_URI":"mongodb://localhost/habitrpg",
    "TEST_DB_URI":"mongodb://localhost/habitrpg_test",
    "NODE_ENV":"development",
@@ -77,6 +79,7 @@
    },
    "SLACK": {
        "FLAGGING_URL": "https://hooks.slack.com/services/id/id/id",
-        "FLAGGING_FOOTER_LINK": "https://habitrpg.github.io/flag-o-rama/"
+        "FLAGGING_FOOTER_LINK": "https://habitrpg.github.io/flag-o-rama/",
+        "SUBSCRIPTIONS_URL": "https://hooks.slack.com/services/id/id/id"
    }
 }
@@ -1,19 +0,0 @@
-import { MongoClient as mongo } from 'mongodb';
-import config from '../config';
-
-module.exports.updateUser = (_id, path, value) => {
-  mongo.connect(config.NODE_DB_URI, (err, db) => {
-    if (err) throw err;
-
-    let collection = db.collection('users');
-    collection.updateOne(
-      { _id },
-      { $set: { [`${path}`]: value } },
-      (updateErr, result) => {
-        if (updateErr) throw updateErr;
-        console.log('done updating', _id);
-        db.close();
-      }
-    );
-  });
-}
@@ -1,24 +0,0 @@
-'use strict';
-
-require('babel-register');
-
-let _ = require('lodash');
-let updateUser = require('./_helper').updateUser;
-
-let userId = process.argv[2];
-
-if (!userId) {
-  console.error('USAGE: node debug-scripts/grant-all-equipment.js <user_id>');
-  console.error('EFFECT: Adds all gear to specified user');
-  return;
-}
-
-let gearFlat = require('../common').content.gear.flat;
-
-let userGear = {};
-
-_.each(gearFlat, (piece, key) => {
-  userGear[key] = true;
-});
-
-updateUser(userId, 'items.gear.owned', userGear);
@@ -1,28 +0,0 @@
-'use strict';
-
-require('babel-register');
-
-let _ = require('lodash');
-let updateUser = require('./_helper').updateUser;
-let userId = process.argv[2];
-
-if (!userId) {
-  console.error('USAGE: node debug-scripts/grant-all-mounts.js <user_id>');
-  console.error('EFFECT: Adds all mounts to specified user');
-  return;
-}
-
-let dropMounts = require('../common').content.mounts;
-let questMounts = require('../common').content.questMounts;
-let specialMounts = require('../common').content.specialMounts;
-let premiumMounts = require('../common').content.premiumPets; // premium mounts isn't exposed on the content object
-
-let userMounts = {};
-
-_.each([ dropMounts, questMounts, specialMounts, premiumMounts ], (set) => {
-  _.each(set, (pet, key) => {
-    userMounts[key] = true;
-  });
-})
-
-updateUser(userId, 'items.mounts', userMounts);
@@ -1,28 +0,0 @@
-'use strict';
-
-require('babel-register');
-
-let _ = require('lodash');
-let updateUser = require('./_helper').updateUser;
-let userId = process.argv[2];
-
-if (!userId) {
-  console.error('USAGE: node debug-scripts/grant-all-pets.js <user_id>');
-  console.error('EFFECT: Adds all pets to specified user');
-  return;
-}
-
-let dropPets = require('../common').content.pets;
-let questPets = require('../common').content.questPets;
-let specialPets = require('../common').content.specialPets;
-let premiumPets = require('../common').content.premiumPets;
-
-let userPets = {};
-
-_.each([ dropPets, questPets, specialPets, premiumPets ], (set) => {
-  _.each(set, (pet, key) => {
-    userPets[key] = 95;
-  });
-})
-
-updateUser(userId, 'items.pets', userPets);
@@ -1,3 +1,3 @@
 web:
  volumes:
-  - '.:/habitrpg'
+    - '.:/habitrpg'
@@ -1,13 +1,13 @@
 web:
  build: .
  ports:
-   - "3000:3000"
+    - "3000:3000"
  links:
-  - mongo
+    - mongo
  environment:
-  - NODE_DB_URI=mongodb://mongo/habitrpg
+    - NODE_DB_URI=mongodb://mongo/habitrpg

 mongo:
  image: mongo
  ports:
-   - "27017:27017"
+    - "27017:27017"
@@ -0,0 +1,10 @@
+{
+  "root": true,
+  "env": {
+    "node": true,
+  },
+  "extends": [
+    "habitrpg/server",
+    "habitrpg/babel"
+  ],
+}
@@ -15,8 +15,12 @@ gulp.task('apidoc', ['apidoc:clean'], (done) => {
  });

  if (result === false) {
-    done(new Error('There was a problem generating apiDoc documentation.'))
+    done(new Error('There was a problem generating apiDoc documentation.'));
  } else {
    done();
  }
 });
+
+gulp.task('apidoc:watch', ['apidoc'], () => {
+  return gulp.watch(APIDOC_SRC_PATH + '/**/*.js', ['apidoc']);
+});
@@ -25,7 +25,7 @@ gulp.task('build:common', () => {

 gulp.task('build:server', ['build:src', 'build:common']);

-gulp.task('build:dev', ['browserify', 'prepare:staticNewStuff'], (done) => {
+gulp.task('build:dev', ['browserify', 'prepare:staticNewStuff', 'semantic-ui'], (done) => {
  gulp.start('grunt-build:dev', done);
 });

@@ -33,7 +33,7 @@ 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) => {
+gulp.task('build:prod', ['browserify', 'build:server', 'prepare:staticNewStuff', 'semantic-ui'], (done) => {
  runSequence(
    'grunt-build:prod',
    'apidoc',
@@ -10,11 +10,11 @@ let improveRepl = (context) => {

  // Let "exit" and "quit" terminate the console
  ['exit', 'quit'].forEach((term) => {
-    Object.defineProperty(context, term, { get() { process.exit(); }});
+    Object.defineProperty(context, term, { get () { process.exit(); }});
  });

  // "clear" clears the screen
-  Object.defineProperty(context, 'clear', { get() {
+  Object.defineProperty(context, 'clear', { get () {
    process.stdout.write('\u001B[2J\u001B[0;0f');
  }});

@@ -25,13 +25,13 @@ let improveRepl = (context) => {
  var isProd = nconf.get('NODE_ENV') === 'production';
  var mongooseOptions = !isProd ? {} : {
    replset: { socketOptions: { keepAlive: 1, connectTimeoutMS: 30000 } },
-    server: { socketOptions: { keepAlive: 1, connectTimeoutMS: 30000 } }
+    server: { socketOptions: { keepAlive: 1, connectTimeoutMS: 30000 } },
  };
  autoinc.init(
    mongoose.connect(
      nconf.get('NODE_DB_URI'),
      mongooseOptions,
-      function(err) {
+      function (err) {
        if (err) throw err;
        logger.info('Connected with Mongoose');
      }
@@ -42,6 +42,6 @@ let improveRepl = (context) => {

 gulp.task('console', (cb) => {
  improveRepl(repl.start({
-    prompt: 'Habitica > '
+    prompt: 'Habitica > ',
  }).context);
 });
@@ -0,0 +1,43 @@
+import gulp from 'gulp';
+import fs from 'fs';
+
+// Make semantic-ui-less work with a theme in a different folder
+// Code taken from https://www.artembutusov.com/webpack-semantic-ui/
+
+// Relative to node_modules/semantic-ui-less
+const SEMANTIC_THEME_PATH = '../../website/client/assets/less/semantic-ui/theme.config';
+
+// fix well known bug with default distribution
+function fixFontPath (filename) {
+  return new Promise((resolve, reject) => {
+    fs.readFile(filename, 'utf8', (err, content) => {
+      if (err) return reject(err);
+
+      let newContent = content.replace(
+        '@fontPath  : \'../../themes/',
+        '@fontPath  : \'../../../themes/'
+      );
+
+      fs.writeFile(filename, newContent, 'utf8', (err1) => {
+        if (err) return reject(err1);
+        resolve();
+      });
+    });
+  });
+}
+
+gulp.task('semantic-ui', (done) => {
+  // relocate default config
+  fs.writeFile(
+    'node_modules/semantic-ui-less/theme.config',
+    `@import '${SEMANTIC_THEME_PATH}';\n`,
+    'utf8',
+    (err) => {
+      if (err) return done(err);
+
+      fixFontPath('node_modules/semantic-ui-less/themes/default/globals/site.variables')
+        .then(() => done())
+        .catch(done);
+    }
+  );
+});
@@ -12,6 +12,9 @@ import {each} from 'lodash';
 const MAX_SPRITESHEET_SIZE = 1024 * 1024 * 3;
 const DIST_PATH = 'website/assets/sprites/dist/';

+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', () => {
@@ -25,7 +28,7 @@ gulp.task('sprites:largeSprites', () => {
 });

 gulp.task('sprites:clean', (done) => {
-  clean(`${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'], () => {
@@ -52,7 +55,7 @@ gulp.task('sprites:checkCompiledDimensions', ['sprites:main', 'sprites:largeSpri
  }
 });

-function createSpritesStream(name, src) {
+function createSpritesStream (name, src) {
  let spritesheetSliceIndicies = calculateSpritesheetsSrcIndicies(src);
  let stream = mergeStream();

@@ -66,14 +69,16 @@ function createSpritesStream(name, src) {
        algorithm: 'binary-tree',
        padding: 1,
        cssTemplate: 'website/assets/sprites/css/css.template.handlebars',
-        cssVarMap: cssVarMap
+        cssVarMap: cssVarMap,
      }));

    let imgStream = spriteData.img
      .pipe(imagemin())
+      .pipe(gulp.dest(IMG_DIST_PATH_NEW_CLIENT))
      .pipe(gulp.dest(DIST_PATH));

    let cssStream = spriteData.css
+      .pipe(gulp.dest(CSS_DIST_PATH_NEW_CLIENT))
      .pipe(gulp.dest(DIST_PATH));

    stream.add(imgStream);
@@ -83,7 +88,7 @@ function createSpritesStream(name, src) {
  return stream;
 }

-function calculateSpritesheetsSrcIndicies(src) {
+function calculateSpritesheetsSrcIndicies (src) {
  let totalPixels = 0;
  let slices = [0];

@@ -100,7 +105,7 @@ function calculateSpritesheetsSrcIndicies(src) {
  return slices;
 }

-function calculateImgDimensions(img, addPadding) {
+function calculateImgDimensions (img, addPadding) {
  let dims = sizeOf(img);

  let requiresSpecialTreatment = checkForSpecialTreatment(img);
@@ -109,7 +114,7 @@ function calculateImgDimensions(img, addPadding) {
    let newHeight = dims.height < 90 ? 90 : dims.height;
    dims = {
      width: newWidth,
-      height: newHeight
+      height: newHeight,
    };
  }

@@ -119,19 +124,19 @@ function calculateImgDimensions(img, addPadding) {
    padding = (dims.width * 8) + (dims.height * 8);
  }

-  if(!dims.width || !dims.height) console.error('MISSING DIMENSIONS:', dims);
+  if (!dims.width || !dims.height) console.error('MISSING DIMENSIONS:', dims);

  let totalPixelSize = (dims.width * dims.height) + padding;

  return totalPixelSize;
 }

-function checkForSpecialTreatment(name) {
+function checkForSpecialTreatment (name) {
  let regex = /^hair|skin|beard|mustach|shirt|flower|^headAccessory_special_\w+Ears|^eyewear_special_\w+TopFrame/;
  return name.match(regex) || name === 'head_0';
 }

-function cssVarMap(sprite) {
+function cssVarMap (sprite) {
  // For hair, skins, beards, etc. we want to output a '.customize-options.WHATEVER' class, which works as a
  // 60x60 image pointing at the proper part of the 90x90 sprite.
  // We set up the custom info here, and the template makes use of it.
@@ -142,10 +147,15 @@ function cssVarMap(sprite) {
        offset_x: `-${ sprite.x + 25 }px`,
        offset_y: `-${ sprite.y + 15 }px`,
        width: '60px',
-        height: '60px'
-      }
-    }
+        height: '60px',
+      },
+    };
  }
  if (~sprite.name.indexOf('shirt'))
    sprite.custom.px.offset_y = `-${ sprite.y + 30 }px`; // even more for shirts
+  if (~sprite.name.indexOf('hair_base')) {
+    let styleArray = sprite.name.split('_').slice(2,3);
+    if (Number(styleArray[0]) > 14)
+      sprite.custom.px.offset_y = `-${ sprite.y }px`; // don't crop updos
+  }
 }
@@ -12,6 +12,6 @@ gulp.task('nodemon', () => {
      'website/client-old/*',
      'website/views/*',
      'common/dist/script/content/*',
-    ]
+    ],
  });
 });
@@ -13,10 +13,13 @@ import Bluebird                   from 'bluebird';
 import runSequence                from 'run-sequence';
 import os                         from 'os';
 import nconf                      from 'nconf';
+import fs from 'fs';
+
+const i18n = require('../website/server/libs/i18n');

 // TODO rewrite

-const TEST_SERVER_PORT  = 3003
+const TEST_SERVER_PORT  = 3003;
 let server;

 const TEST_DB_URI       = nconf.get('TEST_DB_URI');
@@ -33,11 +36,11 @@ let testResults = [];
 let testCount = (stdout, regexp) => {
  let match = stdout.match(regexp);
  return parseInt(match && match[1] || 0);
-}
+};

 let testBin = (string, additionalEnvVariables = '') => {
-  if(os.platform() === "win32") {
-    if(additionalEnvVariables != '') {
+  if (os.platform() === 'win32') {
+    if (additionalEnvVariables != '') {
      additionalEnvVariables = additionalEnvVariables.split(' ').join('&&set ');
      additionalEnvVariables = 'set ' + additionalEnvVariables + '&&';
    }
@@ -49,7 +52,7 @@ let testBin = (string, additionalEnvVariables = '') => {

 gulp.task('test:nodemon', (done) => {
  process.env.PORT = TEST_SERVER_PORT;
-  process.env.NODE_DB_URI=TEST_DB_URI;
+  process.env.NODE_DB_URI = TEST_DB_URI;

  runSequence('nodemon');
 });
@@ -65,17 +68,24 @@ gulp.task('test:prepare:mongo', (cb) => {

 gulp.task('test:prepare:server', ['test:prepare:mongo'], () => {
  if (!server) {
-    server = exec(testBin(`node ./website/server/index.js`, `NODE_DB_URI=${TEST_DB_URI} PORT=${TEST_SERVER_PORT}`), (error, stdout, stderr) => {
+    server = exec(testBin('node ./website/server/index.js', `NODE_DB_URI=${TEST_DB_URI} PORT=${TEST_SERVER_PORT}`), (error, stdout, stderr) => {
      if (error) { throw `Problem with the server: ${error}`; }
      if (stderr) { console.error(stderr); }
    });
  }
 });

-gulp.task('test:prepare:build', ['build'], (cb) => {
-  exec(testBin('grunt build:test'), cb);
+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);
 });
@@ -83,7 +93,7 @@ gulp.task('test:prepare:webdriver', (cb) => {
 gulp.task('test:prepare', [
  'test:prepare:build',
  'test:prepare:mongo',
-  'test:prepare:webdriver'
+  'test:prepare:webdriver',
 ]);

 gulp.task('test:sanity', (cb) => {
@@ -128,7 +138,7 @@ gulp.task('test:common:safe', ['test:prepare:build'], (cb) => {
        suite: 'Common Specs\t',
        pass: testCount(stdout, /(\d+) passing/),
        fail: testCount(stdout, /(\d+) failing/),
-        pend: testCount(stdout, /(\d+) pending/)
+        pend: testCount(stdout, /(\d+) pending/),
      });
      cb();
    }
@@ -167,33 +177,7 @@ gulp.task('test:content:safe', ['test:prepare:build'], (cb) => {
        suite: 'Content Specs\t',
        pass: testCount(stdout, /(\d+) passing/),
        fail: testCount(stdout, /(\d+) failing/),
-        pend: testCount(stdout, /(\d+) pending/)
-      });
-      cb();
-    }
-  );
-  pipe(runner);
-});
-
-gulp.task('test:server_side', ['test:prepare:build'], (cb) => {
-  let runner = exec(
-    testBin(SERVER_SIDE_TEST_COMMAND),
-    (err, stdout, stderr) => {
-      cb(err);
-    }
-  );
-  pipe(runner);
-});
-
-gulp.task('test:server_side:safe', ['test:prepare:build'], (cb) => {
-  let runner = exec(
-    testBin(SERVER_SIDE_TEST_COMMAND),
-    (err, stdout, stderr) => {
-      testResults.push({
-        suite: 'Server Side Specs',
-        pass: testCount(stdout, /(\d+) passing/),
-        fail: testCount(stdout, /(\d+) failing/),
-        pend: testCount(stdout, /(\d+) pending/)
+        pend: testCount(stdout, /(\d+) pending/),
      });
      cb();
    }
@@ -232,7 +216,7 @@ gulp.task('test:karma:safe', ['test:prepare:build'], (cb) => {
        suite: 'Karma Specs\t',
        pass: testCount(stdout, /(\d+) tests? completed/),
        fail: testCount(stdout, /(\d+) tests? failed/),
-        pend: testCount(stdout, /(\d+) tests? skipped/)
+        pend: testCount(stdout, /(\d+) tests? skipped/),
      });
      cb();
    }
@@ -249,7 +233,7 @@ gulp.task('test:e2e', ['test:prepare', 'test:prepare:server'], (cb) => {

  Bluebird.all([
    awaitPort(TEST_SERVER_PORT),
-    awaitPort(4444)
+    awaitPort(4444),
  ]).then(() => {
    let runner = exec(
      'npm run test:e2e',
@@ -273,7 +257,7 @@ gulp.task('test:e2e:safe', ['test:prepare', 'test:prepare:server'], (cb) => {

  Bluebird.all([
    awaitPort(TEST_SERVER_PORT),
-    awaitPort(4444)
+    awaitPort(4444),
  ]).then(() => {
    let runner = exec(
      'npm run test:e2e',
@@ -284,7 +268,7 @@ gulp.task('test:e2e:safe', ['test:prepare', 'test:prepare:server'], (cb) => {
          suite: 'End-to-End Specs\t',
          pass: testCount(stdout, /(\d+) passing/),
          fail: testCount(stdout, /(\d+) failing/),
-          pend: testCount(stdout, /(\d+) pending/)
+          pend: testCount(stdout, /(\d+) pending/),
        });
        support.forEach(kill);
        cb();
@@ -296,14 +280,14 @@ gulp.task('test:e2e:safe', ['test:prepare', 'test:prepare:server'], (cb) => {

 gulp.task('test:api-v3:unit', (done) => {
  let runner = exec(
-    testBin('mocha test/api/v3/unit --recursive'),
+    testBin('mocha test/api/v3/unit --recursive --require ./test/helpers/start-server'),
    (err, stdout, stderr) => {
      if (err) {
        process.exit(1);
      }
      done();
    }
-  )
+  );

  pipe(runner);
 });
@@ -314,15 +298,15 @@ gulp.task('test:api-v3:unit:watch', () => {

 gulp.task('test:api-v3:integration', (done) => {
  let runner = exec(
-    testBin('mocha test/api/v3/integration --recursive'),
-    {maxBuffer: 500*1024},
+    testBin('mocha test/api/v3/integration --recursive --require ./test/helpers/start-server'),
+    {maxBuffer: 500 * 1024},
    (err, stdout, stderr) => {
      if (err) {
        process.exit(1);
      }
      done();
    }
-  )
+  );

  pipe(runner);
 });
@@ -334,10 +318,10 @@ gulp.task('test:api-v3:integration:watch', () => {

 gulp.task('test:api-v3:integration:separate-server', (done) => {
  let runner = exec(
-    testBin('mocha test/api/v3/integration --recursive', 'LOAD_SERVER=0'),
-    {maxBuffer: 500*1024},
+    testBin('mocha test/api/v3/integration --recursive --require ./test/helpers/start-server', 'LOAD_SERVER=0'),
+    {maxBuffer: 500 * 1024},
    (err, stdout, stderr) => done(err)
-  )
+  );

  pipe(runner);
 });
@@ -7,8 +7,8 @@ import { postToSlack, conf } from './taskHelper';
 const SLACK_CONFIG = {
  channel: conf.get('TRANSIFEX_SLACK_CHANNEL'),
  username: 'Transifex',
-  emoji: 'transifex'
-}
+  emoji: 'transifex',
+};

 const LOCALES = './website/common/locales/';
 const ENGLISH_LOCALE = `${LOCALES}en/`;
@@ -17,8 +17,8 @@ const ALL_LANGUAGES = getArrayOfLanguages();
 const malformedStringExceptions = {
  messageDropFood: true,
  armoireFood: true,
-  feedPet: true
-}
+  feedPet: true,
+};

 gulp.task('transifex', ['transifex:missingFiles', 'transifex:missingStrings', 'transifex:malformedStrings']);

@@ -27,7 +27,7 @@ gulp.task('transifex:missingFiles', () => {
  let missingStrings = [];

  eachTranslationFile(ALL_LANGUAGES, (error) => {
-    if(error) {
+    if (error) {
      missingStrings.push(error.path);
    }
  });
@@ -67,13 +67,13 @@ gulp.task('transifex:malformedStrings', () => {
  let stringsWithIncorrectNumberOfInterpolations = [];

  let count = 0;
-  _(ALL_LANGUAGES).each(function(lang) {
+  _(ALL_LANGUAGES).each(function (lang) {

-    _.each(stringsToLookFor, function(strings, file) {
+    _.each(stringsToLookFor, function (strings, file) {
      let translationFile = fs.readFileSync(LOCALES + lang + '/' + file);
      let parsedTranslationFile = JSON.parse(translationFile);

-      _.each(strings, function(value, key) {
+      _.each(strings, function (value, key) {
        let translationString = parsedTranslationFile[key];
        if (!translationString) return;

@@ -104,14 +104,14 @@ gulp.task('transifex:malformedStrings', () => {
  }
 });

-function getArrayOfLanguages() {
+function getArrayOfLanguages () {
  let languages = fs.readdirSync(LOCALES);
  languages.shift(); // Remove README.md from array of languages

  return languages;
 }

-function eachTranslationFile(languages, cb) {
+function eachTranslationFile (languages, cb) {
  let jsonFiles = stripOutNonJsonFiles(fs.readdirSync(ENGLISH_LOCALE));

  _(languages).each((lang) => {
@@ -126,12 +126,12 @@ function eachTranslationFile(languages, cb) {
      let englishFile = fs.readFileSync(ENGLISH_LOCALE + filename);
      let parsedEnglishFile = JSON.parse(englishFile);

-      cb(null, lang, filename, parsedEnglishFile, parsedTranslationFile)
+      cb(null, lang, filename, parsedEnglishFile, parsedTranslationFile);
    });
  }).value();
 }

-function eachTranslationString(languages, cb) {
+function eachTranslationString (languages, cb) {
  eachTranslationFile(languages, (error, language, filename, englishJSON, translationJSON) => {
    if (error) return;
    _.each(englishJSON, (string, key) => {
@@ -141,7 +141,7 @@ function eachTranslationString(languages, cb) {
  });
 }

-function formatMessageForPosting(msg, items) {
+function formatMessageForPosting (msg, items) {
  let body = `*Warning:* ${msg}`;
  body += '\n\n```\n';
  body += items.join('\n');
@@ -150,24 +150,24 @@ function formatMessageForPosting(msg, items) {
  return body;
 }

-function getStringsWith(json, interpolationRegex) {
+function getStringsWith (json, interpolationRegex) {
  var strings = {};

-  _(json).each(function(file_name) {
+  _(json).each(function (file_name) {
    var raw_file = fs.readFileSync(ENGLISH_LOCALE + file_name);
    var parsed_json = JSON.parse(raw_file);

    strings[file_name] = {};
-    _.each(parsed_json, function(value, key) {
+    _.each(parsed_json, function (value, key) {
      var match = value.match(interpolationRegex);
-      if(match) strings[file_name][key] = match;
+      if (match) strings[file_name][key] = match;
    });
  }).value();

  return strings;
 }

-function stripOutNonJsonFiles(collection) {
+function stripOutNonJsonFiles (collection) {
  let onlyJson = _.filter(collection, (file) => {
    return file.match(/[a-zA-Z]*\.json/);
  });
@@ -19,23 +19,23 @@ export var conf = nconf;
 * This is necessary to ensure that Gulp will terminate when it has completed
 * its tasks.
 */
-export function kill(proc) {
+export function kill (proc) {
  let killProcess = (pid) => {
    psTree(pid, (_, pids) => {
-      if(pids.length) {
-        pids.forEach(kill); return
+      if (pids.length) {
+        pids.forEach(kill); return;
      }
      try {
        exec(/^win/.test(process.platform)
          ? `taskkill /PID ${pid} /T /F`
-          : `kill -9 ${pid}`)
+          : `kill -9 ${pid}`);
      }
-      catch(e) { console.log(e) }
+      catch (e) { console.log(e); }
    });
-  }
+  };

  killProcess(proc.PID || proc.pid);
-};
+}

 /*
 * Return a promise that will execute when Node is able to connect on a
@@ -43,7 +43,7 @@ export function kill(proc) {
 * has fully spun up. Optionally provide a maximum number of seconds to wait
 * before failing.
 */
-export function awaitPort (port, max=60) {
+export function awaitPort (port, max = 60) {
  return new Bluebird((reject, resolve) => {
    let socket, timeout, interval;

@@ -58,23 +58,23 @@ export function awaitPort (port, max=60) {
        clearTimeout(timeout);
        socket.destroy();
        resolve();
-      }).on('error', () => { socket.destroy });
+      }).on('error', () => { socket.destroy; });
    }, 1000);
  });
-};
+}

 /*
 * Pipe the child's stdin and stderr to the parent process.
 */
-export function pipe(child) {
-  child.stdout.on('data', (data) => { process.stdout.write(data) });
-  child.stderr.on('data', (data) => { process.stderr.write(data) });
-};
+export function pipe (child) {
+  child.stdout.on('data', (data) => { process.stdout.write(data); });
+  child.stderr.on('data', (data) => { process.stderr.write(data); });
+}

 /*
 * Post request to notify configured slack channel
 */
-export function postToSlack(msg, config={}) {
+export function postToSlack (msg, config = {}) {
  let slackUrl = nconf.get('SLACK_URL');

  if (!slackUrl) {
@@ -89,14 +89,14 @@ export function postToSlack(msg, config={}) {
      channel: `#${config.channel || '#general'}`,
      username: config.username || 'gulp task',
      text: msg,
-      icon_emoji: `:${config.emoji || 'gulp'}:`
+      icon_emoji: `:${config.emoji || 'gulp'}:`,
    })
    .end((err, res) => {
      if (err) console.error('Unable to post to slack', err);
    });
 }

-export function runMochaTests(files, server, cb) {
+export function runMochaTests (files, server, cb) {
  require('../test/helpers/globals.helper');

  let mocha = new Mocha({reporter: 'spec'});
@@ -9,11 +9,12 @@
 require('babel-register');

 if (process.env.NODE_ENV === 'production') {
-  require('./tasks/gulp-apidoc');
-  require('./tasks/gulp-newstuff');
-  require('./tasks/gulp-build');
-  require('./tasks/gulp-babelify');
+  require('./gulp/gulp-semanticui');
+  require('./gulp/gulp-apidoc');
+  require('./gulp/gulp-newstuff');
+  require('./gulp/gulp-build');
+  require('./gulp/gulp-babelify');
 } else {
-  require('glob').sync('./tasks/gulp-*').forEach(require);
+  require('glob').sync('./gulp/gulp-*').forEach(require);
  require('gulp').task('default', ['test']);
 }
@@ -1,95 +0,0 @@
-// Karma configuration
-// http://karma-runner.github.io/0.10/config/configuration-file.html
-
-module.exports = function karmaConfig (config) {
-  config.set({
-    // base path, that will be used to resolve files and exclude
-    basePath: '',
-
-    // testing framework to use (jasmine/mocha/qunit/...)
-    frameworks: ['mocha', 'chai', 'chai-as-promised', 'sinon-chai'],
-
-    // list of files / patterns to load in the browser
-    files: [
-      'website/client-old/bower_components/jquery/dist/jquery.js',
-      'website/client-old/bower_components/pnotify/jquery.pnotify.js',
-      'website/client-old/bower_components/angular/angular.js',
-      'website/client-old/bower_components/angular-loading-bar/build/loading-bar.min.js',
-      'website/client-old/bower_components/angular-resource/angular-resource.min.js',
-      'website/client-old/bower_components/hello/dist/hello.all.min.js',
-      'website/client-old/bower_components/angular-sanitize/angular-sanitize.js',
-      'website/client-old/bower_components/bootstrap/dist/js/bootstrap.js',
-      'website/client-old/bower_components/angular-bootstrap/ui-bootstrap.js',
-      'website/client-old/bower_components/angular-bootstrap/ui-bootstrap-tpls.js',
-      'website/client-old/bower_components/angular-ui-router/release/angular-ui-router.js',
-      'website/client-old/bower_components/angular-filter/dist/angular-filter.js',
-      'website/client-old/bower_components/angular-ui/build/angular-ui.js',
-      'website/client-old/bower_components/angular-ui-utils/ui-utils.min.js',
-      'website/client-old/bower_components/Angular-At-Directive/src/at.js',
-      'website/client-old/bower_components/Angular-At-Directive/src/caret.js',
-      'website/client-old/bower_components/angular-mocks/angular-mocks.js',
-      'website/client-old/bower_components/ngInfiniteScroll/build/ng-infinite-scroll.js',
-      'website/client-old/bower_components/select2/select2.js',
-      'website/client-old/bower_components/angular-ui-select2/src/select2.js',
-      'website/client-old/bower_components/habitica-markdown/dist/habitica-markdown.min.js',
-      'website/client-old/js/habitrpg-shared.js',
-
-      'test/client-old/spec/mocks/**/*.js',
-
-      'website/client-old/js/env.js',
-      'website/client-old/js/app.js',
-      'common/script/public/config.js',
-      'common/script/public/directives.js',
-
-      'website/client-old/js/services/**/*.js',
-      'website/client-old/js/filters/**/*.js',
-      'website/client-old/js/directives/**/*.js',
-      'website/client-old/js/controllers/**/*.js',
-
-      'test/client-old/spec/specHelper.js',
-      'test/client-old/spec/**/*.js',
-    ],
-
-    // list of files / patterns to exclude
-    exclude: [],
-
-    // web server port
-    port: 8080,
-
-    // level of logging
-    // possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
-    logLevel: config.LOG_INFO,
-
-
-    // enable / disable watching file and executing tests whenever any file changes
-    autoWatch: true,
-
-
-    // Start these browsers, currently available:
-    // - Chrome
-    // - ChromeCanary
-    // - Firefox
-    // - Opera
-    // - Safari (only Mac)
-    // - PhantomJS
-    // - IE (only Windows)
-    browsers: ['PhantomJS'],
-
-    preprocessors: {
-      'website/client-old/js/**/*.js': ['coverage'],
-      'test/**/*.js': ['babel'],
-    },
-
-    coverageReporter: {
-      type: 'lcov',
-      dir: 'coverage/karma',
-    },
-
-    // Enable mocha-style reporting, for better test visibility
-    reporters: ['mocha', 'coverage'],
-
-    // Continuous Integration mode
-    // if true, it capture browsers, run tests and exit
-    singleRun: false,
-  });
-};
@@ -0,0 +1,116 @@
+'use strict';
+
+/****************************************
+ * Author: Blade Barringer @crookedneighbor
+ *
+ * Reason: Webhooks have been moved from
+ * being an object on preferences.webhooks
+ * to being an array on webhooks. In addition
+ * they support a type and options and label
+* ***************************************/
+
+global.Promise = require('bluebird');
+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 validator = require('validator');
+
+const timer = new Timer();
+const MIGRATION_NAME = '20161002_add_missing_webhook_type.js';
+
+// 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/prod-copy-1';
+
+const LOGGEDIN_DATE_RANGE = {
+  $gte: new Date("2016-09-30T00:00:00.000Z"),
+  // $lte: new Date("2016-09-25T00:00:00.000Z"),
+};
+
+let Users;
+
+connectToDb(DB_URI).then((db) => {
+  Users = db.collection('users');
+})
+.then(findUsersWithWebhooks)
+.then(correctWebhooks)
+.then(() => {
+  timer.stop();
+  closeDb();
+}).catch(reportError);
+
+function reportError (err) {
+  logger.error('Uh oh, an error occurred');
+  logger.error(err);
+  closeDb();
+  timer.stop();
+}
+
+// Cached ids of users that need updating
+const USER_IDS = require('../../ids_of_webhooks_to_update.json');
+
+function findUsersWithWebhooks () {
+  logger.warn('Fetching users with webhooks...');
+
+  return Users.find({'_id': {$in: USER_IDS}}, ['preferences.webhooks']).toArray().then((docs) => {
+  // return Users.find({'preferences.webhooks': {$ne: {} }}, ['preferences.webhooks']).toArray().then((docs) => {
+  // TODO: Run this after the initial migration to catch any webhooks that may have been aded since the prod backup download
+  // return Users.find({'preferences.webhooks': {$ne: {} }, 'auth.timestamps.loggedin': LOGGEDIN_DATE_RANGE}, ['preferences.webhooks']).toArray().then((docs) => {
+    let updates = docs.map((user) => {
+      let oldWebhooks = user.preferences.webhooks;
+      let webhooks = Object.keys(oldWebhooks).map((id) => {
+        let webhook = oldWebhooks[id]
+
+        webhook.type = 'taskActivity';
+        webhook.label = '';
+        webhook.options = {
+          created: false,
+          updated: false,
+          deleted: false,
+          scored: true,
+        };
+
+        return webhook;
+      }).sort((a, b) => {
+        return a.sort - b.sort;
+      });
+
+      return {
+        webhooks,
+        id: user._id,
+      }
+    });
+
+    return Promise.resolve(updates);
+  });
+}
+
+function updateUserById (user) {
+  let userId = user.id;
+  let webhooks = user.webhooks;
+
+  return Users.findOneAndUpdate({
+    _id: userId},
+    {$set: {webhooks: webhooks, migration: MIGRATION_NAME}
+  }, {returnOriginal: false})
+}
+
+function correctWebhooks (users) {
+  let queue = new TaskQueue(Promise, 300);
+
+  logger.warn('About to update', users.length, 'users...');
+
+  return Promise.map(users, queue.wrap(updateUserById)).then((result) => {
+    let updates = result.filter(res => res.lastErrorObject && res.lastErrorObject.updatedExisting)
+    let failures = result.filter(res => !(res.lastErrorObject && res.lastErrorObject.updatedExisting));
+
+    logger.warn(updates.length, 'users have been fixed');
+
+    if (failures.length > 0) {
+      logger.error(failures.length, 'users could not be found');
+    }
+
+    return Promise.resolve();
+  });
+}
@@ -0,0 +1,73 @@
+var migrationName = '20161002_takeThis.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 Take This ladder items to participants in this month's challenge
+ */
+
+var mongo = require('mongoskin');
+
+var connectionString = 'mongodb://localhost:27017/habitrpg?auto_reconnect=true'; // FOR TEST DATABASE
+
+var dbUsers = mongo.db(connectionString).collection('users');
+
+// specify a query to limit the affected users (empty for all users):
+var query = {
+  'migration':{$ne:migrationName},
+  'challenges':{$in:['4bbf63b5-10bc-49f9-8e95-5bd2ac99cd1c']}
+};
+
+// specify fields we are interested in to limit retrieved data (empty if we're not reading data):
+var fields = {
+  'items.gear.owned': 1
+};
+
+console.warn('Updating users...');
+var progressCount = 1000;
+var count = 0;
+dbUsers.findEach(query, fields, {batchSize:250}, function(err, user) {
+  if (err) { return exiting(1, 'ERROR! ' + err); }
+  if (!user) {
+    console.warn('All appropriate users found and modified.');
+    setTimeout(displayData, 300000);
+    return;
+  }
+  count++;
+
+  // specify user data to change:
+  var set = {};
+
+  if (typeof user.items.gear.owned.armor_special_takeThis !== 'undefined') {
+    set = {'migration':migrationName, 'items.gear.owned.head_special_takeThis':false};
+  } else if (typeof user.items.gear.owned.weapon_special_takeThis !== 'undefined') {
+    set = {'migration':migrationName, 'items.gear.owned.armor_special_takeThis':false};
+  } else if (typeof user.items.gear.owned.shield_special_takeThis !== 'undefined') {
+    set = {'migration':migrationName, 'items.gear.owned.weapon_special_takeThis':false};
+  } else {
+    set = {'migration':migrationName, 'items.gear.owned.shield_special_takeThis':false};
+  }
+
+  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);
+}
+
@@ -0,0 +1,86 @@
+var migrationName = '20161030-jackolanterns.js';
+var authorName = 'Sabe'; // in case script author needs to know when their ...
+var authorUuid = '7f14ed62-5408-4e1b-be83-ada62d504931'; //... own data is done
+
+/*
+ * set the newStuff flag in all user accounts so they see a Bailey message
+ */
+
+var mongo = require('mongoskin');
+
+var connectionString = 'mongodb://localhost:27017/habitrpg?auto_reconnect=true'; // FOR TEST DATABASE
+
+var dbUsers = mongo.db(connectionString).collection('users');
+
+// specify a query to limit the affected users (empty for all users):
+var query = {
+  'auth.timestamps.loggedin':{$gt:new Date('2016-10-01')} // remove when running migration a second time
+};
+
+// specify fields we are interested in to limit retrieved data (empty if we're not reading data):
+var fields = {
+  'migration': 1,
+  'items.pets.JackOLantern-Base': 1,
+  'items.mounts.JackOLantern-Base': 1,
+};
+
+console.warn('Updating users...');
+var progressCount = 1000;
+var count = 0;
+dbUsers.findEach(query, fields, {batchSize:250}, function(err, user) {
+  if (err) { return exiting(1, 'ERROR! ' + err); }
+  if (!user) {
+    console.warn('All appropriate users found and modified.');
+    setTimeout(displayData, 300000);
+    return;
+  }
+  count++;
+
+  // specify user data to change:
+  var set = {};
+  var inc = {};
+  if (user.migration !== migrationName) {
+    if (user.items.mounts['JackOLantern-Base']) {
+      set = {'migration':migrationName, 'items.pets.JackOLantern-Ghost':5};
+    } else if (user.items.pets['JackOLantern-Base']) {
+      set = {'migration':migrationName, 'items.mounts.JackOLantern-Base':true};
+    } else {
+      set = {'migration':migrationName, 'items.pets.JackOLantern-Base':5};
+    }
+    inc = {
+      'items.food.Candy_Base': 1,
+      'items.food.Candy_CottonCandyBlue': 1,
+      'items.food.Candy_CottonCandyPink': 1,
+      'items.food.Candy_Desert': 1,
+      'items.food.Candy_Golden': 1,
+      'items.food.Candy_Red': 1,
+      'items.food.Candy_Shade': 1,
+      'items.food.Candy_Skeleton': 1,
+      'items.food.Candy_White': 1,
+      'items.food.Candy_Zombie': 1,
+    }
+  }
+
+  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);
+}
+
@@ -0,0 +1,75 @@
+var migrationName = '20161102_takeThis.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 Take This ladder items to participants in this month's challenge
+ */
+
+var mongo = require('mongoskin');
+
+var connectionString = 'mongodb://localhost:27017/habitrpg?auto_reconnect=true'; // FOR TEST DATABASE
+
+var dbUsers = mongo.db(connectionString).collection('users');
+
+// specify a query to limit the affected users (empty for all users):
+var query = {
+  'migration':{$ne:migrationName},
+  'challenges':{$in:['d1be0965-e909-4d30-82fa-9a0011f885b2']}
+};
+
+// specify fields we are interested in to limit retrieved data (empty if we're not reading data):
+var fields = {
+  'items.gear.owned': 1
+};
+
+console.warn('Updating users...');
+var progressCount = 1000;
+var count = 0;
+dbUsers.findEach(query, fields, {batchSize:250}, function(err, user) {
+  if (err) { return exiting(1, 'ERROR! ' + err); }
+  if (!user) {
+    console.warn('All appropriate users found and modified.');
+    setTimeout(displayData, 300000);
+    return;
+  }
+  count++;
+
+  // specify user data to change:
+  var set = {};
+
+  if (typeof user.items.gear.owned.head_special_takeThis !== 'undefined') {
+    set = {'migration':migrationName, 'items.gear.owned.body_special_takeThis':false};
+  } else if (typeof user.items.gear.owned.armor_special_takeThis !== 'undefined') {
+    set = {'migration':migrationName, 'items.gear.owned.head_special_takeThis':false};
+  } else if (typeof user.items.gear.owned.weapon_special_takeThis !== 'undefined') {
+    set = {'migration':migrationName, 'items.gear.owned.armor_special_takeThis':false};
+  } else if (typeof user.items.gear.owned.shield_special_takeThis !== 'undefined') {
+    set = {'migration':migrationName, 'items.gear.owned.weapon_special_takeThis':false};
+  } else {
+    set = {'migration':migrationName, 'items.gear.owned.shield_special_takeThis':false};
+  }
+
+  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);
+}
+
@@ -0,0 +1,74 @@
+var migrationName = '20161122_turkey_ladder.js';
+var authorName = 'Sabe'; // in case script author needs to know when their ...
+var authorUuid = '7f14ed62-5408-4e1b-be83-ada62d504931'; //... own data is done
+
+/*
+ * Yearly Turkey Day award. Turkey pet, Turkey mount, Gilded Turkey pet, Gilded Turkey mount
+ */
+
+var mongo = require('mongoskin');
+
+var connectionString = 'mongodb://localhost:27017/habitrpg?auto_reconnect=true'; // FOR TEST DATABASE
+
+var dbUsers = mongo.db(connectionString).collection('users');
+
+// specify a query to limit the affected users (empty for all users):
+var query = {
+  'migration':{$ne:migrationName},
+  'auth.timestamps.loggedin':{$gt:new Date('2016-10-31')} // Extend timeframe each run of migration
+};
+
+// specify fields we are interested in to limit retrieved data (empty if we're not reading data):
+var fields = {
+  'migration': 1,
+  'items.mounts': 1,
+  'items.pets': 1,
+};
+
+console.warn('Updating users...');
+var progressCount = 1000;
+var count = 0;
+dbUsers.findEach(query, fields, {batchSize:250}, function(err, user) {
+  if (err) { return exiting(1, 'ERROR! ' + err); }
+  if (!user) {
+    console.warn('All appropriate users found and modified.');
+    setTimeout(displayData, 300000);
+    return;
+  }
+  count++;
+
+  // specify user data to change:
+  var set = {};
+
+  if (user.items.pets['Turkey-Gilded']) {
+    set = {'migration':migrationName, 'items.mounts.Turkey-Gilded':true};
+  } else if (user.items.mounts['Turkey-Base']) {
+    set = {'migration':migrationName, 'items.pets.Turkey-Gilded':5};
+  } else if (user.items.pets['Turkey-Base']) {
+    set = {'migration':migrationName, 'items.mounts.Turkey-Base':true};
+  } else {
+    set = {'migration':migrationName, 'items.pets.Turkey-Base':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);
+}
@@ -0,0 +1,73 @@
+var migrationName = '20161230_nye_hats.js';
+var authorName = 'Sabe'; // in case script author needs to know when their ...
+var authorUuid = '7f14ed62-5408-4e1b-be83-ada62d504931'; //... own data is done
+
+/*
+ * Yearly New Year's party hat award
+ */
+
+var mongo = require('mongoskin');
+
+var connectionString = 'mongodb://localhost:27017/habitrpg?auto_reconnect=true'; // FOR TEST DATABASE
+
+var dbUsers = mongo.db(connectionString).collection('users');
+
+// specify a query to limit the affected users (empty for all users):
+var query = {
+  'migration':{$ne:migrationName},
+  'auth.timestamps.loggedin':{$gt:new Date('2016-11-30')} // Remove after first run
+};
+
+// specify fields we are interested in to limit retrieved data (empty if we're not reading data):
+var fields = {
+  'items.gear.owned': 1,
+};
+
+console.warn('Updating users...');
+var progressCount = 1000;
+var count = 0;
+dbUsers.findEach(query, fields, {batchSize:250}, function(err, user) {
+  if (err) { return exiting(1, 'ERROR! ' + err); }
+  if (!user) {
+    console.warn('All appropriate users found and modified.');
+    setTimeout(displayData, 300000);
+    return;
+  }
+  count++;
+
+  // specify user data to change:
+  var set = {};
+
+  if (typeof user.items.gear.owned.head_special_nye2015 !== 'undefined') {
+    set = {'migration':migrationName, 'items.gear.owned.head_special_nye2016':false};
+  } else if (typeof user.items.gear.owned.head_special_nye2014 !== 'undefined') {
+    set = {'migration':migrationName, 'items.gear.owned.head_special_nye2015':false};
+  } else if (typeof user.items.gear.owned.head_special_nye !== 'undefined') {
+    set = {'migration':migrationName, 'items.gear.owned.head_special_nye2014':false};
+  } else {
+    set = {'migration':migrationName, 'items.gear.owned.head_special_nye':false};
+  }
+
+  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);
+}
+
@@ -2,7 +2,7 @@ var _id = '';
 var update = {
  $addToSet: {
    'purchased.plan.mysteryItems':{
-      $each:['head_mystery_201608','back_mystery_201608']
+      $each:['head_mystery_201612','armor_mystery_201612']
    }
  }
 };
@@ -6,14 +6,11 @@ var authorUuid = '7f14ed62-5408-4e1b-be83-ada62d504931'; //... own data is done
 * Remove flag stating that the Enchanted Armoire is empty, for when new equipment is added
 */

-var dbserver = 'localhost:27017'; // FOR TEST DATABASE
-// var dbserver = 'username:password@ds031379-a0.mongolab.com:31379'; // FOR PRODUCTION DATABASE
-var dbname = 'habitrpg';
-
 var mongo = require('mongoskin');
-var _ = require('lodash');

-var dbUsers = mongo.db(dbserver + '/' + dbname + '?auto_reconnect').collection('users');
+var connectionString = 'mongodb://localhost:27017/habitrpg?auto_reconnect=true'; // FOR TEST DATABASE
+
+var dbUsers = mongo.db(connectionString).collection('users');

 // specify a query to limit the affected users (empty for all users):
 var query = {
@@ -22,7 +19,6 @@ var query = {

 // specify fields we are interested in to limit retrieved data (empty if we're not reading data):
 var fields = {
-  'flags.armoireEmpty':1
 };

 console.warn('Updating users...');
@@ -32,7 +28,8 @@ dbUsers.findEach(query, fields, {batchSize:250}, function(err, user) {
  if (err) { return exiting(1, 'ERROR! ' + err); }
  if (!user) {
    console.warn('All appropriate users found and modified.');
-    return displayData();
+    setTimeout(displayData, 300000);
+    return;
  }
  count++;

@@ -0,0 +1,80 @@
+var migrationName = '20170103_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
+
+/*
+ * Award Take This ladder items to participants in this month's challenge
+ */
+
+var mongo = require('mongoskin');
+
+var connectionString = 'mongodb://localhost:27017/habitrpg?auto_reconnect=true'; // FOR TEST DATABASE
+
+var dbUsers = mongo.db(connectionString).collection('users');
+
+// specify a query to limit the affected users (empty for all users):
+var query = {
+  'migration':{$ne:migrationName},
+  'challenges':{$in:['ff674aba-a114-4a6f-8ebc-1de27ffb646e']}
+};
+
+// specify fields we are interested in to limit retrieved data (empty if we're not reading data):
+var fields = {
+  'items.gear.owned': 1
+};
+
+console.warn('Updating users...');
+var progressCount = 1000;
+var count = 0;
+dbUsers.findEach(query, fields, {batchSize:250}, function(err, user) {
+  if (err) { return exiting(1, 'ERROR! ' + err); }
+  if (!user) {
+    console.warn('All appropriate users found and modified.');
+    setTimeout(displayData, 300000);
+    return;
+  }
+  count++;
+
+  // specify user data to change:
+  var set = {};
+
+  if (typeof user.items.gear.owned.back_special_takeThis !== 'undefined') {
+    set = {'migration':migrationName};
+  { else if (typeof user.items.gear.owned.body_special_takeThis !== 'undefined') {
+    set = {'migration':migrationName, 'items.gear.owned.back_special_takeThis':false};
+  } else if (typeof user.items.gear.owned.head_special_takeThis !== 'undefined') {
+    set = {'migration':migrationName, 'items.gear.owned.body_special_takeThis':false};
+  } else if (typeof user.items.gear.owned.armor_special_takeThis !== 'undefined') {
+    set = {'migration':migrationName, 'items.gear.owned.head_special_takeThis':false};
+  } else if (typeof user.items.gear.owned.weapon_special_takeThis !== 'undefined') {
+    set = {'migration':migrationName, 'items.gear.owned.armor_special_takeThis':false};
+  } else if (typeof user.items.gear.owned.shield_special_takeThis !== 'undefined') {
+    set = {'migration':migrationName, 'items.gear.owned.weapon_special_takeThis':false};
+  } else {
+    set = {'migration':migrationName, 'items.gear.owned.shield_special_takeThis':false};
+  }
+
+  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);
+}
+
+
@@ -25,7 +25,7 @@ function connectToDb (dbUri) {
 function closeDb () {
  if (db) db.close();

-  logger.success('CLosed connection to the database');
+  logger.success('Closed connection to the database');
  return Promise.resolve();
 }

@@ -1,7 +1,7 @@
 {
  "name": "habitica",
  "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "3.41.4",
+  "version": "3.66.0",
  "main": "./website/server/index.js",
  "dependencies": {
    "@slack/client": "3.6.0",
@@ -11,11 +11,18 @@
    "apidoc": "^0.16.0",
    "apn": "^1.7.6",
    "async": "^1.5.0",
+    "autoprefixer": "^6.4.0",
    "aws-sdk": "^2.0.25",
+    "babel-core": "^6.0.0",
+    "babel-loader": "^6.0.0",
+    "babel-plugin-syntax-async-functions": "^6.13.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",
    "babel-polyfill": "^6.6.1",
    "babel-preset-es2015": "^6.6.0",
    "babel-register": "^6.6.0",
+    "babel-runtime": "^6.11.6",
    "babelify": "^7.2.0",
    "bluebird": "^3.3.5",
    "body-parser": "^1.15.0",
@@ -24,14 +31,17 @@
    "compression": "^1.6.1",
    "connect-ratelimit": "0.0.7",
    "cookie-session": "^1.2.0",
-    "coupon-code": "^0.4.3",
+    "coupon-code": "^0.4.5",
+    "css-loader": "^0.23.1",
    "csv-stringify": "^1.0.2",
    "cwait": "^1.0.0",
    "domain-middleware": "~0.1.0",
    "estraverse": "^4.1.1",
-    "express": "~4.13.3",
+    "express": "~4.14.0",
    "express-csv": "~0.6.0",
    "express-validator": "^2.18.0",
+    "extract-text-webpack-plugin": "^1.0.1",
+    "file-loader": "^0.8.4",
    "glob": "^4.3.5",
    "got": "^6.1.1",
    "grunt": "~0.4.1",
@@ -43,7 +53,6 @@
    "grunt-contrib-uglify": "~0.6.0",
    "grunt-contrib-watch": "~0.6.1",
    "grunt-hashres": "~0.4.1",
-    "grunt-karma": "~0.12.1",
    "gulp": "^3.9.0",
    "gulp-babel": "^6.1.2",
    "gulp-grunt": "^0.5.2",
@@ -52,18 +61,23 @@
    "gulp-sourcemaps": "^1.6.0",
    "gulp-uglify": "^1.4.2",
    "gulp.spritesmith": "^4.1.0",
-    "icalendar": "lefnire/node-icalendar#e06da0e55901f0ba940dfadc42c158ed0b1fead9",
+    "habitica-markdown": "^1.3.0",
+    "html-webpack-plugin": "^2.8.1",
    "image-size": "~0.3.2",
    "in-app-purchase": "^1.1.6",
    "jade": "~1.11.0",
+    "jquery": "https://registry.npmjs.org/jquery/-/jquery-3.1.1.tgz",
    "js2xmlparser": "~1.0.0",
+    "json-loader": "^0.5.4",
+    "less": "^2.7.1",
+    "less-loader": "^2.2.3",
    "lodash": "^3.10.1",
+    "lodash.pickby": "^4.2.0",
    "lodash.setwith": "^4.2.0",
-    "markdown-it": "^6.0.1",
    "merge-stream": "^1.0.0",
    "method-override": "^2.3.5",
    "moment": "^2.13.0",
-    "mongoose": "^4.4.16",
+    "mongoose": "^4.7.1",
    "mongoose-id-autoinc": "~2013.7.14-4",
    "morgan": "^1.7.0",
    "nconf": "~0.8.2",
@@ -72,40 +86,55 @@
    "node-gcm": "^0.14.4",
    "nodemailer": "^2.3.2",
    "object-path": "^0.9.2",
+    "ora": "^0.2.0",
    "pageres": "^4.1.1",
    "passport": "~0.2.1",
    "passport-facebook": "2.0.0",
+    "passport-google-oauth20": "1.0.0",
    "paypal-ipn": "3.0.0",
    "paypal-rest-sdk": "^1.2.1",
+    "postcss-easy-import": "^1.0.1",
    "pretty-data": "^0.40.0",
    "ps-tree": "^1.0.0",
+    "pug": "^2.0.0-beta6",
    "push-notify": "habitrpg/push-notify#v1.2.0",
    "pusher": "^1.3.0",
-    "request": "~2.72.0",
+    "request": "~2.74.0",
    "rimraf": "^2.4.3",
    "run-sequence": "^1.1.4",
    "s3-upload-stream": "^1.0.6",
+    "semantic-ui-less": "~2.2.4",
    "serve-favicon": "^2.3.0",
+    "shelljs": "^0.6.0",
    "stripe": "^4.2.0",
    "superagent": "^1.8.3",
-    "swagger-node-express": "lefnire/swagger-node-express#habitrpg",
    "universal-analytics": "~0.3.2",
+    "url-loader": "^0.5.7",
    "useragent": "2.1.9",
    "uuid": "^2.0.1",
    "validator": "^4.9.0",
    "vinyl-buffer": "^1.0.0",
    "vinyl-source-stream": "^1.1.0",
+    "vue": "^2.1.0",
+    "vue-hot-reload-api": "^1.2.0",
+    "vue-loader": "^10.0.0",
+    "vue-resource": "^1.0.2",
+    "vue-router": "^2.0.0-rc.5",
+    "vue-template-compiler": "^2.1.0",
+    "webpack": "^1.12.2",
+    "webpack-merge": "^0.8.3",
    "winston": "^2.1.0",
    "xml2js": "^0.4.4"
  },
  "private": true,
  "engines": {
-    "node": "^4.3.1",
-    "npm": "^3.8.9"
+    "node": "^6.9.1",
+    "npm": "^4.0.2"
  },
  "scripts": {
-    "lint": "eslint .",
-    "test": "npm run lint && gulp test",
+    "lint": "eslint --ext .js,.vue .",
+    "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",
@@ -113,52 +142,75 @@
    "test:sanity": "mocha test/sanity --recursive",
    "test:common": "mocha test/common --recursive",
    "test:content": "mocha test/content --recursive",
-    "test:karma": "karma start --single-run",
-    "test:karma:watch": "karma start",
+    "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",
-    "start": "gulp run:dev",
+    "coverage": "COVERAGE=true mocha --require register-handlers.js --reporter html-cov > coverage.html; open coverage.html",
    "sprites": "gulp sprites:compile",
-    "postinstall": "bower --config.interactive=false install -f; gulp build;",
-    "coverage": "COVERAGE=true mocha --require register-handlers.js --reporter html-cov > coverage.html; open coverage.html"
+    "client:dev": "node webpack/dev-server.js",
+    "client:build": "node webpack/build.js",
+    "client:unit": "karma start test/client/unit/karma.conf.js --single-run",
+    "client:unit:watch": "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 run:dev",
+    "postinstall": "bower --config.interactive=false install -f; gulp build; npm run client:build"
  },
  "devDependencies": {
-    "babel-eslint": "^6.0.0",
    "chai": "^3.4.0",
    "chai-as-promised": "^5.1.0",
    "chalk": "^1.1.3",
+    "chromedriver": "^2.21.2",
+    "connect-history-api-fallback": "^1.1.0",
    "coveralls": "^2.11.2",
+    "cross-spawn": "^2.1.5",
    "csv": "~0.3.6",
    "deep-diff": "~0.1.4",
-    "eslint": "~2.12.0",
-    "eslint-config-habitrpg": "^1.0.0",
-    "eslint-plugin-babel": "^3.0.0",
-    "eslint-plugin-mocha": "^2.1.0",
+    "eslint": "^3.0.0",
+    "eslint-config-habitrpg": "^2.0.0",
+    "eslint-friendly-formatter": "^2.0.5",
+    "eslint-loader": "^1.3.0",
+    "eslint-plugin-html": "^1.3.0",
+    "eslint-plugin-mocha": "^4.7.0",
    "event-stream": "^3.2.2",
+    "eventsource-polyfill": "^0.9.6",
    "expect.js": "~0.2.0",
+    "grunt-karma": "~0.12.1",
+    "http-proxy-middleware": "^0.12.0",
+    "inject-loader": "^2.0.1",
+    "isparta-loader": "^2.0.0",
    "istanbul": "^0.3.14",
-    "karma": "~0.13.15",
+    "karma": "^1.3.0",
    "karma-babel-preprocessor": "^6.0.1",
    "karma-chai-plugins": "~0.6.0",
    "karma-coverage": "^0.5.3",
    "karma-mocha": "^0.2.0",
    "karma-mocha-reporter": "^1.1.1",
-    "karma-phantomjs-launcher": "~0.2.1",
+    "karma-phantomjs-launcher": "^1.0.0",
+    "karma-sinon-chai": "^1.2.0",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.24",
+    "karma-webpack": "^1.7.0",
    "lcov-result-merger": "^1.0.2",
+    "lolex": "^1.4.0",
    "mocha": "^2.3.3",
    "mongodb": "^2.0.46",
    "mongoskin": "~2.1.0",
-    "phantomjs": "^1.9",
+    "nightwatch": "^0.8.18",
+    "phantomjs-prebuilt": "^2.1.12",
    "protractor": "^3.1.1",
    "require-again": "^2.0.0",
    "rewire": "^2.3.3",
-    "shelljs": "^0.7.0",
+    "selenium-server": "2.53.0",
    "sinon": "^1.17.2",
    "sinon-chai": "^2.8.0",
+    "sinon-stub-promise": "^4.0.0",
    "superagent-defaults": "^0.1.13",
-    "vinyl-source-stream": "^1.0.0",
-    "vinyl-transform": "^1.0.0"
+    "vinyl-transform": "^1.0.0",
+    "webpack-dev-middleware": "^1.4.0",
+    "webpack-hot-middleware": "^2.6.0"
  }
 }
@@ -1,10 +1,12 @@
 {
  "extends": [
    "habitrpg/mocha",
-    "habitrpg/babel"
+    "habitrpg/esnext"
  ],
+  "env": {
+    "node": true,
+  },
  "globals": {
    "_": true,
-    "Promise": true
  }
 }
@@ -5,7 +5,7 @@ import {
  translate as t,
 } from '../../../../helpers/api-v3-integration.helper';

-describe('GET challenges/group/:groupId', () => {
+describe('GET challenges/groups/:groupId', () => {
  context('Public Guild', () => {
    let publicGuild, user, nonMember, challenge, challenge2;

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

 describe('POST /chat', () => {
  let user, groupWithChat, userWithChatRevoked, member;
@@ -32,6 +35,24 @@ describe('POST /chat', () => {
      });
  });

+  it('Returns an error when an empty message is provided', async () => {
+    await expect(user.post(`/groups/${groupWithChat._id}/chat`, { message: '    '}))
+      .to.eventually.be.rejected.and.eql({
+        code: 400,
+        error: 'BadRequest',
+        message: t('invalidReqParams'),
+      });
+  });
+
+  it('Returns an error when an message containing only newlines is provided', async () => {
+    await expect(user.post(`/groups/${groupWithChat._id}/chat`, { message: '\n\n'}))
+      .to.eventually.be.rejected.and.eql({
+        code: 400,
+        error: 'BadRequest',
+        message: t('invalidReqParams'),
+      });
+  });
+
  it('Returns an error when group is not found', async () => {
    await expect(user.post('/groups/invalidID/chat', { message: testMessage})).to.eventually.be.rejected.and.eql({
      code: 404,
@@ -40,7 +61,7 @@ describe('POST /chat', () => {
    });
  });

-  it('Returns an error when chat privileges are revoked', async () => {
+  it('returns an error when chat privileges are revoked when sending a message to a public guild', async () => {
    await expect(userWithChatRevoked.post(`/groups/${groupWithChat._id}/chat`, { message: testMessage})).to.eventually.be.rejected.and.eql({
      code: 404,
      error: 'NotFound',
@@ -48,12 +69,86 @@ describe('POST /chat', () => {
    });
  });

+  it('does not error when sending a message to a private guild with a user with revoked chat', async () => {
+    let { group, members } = await createAndPopulateGroup({
+      groupDetails: {
+        name: 'Private Guild',
+        type: 'guild',
+        privacy: 'private',
+      },
+      members: 1,
+    });
+
+    let privateGuildMemberWithChatsRevoked = members[0];
+    await privateGuildMemberWithChatsRevoked.update({'flags.chatRevoked': true});
+
+    let message = await privateGuildMemberWithChatsRevoked.post(`/groups/${group._id}/chat`, { message: testMessage});
+
+    expect(message.message.id).to.exist;
+  });
+
+  it('does not error when sending a message to a party with a user with revoked chat', async () => {
+    let { group, members } = await createAndPopulateGroup({
+      groupDetails: {
+        name: 'Party',
+        type: 'party',
+        privacy: 'private',
+      },
+      members: 1,
+    });
+
+    let privatePartyMemberWithChatsRevoked = members[0];
+    await privatePartyMemberWithChatsRevoked.update({'flags.chatRevoked': true});
+
+    let message = await privatePartyMemberWithChatsRevoked.post(`/groups/${group._id}/chat`, { message: testMessage});
+
+    expect(message.message.id).to.exist;
+  });
+
  it('creates a chat', async () => {
    let message = await user.post(`/groups/${groupWithChat._id}/chat`, { message: testMessage});

    expect(message.message.id).to.exist;
  });

+  it('sends group chat received webhooks', async () => {
+    let userUuid = generateUUID();
+    let memberUuid = generateUUID();
+    await server.start();
+
+    await user.post('/user/webhook', {
+      url: `http://localhost:${server.port}/webhooks/${userUuid}`,
+      type: 'groupChatReceived',
+      enabled: true,
+      options: {
+        groupId: groupWithChat.id,
+      },
+    });
+    await member.post('/user/webhook', {
+      url: `http://localhost:${server.port}/webhooks/${memberUuid}`,
+      type: 'groupChatReceived',
+      enabled: true,
+      options: {
+        groupId: groupWithChat.id,
+      },
+    });
+
+    let message = await user.post(`/groups/${groupWithChat._id}/chat`, { message: testMessage });
+
+    await sleep();
+
+    await server.close();
+
+    let userBody = server.getWebhookData(userUuid);
+    let memberBody = server.getWebhookData(memberUuid);
+
+    [userBody, memberBody].forEach((body) => {
+      expect(body.group.id).to.eql(groupWithChat._id);
+      expect(body.group.name).to.eql(groupWithChat.name);
+      expect(body.chat).to.eql(message.message);
+    });
+  });
+
  it('notifies other users of new messages for a guild', async () => {
    let message = await user.post(`/groups/${groupWithChat._id}/chat`, { message: testMessage});
    let memberWithNotification = await member.get('/user');
@@ -29,14 +29,6 @@ describe('POST /coupons/generate/:event', () => {
    });
  });

-  it('returns an error if event is missing', async () => {
-    await expect(user.post('/coupons/generate')).to.eventually.be.rejected.and.eql({
-      code: 404,
-      error: 'NotFound',
-      message: 'Not found.',
-    });
-  });
-
  it('returns an error if event is invalid', async () => {
    await expect(user.post('/coupons/generate/notValid?count=1')).to.eventually.be.rejected.and.eql({
      code: 400,
@@ -7,15 +7,21 @@ import {
 import moment from 'moment';

 describe('GET /export/history.csv', () => {
-  it('should return a valid CSV file with tasks history data', async () => {
+  // TODO disabled because it randomly causes the build to fail
+  xit('should return a valid CSV file with tasks history data', async () => {
    let user = await generateUser();
    let tasks = await user.post('/tasks/user', [
-      {type: 'habit', text: 'habit 1'},
      {type: 'daily', text: 'daily 1'},
+      {type: 'habit', text: 'habit 1'},
      {type: 'habit', text: 'habit 2'},
      {type: 'todo', text: 'todo 1'},
    ]);

+    // to handle occasional inconsistency in task creation order
+    tasks.sort(function (a, b) {
+      return a.text.localeCompare(b.text);
+    });
+
    // score all the tasks twice
    await user.post(`/tasks/${tasks[0]._id}/score/up`);
    await user.post(`/tasks/${tasks[1]._id}/score/up`);
@@ -28,7 +34,7 @@ describe('GET /export/history.csv', () => {
    await user.post(`/tasks/${tasks[3]._id}/score/up`);

    // adding an history entry to daily 1 manually because cron didn't run yet
-    await updateDocument('tasks', tasks[1], {
+    await updateDocument('tasks', tasks[0], {
      history: [{value: 3.2, date: Number(new Date())}],
    });

@@ -41,11 +47,11 @@ describe('GET /export/history.csv', () => {
    let splitRes = res.split('\n');

    expect(splitRes[0]).to.equal('Task Name,Task ID,Task Type,Date,Value');
-    expect(splitRes[1]).to.equal(`habit 1,${tasks[0]._id},habit,${moment(tasks[0].history[0].date).format('YYYY-MM-DD HH:mm:ss')},${tasks[0].history[0].value}`);
-    expect(splitRes[2]).to.equal(`habit 1,${tasks[0]._id},habit,${moment(tasks[0].history[1].date).format('YYYY-MM-DD HH:mm:ss')},${tasks[0].history[1].value}`);
-    expect(splitRes[3]).to.equal(`habit 2,${tasks[2]._id},habit,${moment(tasks[2].history[0].date).format('YYYY-MM-DD HH:mm:ss')},${tasks[2].history[0].value}`);
-    expect(splitRes[4]).to.equal(`habit 2,${tasks[2]._id},habit,${moment(tasks[2].history[1].date).format('YYYY-MM-DD HH:mm:ss')},${tasks[2].history[1].value}`);
-    expect(splitRes[5]).to.equal(`daily 1,${tasks[1]._id},daily,${moment(tasks[1].history[0].date).format('YYYY-MM-DD HH:mm:ss')},${tasks[1].history[0].value}`);
+    expect(splitRes[1]).to.equal(`daily 1,${tasks[0]._id},daily,${moment(tasks[0].history[0].date).format('YYYY-MM-DD HH:mm:ss')},${tasks[0].history[0].value}`);
+    expect(splitRes[2]).to.equal(`habit 1,${tasks[1]._id},habit,${moment(tasks[1].history[0].date).format('YYYY-MM-DD HH:mm:ss')},${tasks[1].history[0].value}`);
+    expect(splitRes[3]).to.equal(`habit 1,${tasks[1]._id},habit,${moment(tasks[1].history[1].date).format('YYYY-MM-DD HH:mm:ss')},${tasks[1].history[1].value}`);
+    expect(splitRes[4]).to.equal(`habit 2,${tasks[2]._id},habit,${moment(tasks[2].history[0].date).format('YYYY-MM-DD HH:mm:ss')},${tasks[2].history[0].value}`);
+    expect(splitRes[5]).to.equal(`habit 2,${tasks[2]._id},habit,${moment(tasks[2].history[1].date).format('YYYY-MM-DD HH:mm:ss')},${tasks[2].history[1].value}`);
    expect(splitRes[6]).to.equal('');
  });
 });
@@ -0,0 +1,57 @@
+import {
+  generateUser,
+} from '../../../../helpers/api-v3-integration.helper';
+
+describe('GET /export/inbox.html', () => {
+  let user;
+
+  before(async () => {
+    let otherUser = await generateUser({
+      'profile.name': 'Other User',
+    });
+    user = await generateUser({
+      'profile.name': 'Main User',
+    });
+
+    await otherUser.post('/members/send-private-message', {
+      toUserId: user.id,
+      message: ':smile: hi',
+    });
+    await user.post('/members/send-private-message', {
+      toUserId: otherUser.id,
+      message: '# Hello!',
+    });
+    await otherUser.post('/members/send-private-message', {
+      toUserId: user.id,
+      message: '* list 1\n* list 2\n * list 3 \n * [list with a link](http://example.com)',
+    });
+
+    await user.sync();
+  });
+
+  it('returns an html page', async () => {
+    let res = await user.get('/export/inbox.html');
+
+    expect(res.substring(0, 100).indexOf('<!DOCTYPE html>')).to.equal(0);
+  });
+
+  it('renders the markdown messages as html', async () => {
+    let res = await user.get('/export/inbox.html');
+
+    expect(res).to.include('img class="habitica-emoji"');
+    expect(res).to.include('<h1>Hello!</h1>');
+    expect(res).to.include('<li>list 1</li>');
+  });
+
+  it('sorts messages from newest to oldest', async () => {
+    let res = await user.get('/export/inbox.html');
+
+    let emojiPosition = res.indexOf('img class="habitica-emoji"');
+    let headingPosition = res.indexOf('<h1>Hello!</h1>');
+    let listPosition = res.indexOf('<li>list 1</li>');
+
+    expect(emojiPosition).to.be.greaterThan(headingPosition);
+    expect(headingPosition).to.be.greaterThan(listPosition);
+    expect(listPosition).to.be.greaterThan(-1); // make sure it exists at all
+  });
+});
@@ -7,7 +7,8 @@ import Bluebird from 'bluebird';
 let parseStringAsync = Bluebird.promisify(xml2js.parseString, {context: xml2js});

 describe('GET /export/userdata.xml', () => {
-  it('should return a valid XML file with user data', async () => {
+  // TODO disabled because it randomly causes the build to fail
+  xit('should return a valid XML file with user data', async () => {
    let user = await generateUser();
    let tasks = await user.post('/tasks/user', [
      {type: 'habit', text: 'habit 1'},
@@ -82,8 +82,10 @@ describe('GET /groups/:groupId/members', () => {
      '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'].sort());
+    expect(Object.keys(memberRes.preferences).sort()).to.eql([
+      'size', 'hair', 'skin', 'shirt',
+      'chair', 'costume', 'sleep', 'background',
+    ].sort());

    expect(memberRes.stats.maxMP).to.exist;
    expect(memberRes.stats.maxHealth).to.equal(common.maxHealth);
@@ -134,6 +134,22 @@ describe('POST /group/:groupId/join', () => {

        await expect(user.get('/user')).to.eventually.have.deep.property('items.quests.basilist', 1);
      });
+
+      it('notifies inviting user that their invitation was accepted', async () => {
+        await invitedUser.post(`/groups/${guild._id}/join`);
+
+        let inviter = await user.get('/user');
+        let expectedData = {
+          headerText: t('invitationAcceptedHeader'),
+          bodyText: t('invitationAcceptedBody', {
+            username: invitedUser.auth.local.username,
+            groupName: guild.name,
+          }),
+        };
+
+        expect(inviter.notifications[0].type).to.eql('GROUP_INVITE_ACCEPTED');
+        expect(inviter.notifications[0].data).to.eql(expectedData);
+      });
    });
  });

@@ -172,6 +188,23 @@ describe('POST /group/:groupId/join', () => {
        await expect(invitedUser.get('/user')).to.eventually.have.deep.property('party._id', party._id);
      });

+      it('notifies inviting user that their invitation was accepted', async () => {
+        await invitedUser.post(`/groups/${party._id}/join`);
+
+        let inviter = await user.get('/user');
+
+        let expectedData = {
+          headerText: t('invitationAcceptedHeader'),
+          bodyText: t('invitationAcceptedBody', {
+            username: invitedUser.auth.local.username,
+            groupName: party.name,
+          }),
+        };
+
+        expect(inviter.notifications[0].type).to.eql('GROUP_INVITE_ACCEPTED');
+        expect(inviter.notifications[0].data).to.eql(expectedData);
+      });
+
      it('clears invitation from user when joining party', async () => {
        await invitedUser.post(`/groups/${party._id}/join`);

@@ -65,6 +65,19 @@ describe('POST /groups/:groupId/leave', () => {
        expect(groupToLeave.leader).to.equal(member._id);
      });

+      it('removes new messages for that group from user', async () => {
+        await member.post(`/groups/${groupToLeave._id}/chat`, { message: 'Some message' });
+
+        await leader.sync();
+
+        expect(leader.newMessages[groupToLeave._id]).to.not.be.empty;
+
+        await leader.post(`/groups/${groupToLeave._id}/leave`);
+        await leader.sync();
+
+        expect(leader.newMessages[groupToLeave._id]).to.be.empty;
+      });
+
      context('With challenges', () => {
        let challenge;

@@ -122,6 +135,8 @@ describe('POST /groups/:groupId/leave', () => {
        privateGuild = group;
        leader = groupLeader;
        invitedUser = invitees[0];
+
+        await leader.post(`/groups/${group._id}/chat`, { message: 'Some message' });
      });

      it('removes a group when the last member leaves', async () => {
@@ -3,6 +3,7 @@ import {
  createAndPopulateGroup,
  translate as t,
 } from '../../../../helpers/api-v3-integration.helper';
+import * as email from '../../../../../website/server/libs/email';

 describe('POST /groups/:groupId/removeMember/:memberId', () => {
  let leader;
@@ -60,6 +61,14 @@ describe('POST /groups/:groupId/removeMember/:memberId', () => {
  });

  context('Guilds', () => {
+    beforeEach(() => {
+      sandbox.spy(email, 'sendTxn');
+    });
+
+    afterEach(() => {
+      sandbox.restore();
+    });
+
    it('can remove other members', async () => {
      await leader.post(`/groups/${guild._id}/removeMember/${member._id}`);
      let memberRemoved = await member.get('/user');
@@ -80,6 +89,22 @@ describe('POST /groups/:groupId/removeMember/:memberId', () => {

      expect(_.findIndex(invitedUserWithoutInvite.invitations.guilds, {id: guild._id})).eql(-1);
    });
+
+    it('sends email to user with rescinded invite', async () => {
+      await leader.post(`/groups/${guild._id}/removeMember/${invitedUser._id}`);
+
+      expect(email.sendTxn).to.be.calledOnce;
+      expect(email.sendTxn.args[0][0]._id).to.be.eql(invitedUser._id);
+      expect(email.sendTxn.args[0][1]).to.be.eql('guild-invite-rescinded');
+    });
+
+    it('sends email to removed user', async () => {
+      await leader.post(`/groups/${guild._id}/removeMember/${member._id}`);
+
+      expect(email.sendTxn).to.be.calledOnce;
+      expect(email.sendTxn.args[0][0]._id).to.be.eql(member._id);
+      expect(email.sendTxn.args[0][1]).to.be.eql('kicked-from-guild');
+    });
  });

  context('Party', () => {
@@ -87,6 +112,7 @@ describe('POST /groups/:groupId/removeMember/:memberId', () => {
    let partyLeader;
    let partyInvitedUser;
    let partyMember;
+    let removedMember;

    beforeEach(async () => {
      let { group, groupLeader, invitees, members } = await createAndPopulateGroup({
@@ -96,13 +122,19 @@ describe('POST /groups/:groupId/removeMember/:memberId', () => {
          privacy: 'private',
        },
        invites: 1,
-        members: 1,
+        members: 2,
      });

      party = group;
      partyLeader = groupLeader;
      partyInvitedUser = invitees[0];
      partyMember = members[0];
+      removedMember = members[1];
+      sandbox.spy(email, 'sendTxn');
+    });
+
+    afterEach(() => {
+      sandbox.restore();
    });

    it('can remove other members', async () => {
@@ -129,6 +161,18 @@ describe('POST /groups/:groupId/removeMember/:memberId', () => {
      expect(invitedUserWithoutInvite.invitations.party).to.be.empty;
    });

+    it('removes new messages from a member who is removed', async () => {
+      await partyLeader.post(`/groups/${party._id}/chat`, { message: 'Some message' });
+      await removedMember.sync();
+
+      expect(removedMember.newMessages[party._id]).to.not.be.empty;
+
+      await partyLeader.post(`/groups/${party._id}/removeMember/${removedMember._id}`);
+      await removedMember.sync();
+
+      expect(removedMember.newMessages[party._id]).to.be.empty;
+    });
+
    it('removes user from quest when removing user from party after quest starts', async () => {
      let petQuest = 'whale';
      await partyLeader.update({
@@ -173,5 +217,21 @@ describe('POST /groups/:groupId/removeMember/:memberId', () => {
      expect(party.quest.members[partyLeader._id]).to.be.true;
      expect(party.quest.members[partyMember._id]).to.not.exist;
    });
+
+    it('sends email to user with rescinded invite', async () => {
+      await partyLeader.post(`/groups/${party._id}/removeMember/${partyInvitedUser._id}`);
+
+      expect(email.sendTxn).to.be.calledOnce;
+      expect(email.sendTxn.args[0][0]._id).to.be.eql(partyInvitedUser._id);
+      expect(email.sendTxn.args[0][1]).to.be.eql('party-invite-rescinded');
+    });
+
+    it('sends email to removed user', async () => {
+      await partyLeader.post(`/groups/${party._id}/removeMember/${partyMember._id}`);
+
+      expect(email.sendTxn).to.be.calledOnce;
+      expect(email.sendTxn.args[0][0]._id).to.be.eql(partyMember._id);
+      expect(email.sendTxn.args[0][1]).to.be.eql('kicked-from-party');
+    });
  });
 });
@@ -57,11 +57,27 @@ describe('Post /groups/:groupId/invite', () => {
      });
    });

-    it('returns empty when uuids is empty', async () => {
+    it('returns an error when uuids and emails are empty', async () => {
+      await expect(inviter.post(`/groups/${group._id}/invite`, {
+        emails: [],
+        uuids: [],
+      }))
+      .to.eventually.be.rejected.and.eql({
+        code: 400,
+        error: 'BadRequest',
+        message: t('inviteMustNotBeEmpty'),
+      });
+    });
+
+    it('returns an error when uuids is empty and emails is not passed', async () => {
      await expect(inviter.post(`/groups/${group._id}/invite`, {
        uuids: [],
      }))
-      .to.eventually.be.empty;
+      .to.eventually.be.rejected.and.eql({
+        code: 400,
+        error: 'BadRequest',
+        message: t('inviteMissingUuid'),
+      });
    });

    it('returns an error when there are more than INVITES_LIMIT uuids', async () => {
@@ -159,11 +175,15 @@ describe('Post /groups/:groupId/invite', () => {
      });
    });

-    it('returns empty when emails is an empty array', async () => {
+    it('returns an error when emails is empty and uuids is not passed', async () => {
      await expect(inviter.post(`/groups/${group._id}/invite`, {
        emails: [],
      }))
-      .to.eventually.be.empty;
+      .to.eventually.be.rejected.and.eql({
+        code: 400,
+        error: 'BadRequest',
+        message: t('inviteMissingEmail'),
+      });
    });

    it('returns an error when there are more than INVITES_LIMIT emails', async () => {
@@ -280,6 +300,26 @@ describe('Post /groups/:groupId/invite', () => {
        message: t('userAlreadyInGroup'),
      });
    });
+
+    // @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();
+
+      let nonGroupLeader = await generateUser();
+      await inviter.post(`/groups/${group._id}/invite`, {
+        uuids: [nonGroupLeader._id],
+      });
+      await nonGroupLeader.post(`/groups/${group._id}/join`);
+
+      await expect(nonGroupLeader.post(`/groups/${group._id}/invite`, {
+        uuids: [userToInvite._id],
+      }))
+      .to.eventually.be.rejected.and.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('onlyGroupLeaderCanInviteToGroupPlan'),
+      });
+    });
  });

  describe('party invites', () => {
@@ -0,0 +1,44 @@
+import {
+  generateUser,
+  translate as t,
+} from '../../../../helpers/api-v3-integration.helper';
+import { v4 as generateUUID } from 'uuid';
+
+describe('GET /members/:memberId/achievements', () => {
+  let user;
+
+  before(async () => {
+    user = await generateUser();
+  });
+
+  it('validates req.params.memberId', async () => {
+    await expect(user.get('/members/invalidUUID/achievements')).to.eventually.be.rejected.and.eql({
+      code: 400,
+      error: 'BadRequest',
+      message: t('invalidReqParams'),
+    });
+  });
+
+  it('returns achievements based on given user', async () => {
+    let member = await generateUser({
+      contributor: {level: 1},
+      backer: {tier: 3},
+    });
+    let achievementsRes = await user.get(`/members/${member._id}/achievements`);
+
+    expect(achievementsRes.special.achievements.contributor.earned).to.equal(true);
+    expect(achievementsRes.special.achievements.contributor.value).to.equal(1);
+
+    expect(achievementsRes.special.achievements.kickstarter.earned).to.equal(true);
+    expect(achievementsRes.special.achievements.kickstarter.value).to.equal(3);
+  });
+
+  it('handles non-existing members', async () => {
+    let dummyId = generateUUID();
+    await expect(user.get(`/members/${dummyId}/achievements`)).to.eventually.be.rejected.and.eql({
+      code: 404,
+      error: 'NotFound',
+      message: t('userWithIDNotFound', {userId: dummyId}),
+    });
+  });
+});
@@ -35,8 +35,10 @@ describe('GET /members/:memberId', () => {
      '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'].sort());
+    expect(Object.keys(memberRes.preferences).sort()).to.eql([
+      'size', 'hair', 'skin', 'shirt',
+      'chair', 'costume', 'sleep', 'background',
+    ].sort());

    expect(memberRes.stats.maxMP).to.exist;
    expect(memberRes.stats.maxHealth).to.equal(common.maxHealth);
@@ -4,6 +4,14 @@ import {
 } from '../../../../helpers/api-v3-integration.helper';
 import { v4 as generateUUID } from 'uuid';

+function findMessage (messages, receiverId) {
+  let message = _.find(messages, (inboxMessage) => {
+    return inboxMessage.uuid === receiverId;
+  });
+
+  return message;
+}
+
 describe('POST /members/transfer-gems', () => {
  let userToSendMessage;
  let receiver;
@@ -116,19 +124,14 @@ describe('POST /members/transfer-gems', () => {
    let updatedReceiver = await receiver.get('/user');
    let updatedSender = await userToSendMessage.get('/user');

-    let sendersMessageInReceiversInbox = _.find(updatedReceiver.inbox.messages, (inboxMessage) => {
-      return inboxMessage.uuid === userToSendMessage._id;
-    });
+    let sendersMessageInReceiversInbox = findMessage(updatedReceiver.inbox.messages, userToSendMessage._id);
+    let sendersMessageInSendersInbox = findMessage(updatedSender.inbox.messages, receiver._id);

-    let sendersMessageInSendersInbox = _.find(updatedSender.inbox.messages, (inboxMessage) => {
-      return inboxMessage.uuid === receiver._id;
-    });
-
-    let messageSentContent = t('privateMessageGiftIntro', {
+    let messageSentContent = t('privateMessageGiftGemsMessage', {
      receiverName: receiver.profile.name,
      senderName: userToSendMessage.profile.name,
+      gemAmount,
    });
-    messageSentContent += t('privateMessageGiftGemsMessage', {gemAmount});
    messageSentContent =  `\`${messageSentContent}\` `;
    messageSentContent += message;

@@ -150,19 +153,14 @@ describe('POST /members/transfer-gems', () => {
    let updatedReceiver = await receiver.get('/user');
    let updatedSender = await userToSendMessage.get('/user');

-    let sendersMessageInReceiversInbox = _.find(updatedReceiver.inbox.messages, (inboxMessage) => {
-      return inboxMessage.uuid === userToSendMessage._id;
-    });
+    let sendersMessageInReceiversInbox = findMessage(updatedReceiver.inbox.messages, userToSendMessage._id);
+    let sendersMessageInSendersInbox = findMessage(updatedSender.inbox.messages, receiver._id);

-    let sendersMessageInSendersInbox = _.find(updatedSender.inbox.messages, (inboxMessage) => {
-      return inboxMessage.uuid === receiver._id;
-    });
-
-    let messageSentContent = t('privateMessageGiftIntro', {
+    let messageSentContent = t('privateMessageGiftGemsMessage', {
      receiverName: receiver.profile.name,
      senderName: userToSendMessage.profile.name,
+      gemAmount,
    });
-    messageSentContent += t('privateMessageGiftGemsMessage', {gemAmount});
    messageSentContent =  `\`${messageSentContent}\` `;

    expect(sendersMessageInReceiversInbox).to.exist;
@@ -173,4 +171,40 @@ describe('POST /members/transfer-gems', () => {
    expect(sendersMessageInSendersInbox.text).to.equal(messageSentContent);
    expect(updatedSender.balance).to.equal(0);
  });
+
+  it('sends transfer gems message in each participant\'s language', async () => {
+    await receiver.update({
+      'preferences.language': 'es',
+    });
+    await userToSendMessage.update({
+      'preferences.language': 'cs',
+    });
+    await userToSendMessage.post('/members/transfer-gems', {
+      gemAmount,
+      toUserId: receiver._id,
+    });
+
+    let updatedReceiver = await receiver.get('/user');
+    let updatedSender = await userToSendMessage.get('/user');
+
+    let sendersMessageInReceiversInbox = findMessage(updatedReceiver.inbox.messages, userToSendMessage._id);
+    let sendersMessageInSendersInbox = findMessage(updatedSender.inbox.messages, receiver._id);
+
+    let [receieversMessageContent, sendersMessageContent] = ['es', 'cs'].map((lang) => {
+      let messageContent = t('privateMessageGiftGemsMessage', {
+        receiverName: receiver.profile.name,
+        senderName: userToSendMessage.profile.name,
+        gemAmount,
+      }, lang);
+
+      return `\`${messageContent}\` `;
+    });
+
+    expect(sendersMessageInReceiversInbox).to.exist;
+    expect(sendersMessageInReceiversInbox.text).to.equal(receieversMessageContent);
+
+    expect(sendersMessageInSendersInbox).to.exist;
+    expect(sendersMessageInSendersInbox.text).to.equal(sendersMessageContent);
+    expect(updatedSender.balance).to.equal(0);
+  });
 });
@@ -0,0 +1,26 @@
+import {
+  generateUser,
+  translate as t,
+} from '../../../../helpers/api-v3-integration.helper';
+import { v4 as generateUUID } from 'uuid';
+
+describe('POST /notifications/:notificationId/read', () => {
+  let user;
+
+  before(async () => {
+    user = await generateUser();
+  });
+
+  it('errors when notification is not found', async () => {
+    let dummyId = generateUUID();
+    await expect(user.post(`/notifications/${dummyId}/read`))
+      .to.eventually.be.rejected.and.eql({
+        code: 404,
+        error: 'NotFound',
+        message: t('messageNotificationNotFound'),
+      });
+  });
+
+  xit('removes a notification', async () => {
+  });
+});
@@ -10,13 +10,11 @@ describe('payments - amazon - #createOrderReferenceId', () => {
    user = await generateUser();
  });

-  it('verifies billingAgreementId', async (done) => {
-    try {
-      await user.post(endpoint);
-    } catch (e) {
-      // Parameter AWSAccessKeyId cannot be empty.
-      expect(e.error).to.eql('BadRequest');
-      done();
-    }
+  it('verifies billingAgreementId', async () => {
+    await expect(user.post(endpoint)).to.eventually.be.rejected.and.eql({
+      code: 400,
+      error: 'BadRequest',
+      message: 'Missing req.body.billingAgreementId',
+    });
  });
 });
@@ -4,6 +4,7 @@ import {
  generateUser,
 } from '../../../../helpers/api-v3-integration.helper';
 import { v4 as generateUUID } from 'uuid';
+import { model as Group } from '../../../../../website/server/models/group';

 describe('POST /groups/:groupId/quests/abort', () => {
  let questingGroup;
@@ -85,6 +86,7 @@ describe('POST /groups/:groupId/quests/abort', () => {
  });

  it('aborts a quest', async () => {
+    sandbox.stub(Group.prototype, 'sendChat');
    await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`);
    await partyMembers[0].post(`/groups/${questingGroup._id}/quests/accept`);
    await partyMembers[1].post(`/groups/${questingGroup._id}/quests/accept`);
@@ -123,5 +125,8 @@ describe('POST /groups/:groupId/quests/abort', () => {
      },
      members: {},
    });
+    expect(Group.prototype.sendChat).to.be.calledOnce;
+    expect(Group.prototype.sendChat).to.be.calledWithMatch(/aborted the party quest Wail of the Whale.`/);
+    Group.prototype.sendChat.restore();
  });
 });
@@ -15,7 +15,7 @@ describe('GET /shops/seasonal', () => {

    expect(shop.identifier).to.equal('seasonalShop');
    expect(shop.text).to.eql(t('seasonalShop'));
-    expect(shop.notes).to.eql(t('seasonalShopClosedText'));
+    expect(shop.notes).to.be.a('string');
    expect(shop.imageName).to.be.a('string');
    expect(shop.categories).to.be.an('array');
  });
@@ -1,7 +1,12 @@
 import {
  generateUser,
  translate as t,
+  generateGroup,
+  sleep,
+  generateChallenge,
+  server,
 } from '../../../../helpers/api-integration/v3';
+import { v4 as generateUUID } from 'uuid';

 describe('DELETE /tasks/:id', () => {
  let user;
@@ -42,6 +47,77 @@ describe('DELETE /tasks/:id', () => {
    });
  });

+  context('sending task activity webhooks', () => {
+    before(async () => {
+      await server.start();
+    });
+
+    after(async () => {
+      await server.close();
+    });
+
+    it('sends task activity webhooks if task is user owned', async () => {
+      let uuid = generateUUID();
+
+      let task = await user.post('/tasks/user', {
+        text: 'test habit',
+        type: 'habit',
+      });
+
+      await user.post('/user/webhook', {
+        url: `http://localhost:${server.port}/webhooks/${uuid}`,
+        type: 'taskActivity',
+        enabled: true,
+        options: {
+          created: false,
+          deleted: true,
+        },
+      });
+
+      await user.del(`/tasks/${task.id}`);
+
+      await sleep();
+
+      let body = server.getWebhookData(uuid);
+
+      expect(body.type).to.eql('deleted');
+      expect(body.task).to.eql(task);
+    });
+
+    it('does not send task activity webhooks if task is not user owned', async () => {
+      let uuid = generateUUID();
+
+      await user.update({
+        balance: 10,
+      });
+      let guild = await generateGroup(user);
+      let challenge = await generateChallenge(user, guild);
+
+      await user.post('/user/webhook', {
+        url: `http://localhost:${server.port}/webhooks/${uuid}`,
+        type: 'taskActivity',
+        enabled: true,
+        options: {
+          created: false,
+          deleted: true,
+        },
+      });
+
+      let challengeTask = await user.post(`/tasks/challenge/${challenge._id}`, {
+        text: 'test habit',
+        type: 'habit',
+      });
+
+      await user.del(`/tasks/${challengeTask.id}`);
+
+      await sleep();
+
+      let body = server.getWebhookData(uuid);
+
+      expect(body).to.not.exist;
+    });
+  });
+
  context('task cannot be deleted', () => {
    it('cannot delete a non-existant task', async () => {
      await expect(user.del('/tasks/550e8400-e29b-41d4-a716-446655440000')).to.eventually.be.rejected.and.eql({
@@ -115,7 +115,7 @@ describe('GET /tasks/user', () => {
    for (let i = 0; i < numberOfTodos; i++) {
      let id = todos[i]._id;

-      await user.post(`/tasks/${id}/score/up`); // eslint-disable-line babel/no-await-in-loop
+      await user.post(`/tasks/${id}/score/up`); // eslint-disable-line no-await-in-loop
    }
    await user.sync();

@@ -29,7 +29,7 @@ describe('POST /tasks/clearCompletedTodos', () => {

    for (let task of tasks) {
      if (['todo 2', 'todo 3', 'todo 6'].indexOf(task.text) !== -1) {
-        await user.post(`/tasks/${task._id}/score/up`); // eslint-disable-line babel/no-await-in-loop
+        await user.post(`/tasks/${task._id}/score/up`); // eslint-disable-line no-await-in-loop
      }
    }

@@ -1,6 +1,8 @@
 import {
  generateUser,
+  sleep,
  translate as t,
+  server,
 } from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';

@@ -45,6 +47,40 @@ describe('POST /tasks/:id/score/:direction', () => {
        message: t('invalidReqParams'),
      });
    });
+
+    it('sends task scored webhooks', async () => {
+      let uuid = generateUUID();
+      await server.start();
+
+      await user.post('/user/webhook', {
+        url: `http://localhost:${server.port}/webhooks/${uuid}`,
+        type: 'taskActivity',
+        enabled: true,
+        options: {
+          created: false,
+          scored: true,
+        },
+      });
+
+      let task = await user.post('/tasks/user', {
+        text: 'test habit',
+        type: 'habit',
+      });
+
+      await user.post(`/tasks/${task.id}/score/up`);
+
+      await sleep();
+
+      await server.close();
+
+      let body = server.getWebhookData(uuid);
+
+      expect(body.user).to.have.all.keys('_id', '_tmp', 'stats');
+      expect(body.user.stats).to.have.all.keys('hp', 'mp', 'exp', 'gp', 'lvl', 'class', 'points', 'str', 'con', 'int', 'per', 'buffs', 'training', 'maxHealth', 'maxMP', 'toNextLevel');
+      expect(body.task.id).to.eql(task.id);
+      expect(body.direction).to.eql('up');
+      expect(body.delta).to.be.greaterThan(0);
+    });
  });

  context('todos', () => {
@@ -1,13 +1,15 @@
 import {
  generateUser,
+  sleep,
  translate as t,
+  server,
 } from '../../../../helpers/api-v3-integration.helper';
 import { v4 as generateUUID } from 'uuid';

 describe('POST /tasks/user', () => {
  let user;

-  before(async () => {
+  beforeEach(async () => {
    user = await generateUser();
  });

@@ -205,6 +207,71 @@ describe('POST /tasks/user', () => {
    });
  });

+  context('sending task activity webhooks', () => {
+    before(async () => {
+      await server.start();
+    });
+
+    after(async () => {
+      await server.close();
+    });
+
+    it('sends task activity webhooks', async () => {
+      let uuid = generateUUID();
+
+      await user.post('/user/webhook', {
+        url: `http://localhost:${server.port}/webhooks/${uuid}`,
+        type: 'taskActivity',
+        enabled: true,
+        options: {
+          created: true,
+        },
+      });
+
+      let task = await user.post('/tasks/user', {
+        text: 'test habit',
+        type: 'habit',
+      });
+
+      await sleep();
+
+      let body = server.getWebhookData(uuid);
+
+      expect(body.task).to.eql(task);
+    });
+
+    it('sends a task activity webhook for each task', async () => {
+      let uuid = generateUUID();
+
+      await user.post('/user/webhook', {
+        url: `http://localhost:${server.port}/webhooks/${uuid}`,
+        type: 'taskActivity',
+        enabled: true,
+        options: {
+          created: true,
+        },
+      });
+
+      let tasks = await user.post('/tasks/user', [{
+        text: 'test habit',
+        type: 'habit',
+      }, {
+        text: 'test todo',
+        type: 'todo',
+      }]);
+
+      await sleep();
+
+      let taskBodies = [
+        server.getWebhookData(uuid),
+        server.getWebhookData(uuid),
+      ];
+
+      expect(taskBodies.find(body => body.task.id === tasks[0].id)).to.exist;
+      expect(taskBodies.find(body => body.task.id === tasks[1].id)).to.exist;
+    });
+  });
+
  context('all types', () => {
    it('can create reminders', async () => {
      let id1 = generateUUID();
@@ -3,6 +3,7 @@ import {
  generateGroup,
  sleep,
  generateChallenge,
+  server,
 } from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';

@@ -73,6 +74,7 @@ describe('PUT /tasks/:id', () => {
        checklist: [
          {text: 123, completed: false},
        ],
+        collapseChecklist: false,
      });
      await sleep(2);

@@ -110,6 +112,7 @@ describe('PUT /tasks/:id', () => {
          {text: 123, completed: false},
          {text: 456, completed: true},
        ],
+        collapseChecklist: true,
        notes: 'new notes',
        attribute: 'per',
        tags: [challengeUserTaskId],
@@ -142,6 +145,83 @@ describe('PUT /tasks/:id', () => {
      expect(savedChallengeUserTask.streak).to.equal(25);
      expect(savedChallengeUserTask.reminders.length).to.equal(2);
      expect(savedChallengeUserTask.checklist.length).to.equal(2);
+      expect(savedChallengeUserTask.alias).to.equal('a-short-task-name');
+      expect(savedChallengeUserTask.collapseChecklist).to.equal(true);
+    });
+  });
+
+  context('sending task activity webhooks', () => {
+    before(async () => {
+      await server.start();
+    });
+
+    after(async () => {
+      await server.close();
+    });
+
+    it('sends task activity webhooks if task is user owned', async () => {
+      let uuid = generateUUID();
+
+      await user.post('/user/webhook', {
+        url: `http://localhost:${server.port}/webhooks/${uuid}`,
+        type: 'taskActivity',
+        enabled: true,
+        options: {
+          created: false,
+          updated: true,
+        },
+      });
+
+      let task = await user.post('/tasks/user', {
+        text: 'test habit',
+        type: 'habit',
+      });
+
+      let updatedTask = await user.put(`/tasks/${task.id}`, {
+        text: 'updated text',
+      });
+
+      await sleep();
+
+      let body = server.getWebhookData(uuid);
+
+      expect(body.type).to.eql('updated');
+      expect(body.task).to.eql(updatedTask);
+    });
+
+    it('does not send task activity webhooks if task is not user owned', async () => {
+      let uuid = generateUUID();
+
+      await user.update({
+        balance: 10,
+      });
+      let guild = await generateGroup(user);
+      let challenge = await generateChallenge(user, guild);
+
+      await user.post('/user/webhook', {
+        url: `http://localhost:${server.port}/webhooks/${uuid}`,
+        type: 'taskActivity',
+        enabled: true,
+        options: {
+          created: false,
+          updated: true,
+        },
+      });
+
+      let task = await user.post(`/tasks/challenge/${challenge._id}`, {
+        text: 'test habit',
+        type: 'habit',
+      });
+
+      await user.put(`/tasks/${task.id}`, {
+        text: 'updated text',
+      });
+
+      await sleep();
+
+      let body = server.getWebhookData(uuid);
+
+      expect(body).to.not.exist;
    });
  });

@@ -5,12 +5,17 @@ import {
  translate as t,
 } from '../../../../../helpers/api-v3-integration.helper';
 import { v4 as generateUUID } from 'uuid';
+import { find } from 'lodash';

 describe('POST /tasks/challenge/:challengeId', () => {
  let user;
  let guild;
  let challenge;

+  function findUserChallengeTask (memberTask) {
+    return memberTask.challenge.id === challenge._id;
+  }
+
  beforeEach(async () => {
    user = await generateUser({balance: 1});
    guild = await generateGroup(user);
@@ -88,6 +93,9 @@ describe('POST /tasks/challenge/:challengeId', () => {
    });
    let challengeWithTask = await user.get(`/challenges/${challenge._id}`);

+    let memberTasks = await user.get('/tasks/user');
+    let userChallengeTask = find(memberTasks, findUserChallengeTask);
+
    expect(challengeWithTask.tasksOrder.habits.indexOf(task._id)).to.be.above(-1);
    expect(task.challenge.id).to.equal(challenge._id);
    expect(task.text).to.eql('test habit');
@@ -95,6 +103,8 @@ describe('POST /tasks/challenge/:challengeId', () => {
    expect(task.type).to.eql('habit');
    expect(task.up).to.eql(false);
    expect(task.down).to.eql(true);
+
+    expect(userChallengeTask.notes).to.eql(task.notes);
  });

  it('creates a todo', async () => {
@@ -105,11 +115,16 @@ describe('POST /tasks/challenge/:challengeId', () => {
    });
    let challengeWithTask = await user.get(`/challenges/${challenge._id}`);

+    let memberTasks = await user.get('/tasks/user');
+    let userChallengeTask = find(memberTasks, findUserChallengeTask);
+
    expect(challengeWithTask.tasksOrder.todos.indexOf(task._id)).to.be.above(-1);
    expect(task.challenge.id).to.equal(challenge._id);
    expect(task.text).to.eql('test todo');
    expect(task.notes).to.eql('1976');
    expect(task.type).to.eql('todo');
+
+    expect(userChallengeTask.notes).to.eql(task.notes);
  });

  it('creates a daily', async () => {
@@ -124,6 +139,9 @@ describe('POST /tasks/challenge/:challengeId', () => {
    });
    let challengeWithTask = await user.get(`/challenges/${challenge._id}`);

+    let memberTasks = await user.get('/tasks/user');
+    let userChallengeTask = find(memberTasks, findUserChallengeTask);
+
    expect(challengeWithTask.tasksOrder.dailys.indexOf(task._id)).to.be.above(-1);
    expect(task.challenge.id).to.equal(challenge._id);
    expect(task.text).to.eql('test daily');
@@ -132,5 +150,7 @@ describe('POST /tasks/challenge/:challengeId', () => {
    expect(task.frequency).to.eql('daily');
    expect(task.everyX).to.eql(5);
    expect(new Date(task.startDate)).to.eql(now);
+
+    expect(userChallengeTask.notes).to.eql(task.notes);
  });
 });
@@ -69,4 +69,48 @@ describe('DELETE /tasks/:id', () => {
    expect(syncedTask.group.broken).to.equal('TASK_DELETED');
    expect(member2SyncedTask.group.broken).to.equal('TASK_DELETED');
  });
+
+  it('prevents a user from deleting a task they are assigned to', async () => {
+    let memberTasks = await member.get('/tasks/user');
+    let syncedTask = find(memberTasks, findAssignedTask);
+
+    await expect(member.del(`/tasks/${syncedTask._id}`))
+      .to.eventually.be.rejected.and.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('cantDeleteAssignedGroupTasks'),
+      });
+  });
+
+  it('allows a user to delete a broken task', async () => {
+    let memberTasks = await member.get('/tasks/user');
+    let syncedTask = find(memberTasks, findAssignedTask);
+
+    await user.del(`/tasks/${task._id}`);
+
+    await member.del(`/tasks/${syncedTask._id}`);
+
+    await expect(member.get(`/tasks/${syncedTask._id}`))
+      .to.eventually.be.rejected.and.eql({
+        code: 404,
+        error: 'NotFound',
+        message: 'Task not found.',
+      });
+  });
+
+  it('allows a user to delete a task after leaving a group', async () => {
+    let memberTasks = await member.get('/tasks/user');
+    let syncedTask = find(memberTasks, findAssignedTask);
+
+    await member.post(`/groups/${guild._id}/leave`);
+
+    await member.del(`/tasks/${syncedTask._id}`);
+
+    await expect(member.get(`/tasks/${syncedTask._id}`))
+      .to.eventually.be.rejected.and.eql({
+        code: 404,
+        error: 'NotFound',
+        message: 'Task not found.',
+      });
+  });
 });
@@ -0,0 +1,58 @@
+import {
+  createAndPopulateGroup,
+  translate as t,
+} from '../../../../../helpers/api-integration/v3';
+import { find } from 'lodash';
+
+describe('GET /approvals/group/:groupId', () => {
+  let user, guild, member, task, syncedTask;
+
+  function findAssignedTask (memberTask) {
+    return memberTask.group.id === guild._id;
+  }
+
+  beforeEach(async () => {
+    let {group, members, groupLeader} = await createAndPopulateGroup({
+      groupDetails: {
+        name: 'Test Guild',
+        type: 'guild',
+      },
+      members: 1,
+    });
+
+    guild = group;
+    user = groupLeader;
+    member = members[0];
+
+    task = await user.post(`/tasks/group/${guild._id}`, {
+      text: 'test todo',
+      type: 'todo',
+      requiresApproval: true,
+    });
+
+    await user.post(`/tasks/${task._id}/assign/${member._id}`);
+
+    let memberTasks = await member.get('/tasks/user');
+    syncedTask = find(memberTasks, findAssignedTask);
+
+    try {
+      await member.post(`/tasks/${syncedTask._id}/score/up`);
+    } catch (e) {
+      // eslint-disable-next-line no-empty
+    }
+  });
+
+  it('errors when user is not the group leader', async () => {
+    await expect(member.get(`/approvals/group/${guild._id}`))
+      .to.eventually.be.rejected.and.to.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('onlyGroupLeaderCanEditTasks'),
+      });
+  });
+
+  it('gets a list of task that need approval', async () => {
+    let approvals = await user.get(`/approvals/group/${guild._id}`);
+    expect(approvals[0]._id).to.equal(syncedTask._id);
+  });
+});
@@ -0,0 +1,72 @@
+import {
+  createAndPopulateGroup,
+  translate as t,
+} from '../../../../../helpers/api-integration/v3';
+import { find } from 'lodash';
+
+describe('POST /tasks/:id/approve/:userId', () => {
+  let user, guild, member, task;
+
+  function findAssignedTask (memberTask) {
+    return memberTask.group.id === guild._id;
+  }
+
+  beforeEach(async () => {
+    let {group, members, groupLeader} = await createAndPopulateGroup({
+      groupDetails: {
+        name: 'Test Guild',
+        type: 'guild',
+      },
+      members: 1,
+    });
+
+    guild = group;
+    user = groupLeader;
+    member = members[0];
+
+    task = await user.post(`/tasks/group/${guild._id}`, {
+      text: 'test todo',
+      type: 'todo',
+      requiresApproval: true,
+    });
+  });
+
+  it('errors when user is not assigned', async () => {
+    await expect(user.post(`/tasks/${task._id}/approve/${member._id}`))
+      .to.eventually.be.rejected.and.to.eql({
+        code: 404,
+        error: 'NotFound',
+        message: t('taskNotFound'),
+      });
+  });
+
+  it('errors when user is not the group leader', async () => {
+    await user.post(`/tasks/${task._id}/assign/${member._id}`);
+    await expect(member.post(`/tasks/${task._id}/approve/${member._id}`))
+      .to.eventually.be.rejected.and.to.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('onlyGroupLeaderCanEditTasks'),
+      });
+  });
+
+  it('approves an assigned user', async () => {
+    await user.post(`/tasks/${task._id}/assign/${member._id}`);
+    await user.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(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
+  });
+});
@@ -0,0 +1,93 @@
+import {
+  createAndPopulateGroup,
+  translate as t,
+} from '../../../../../helpers/api-integration/v3';
+import { find } from 'lodash';
+
+describe('POST /tasks/:id/score/:direction', () => {
+  let user, guild, member, task;
+
+  function findAssignedTask (memberTask) {
+    return memberTask.group.id === guild._id;
+  }
+
+  beforeEach(async () => {
+    let {group, members, groupLeader} = await createAndPopulateGroup({
+      groupDetails: {
+        name: 'Test Guild',
+        type: 'guild',
+      },
+      members: 1,
+    });
+
+    guild = group;
+    user = groupLeader;
+    member = members[0];
+
+    task = await user.post(`/tasks/group/${guild._id}`, {
+      text: 'test todo',
+      type: 'todo',
+      requiresApproval: true,
+    });
+
+    await user.post(`/tasks/${task._id}/assign/${member._id}`);
+  });
+
+  it('prevents user from scoring a task that needs to be approved', async () => {
+    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();
+
+    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,
+    }));
+    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('errors when approval has already been requested', async () => {
+    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 expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+      .to.eventually.be.rejected.and.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('taskRequiresApproval'),
+      });
+  });
+
+  it('allows a user to score an apporoved task', async () => {
+    let memberTasks = await member.get('/tasks/user');
+    let syncedTask = find(memberTasks, findAssignedTask);
+
+    await user.post(`/tasks/${task._id}/approve/${member._id}`);
+
+    await member.post(`/tasks/${syncedTask._id}/score/up`);
+    let updatedTask = await member.get(`/tasks/${syncedTask._id}`);
+
+    expect(updatedTask.completed).to.equal(true);
+    expect(updatedTask.dateCompleted).to.be.a('string'); // date gets converted to a string as json doesn't have a Date type
+  });
+});
@@ -74,7 +74,7 @@ describe('POST /tasks/:taskId', () => {
  });

  it('returns error when non leader tries to create a task', async () => {
-    await expect(member.post(`/tasks/${task._id}/assign/${member._id}`))
+    await expect(member2.post(`/tasks/${task._id}/assign/${member._id}`))
      .to.eventually.be.rejected.and.eql({
        code: 401,
        error: 'NotAuthorized',
@@ -82,6 +82,25 @@ describe('POST /tasks/:taskId', () => {
      });
  });

+  it('allows user to assign themselves (claim)', async () => {
+    await member.post(`/tasks/${task._id}/assign/${member._id}`);
+
+    let groupTask = await user.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;
+  });
+
+  it('sends a message to the group when a user claims a task', async () => {
+    await member.post(`/tasks/${task._id}/assign/${member._id}`);
+
+    let updateGroup = await user.get(`/groups/${guild._id}`);
+
+    expect(updateGroup.chat[0].text).to.equal(t('userIsClamingTask', {username: member.profile.name, task: task.text}));
+  });
+
  it('assigns a task to a user', async () => {
    await user.post(`/tasks/${task._id}/assign/${member._id}`);

@@ -0,0 +1,83 @@
+import {
+  createAndPopulateGroup,
+  translate as t,
+} from '../../../../../../helpers/api-integration/v3';
+import { v4 as generateUUID } from 'uuid';
+
+describe('DELETE group /tasks/:taskId/checklist/:itemId', () => {
+  let user, guild, task;
+
+  before(async () => {
+    let {group, groupLeader} = await createAndPopulateGroup({
+      groupDetails: {
+        name: 'Test Guild',
+        type: 'guild',
+      },
+      members: 2,
+    });
+
+    guild = group;
+    user = groupLeader;
+  });
+
+  it('deletes a checklist item', async () => {
+    task = await user.post(`/tasks/group/${guild._id}`, {
+      type: 'daily',
+      text: 'Daily with checklist',
+    });
+
+    let savedTask = await user.post(`/tasks/${task._id}/checklist`, {text: 'Checklist Item 1', completed: false});
+
+    await user.del(`/tasks/${task._id}/checklist/${savedTask.checklist[0].id}`);
+    savedTask = await user.get(`/tasks/group/${guild._id}`);
+
+    expect(savedTask[0].checklist.length).to.equal(0);
+  });
+
+  it('does not work with habits', async () => {
+    let habit = await user.post(`/tasks/group/${guild._id}`, {
+      type: 'habit',
+      text: 'habit with checklist',
+    });
+
+    await expect(user.del(`/tasks/${habit._id}/checklist/${generateUUID()}`)).to.eventually.be.rejected.and.eql({
+      code: 400,
+      error: 'BadRequest',
+      message: t('checklistOnlyDailyTodo'),
+    });
+  });
+
+  it('does not work with rewards', async () => {
+    let reward = await user.post(`/tasks/group/${guild._id}`, {
+      type: 'reward',
+      text: 'reward with checklist',
+    });
+
+    await expect(user.del(`/tasks/${reward._id}/checklist/${generateUUID()}`)).to.eventually.be.rejected.and.eql({
+      code: 400,
+      error: 'BadRequest',
+      message: t('checklistOnlyDailyTodo'),
+    });
+  });
+
+  it('fails on task not found', async () => {
+    await expect(user.del(`/tasks/${generateUUID()}/checklist/${generateUUID()}`)).to.eventually.be.rejected.and.eql({
+      code: 404,
+      error: 'NotFound',
+      message: t('taskNotFound'),
+    });
+  });
+
+  it('fails on checklist item not found', async () => {
+    let createdTask = await user.post(`/tasks/group/${guild._id}`, {
+      type: 'daily',
+      text: 'daily with checklist',
+    });
+
+    await expect(user.del(`/tasks/${createdTask._id}/checklist/${generateUUID()}`)).to.eventually.be.rejected.and.eql({
+      code: 404,
+      error: 'NotFound',
+      message: t('checklistItemNotFound'),
+    });
+  });
+});
@@ -0,0 +1,85 @@
+import {
+  createAndPopulateGroup,
+  translate as t,
+} from '../../../../../../helpers/api-integration/v3';
+import { v4 as generateUUID } from 'uuid';
+
+describe('POST group /tasks/:taskId/checklist/', () => {
+  let user, guild, task;
+
+  before(async () => {
+    let {group, groupLeader} = await createAndPopulateGroup({
+      groupDetails: {
+        name: 'Test Guild',
+        type: 'guild',
+      },
+      members: 2,
+    });
+
+    guild = group;
+    user = groupLeader;
+  });
+
+  it('adds a checklist item to a task', async () => {
+    task = await user.post(`/tasks/group/${guild._id}`, {
+      type: 'daily',
+      text: 'Daily with checklist',
+    });
+
+    await user.post(`/tasks/${task._id}/checklist`, {
+      text: 'Checklist Item 1',
+      ignored: false,
+      _id: 123,
+    });
+
+    let updatedTasks = await user.get(`/tasks/group/${guild._id}`);
+    let updatedTask = updatedTasks[0];
+
+    expect(updatedTask.checklist.length).to.equal(1);
+    expect(updatedTask.checklist[0].text).to.equal('Checklist Item 1');
+    expect(updatedTask.checklist[0].completed).to.equal(false);
+    expect(updatedTask.checklist[0].id).to.be.a('string');
+    expect(updatedTask.checklist[0].id).to.not.equal('123');
+    expect(updatedTask.checklist[0].ignored).to.be.an('undefined');
+  });
+
+  it('does not add a checklist to habits', async () => {
+    let habit = await user.post(`/tasks/group/${guild._id}`, {
+      type: 'habit',
+      text: 'habit with checklist',
+    });
+
+    await expect(user.post(`/tasks/${habit._id}/checklist`, {
+      text: 'Checklist Item 1',
+    })).to.eventually.be.rejected.and.eql({
+      code: 400,
+      error: 'BadRequest',
+      message: t('checklistOnlyDailyTodo'),
+    });
+  });
+
+  it('does not add a checklist to rewards', async () => {
+    let reward = await user.post(`/tasks/group/${guild._id}`, {
+      type: 'reward',
+      text: 'reward with checklist',
+    });
+
+    await expect(user.post(`/tasks/${reward._id}/checklist`, {
+      text: 'Checklist Item 1',
+    })).to.eventually.be.rejected.and.eql({
+      code: 400,
+      error: 'BadRequest',
+      message: t('checklistOnlyDailyTodo'),
+    });
+  });
+
+  it('fails on task not found', async () => {
+    await expect(user.post(`/tasks/${generateUUID()}/checklist`, {
+      text: 'Checklist Item 1',
+    })).to.eventually.be.rejected.and.eql({
+      code: 404,
+      error: 'NotFound',
+      message: t('taskNotFound'),
+    });
+  });
+});
@@ -0,0 +1,92 @@
+import {
+  createAndPopulateGroup,
+  translate as t,
+} from '../../../../../../helpers/api-integration/v3';
+import { v4 as generateUUID } from 'uuid';
+
+describe('PUT group /tasks/:taskId/checklist/:itemId', () => {
+  let user, guild, task;
+
+  before(async () => {
+    let {group, groupLeader} = await createAndPopulateGroup({
+      groupDetails: {
+        name: 'Test Guild',
+        type: 'guild',
+      },
+      members: 2,
+    });
+
+    guild = group;
+    user = groupLeader;
+  });
+
+  it('updates a checklist item', async () => {
+    task = await user.post(`/tasks/group/${guild._id}`, {
+      type: 'daily',
+      text: 'Daily with checklist',
+    });
+
+    let savedTask = await user.post(`/tasks/${task._id}/checklist`, {
+      text: 'Checklist Item 1',
+      completed: false,
+    });
+
+    savedTask = await user.put(`/tasks/${task._id}/checklist/${savedTask.checklist[0].id}`, {
+      text: 'updated',
+      completed: true,
+      _id: 123, // ignored
+    });
+
+    expect(savedTask.checklist.length).to.equal(1);
+    expect(savedTask.checklist[0].text).to.equal('updated');
+    expect(savedTask.checklist[0].completed).to.equal(true);
+    expect(savedTask.checklist[0].id).to.not.equal('123');
+  });
+
+  it('fails on habits', async () => {
+    let habit = await user.post(`/tasks/group/${guild._id}`, {
+      type: 'habit',
+      text: 'habit with checklist',
+    });
+
+    await expect(user.put(`/tasks/${habit._id}/checklist/${generateUUID()}`)).to.eventually.be.rejected.and.eql({
+      code: 400,
+      error: 'BadRequest',
+      message: t('checklistOnlyDailyTodo'),
+    });
+  });
+
+  it('fails on rewards', async () => {
+    let reward = await user.post(`/tasks/group/${guild._id}`, {
+      type: 'reward',
+      text: 'reward with checklist',
+    });
+
+    await expect(user.put(`/tasks/${reward._id}/checklist/${generateUUID()}`)).to.eventually.be.rejected.and.eql({
+      code: 400,
+      error: 'BadRequest',
+      message: t('checklistOnlyDailyTodo'),
+    });
+  });
+
+  it('fails on task not found', async () => {
+    await expect(user.put(`/tasks/${generateUUID()}/checklist/${generateUUID()}`)).to.eventually.be.rejected.and.eql({
+      code: 404,
+      error: 'NotFound',
+      message: t('taskNotFound'),
+    });
+  });
+
+  it('fails on checklist item not found', async () => {
+    let createdTask = await user.post(`/tasks/group/${guild._id}`, {
+      type: 'daily',
+      text: 'daily with checklist',
+    });
+
+    await expect(user.put(`/tasks/${createdTask._id}/checklist/${generateUUID()}`)).to.eventually.be.rejected.and.eql({
+      code: 404,
+      error: 'NotFound',
+      message: t('checklistItemNotFound'),
+    });
+  });
+});
@@ -0,0 +1,51 @@
+import {
+  createAndPopulateGroup,
+  translate as t,
+} from '../../../../../../helpers/api-integration/v3';
+import { v4 as generateUUID } from 'uuid';
+// Currently we do not support adding tags to group original tasks, but if we do in the future, these tests will check
+xdescribe('DELETE group /tasks/:taskId/tags/:tagId', () => {
+  let user, guild, task;
+
+  before(async () => {
+    let {group, groupLeader} = await createAndPopulateGroup({
+      groupDetails: {
+        name: 'Test Guild',
+        type: 'guild',
+      },
+      members: 2,
+    });
+
+    guild = group;
+    user = groupLeader;
+  });
+
+  it('removes a tag from a task', async () => {
+    task = await user.post(`/tasks/group/${guild._id}`, {
+      type: 'habit',
+      text: 'Task with tag',
+    });
+
+    let tag = await user.post('/tags', {name: 'Tag 1'});
+
+    await user.post(`/tasks/${task._id}/tags/${tag.id}`);
+    await user.del(`/tasks/${task._id}/tags/${tag.id}`);
+
+    let updatedTask = await user.get(`/tasks/group/${guild._id}`);
+
+    expect(updatedTask[0].tags.length).to.equal(0);
+  });
+
+  it('only deletes existing tags', async () => {
+    let createdTask = await user.post(`/tasks/group/${guild._id}`, {
+      type: 'habit',
+      text: 'Task with tag',
+    });
+
+    await expect(user.del(`/tasks/${createdTask._id}/tags/${generateUUID()}`)).to.eventually.be.rejected.and.eql({
+      code: 404,
+      error: 'NotFound',
+      message: t('tagNotFound'),
+    });
+  });
+});
@@ -0,0 +1,64 @@
+import {
+  createAndPopulateGroup,
+  translate as t,
+} from '../../../../../../helpers/api-integration/v3';
+import { v4 as generateUUID } from 'uuid';
+// Currently we do not support adding tags to group original tasks, but if we do in the future, these tests will check
+xdescribe('POST group /tasks/:taskId/tags/:tagId', () => {
+  let user, guild, task;
+
+  before(async () => {
+    let {group, groupLeader} = await createAndPopulateGroup({
+      groupDetails: {
+        name: 'Test Guild',
+        type: 'guild',
+      },
+      members: 2,
+    });
+
+    guild = group;
+    user = groupLeader;
+  });
+
+  it('adds a tag to a task', async () => {
+    task = await user.post(`/tasks/group/${guild._id}`, {
+      type: 'habit',
+      text: 'Task with tag',
+    });
+
+    let tag = await user.post('/tags', {name: 'Tag 1'});
+    let savedTask = await user.post(`/tasks/${task._id}/tags/${tag.id}`);
+
+    expect(savedTask.tags[0]).to.equal(tag.id);
+  });
+
+  it('does not add a tag to a task twice', async () => {
+    task = await user.post(`/tasks/group/${guild._id}`, {
+      type: 'habit',
+      text: 'Task with tag',
+    });
+
+    let tag = await user.post('/tags', {name: 'Tag 1'});
+
+    await user.post(`/tasks/${task._id}/tags/${tag.id}`);
+
+    await expect(user.post(`/tasks/${task._id}/tags/${tag.id}`)).to.eventually.be.rejected.and.eql({
+      code: 400,
+      error: 'BadRequest',
+      message: t('alreadyTagged'),
+    });
+  });
+
+  it('does not add a non existing tag to a task', async () => {
+    task = await user.post(`/tasks/group/${guild._id}`, {
+      type: 'habit',
+      text: 'Task with tag',
+    });
+
+    await expect(user.post(`/tasks/${task._id}/tags/${generateUUID()}`)).to.eventually.be.rejected.and.eql({
+      code: 400,
+      error: 'BadRequest',
+      message: t('invalidReqParams'),
+    });
+  });
+});
@@ -1,23 +0,0 @@
-import {
-  generateUser,
-} from '../../../../helpers/api-integration/v3';
-
-let user;
-let endpoint = '/user/webhook';
-
-describe('DELETE /user/webhook', () => {
-  beforeEach(async () => {
-    user = await generateUser();
-  });
-
-  it('succeeds', async () => {
-    let id = 'some-id';
-    user.preferences.webhooks[id] = { url: 'http://some-url.com', enabled: true };
-    await user.sync();
-    expect(user.preferences.webhooks).to.eql({});
-    let response = await user.del(`${endpoint}/${id}`);
-    expect(response).to.eql({});
-    await user.sync();
-    expect(user.preferences.webhooks).to.eql({});
-  });
-});
@@ -13,12 +13,19 @@ describe('GET /user/anonymized', () => {

  before(async () => {
    user = await generateUser();
-    await user.update({ newMessages: ['some', 'new', 'messages'], 'profile.name': 'profile', 'purchased.plan': 'purchased plan',
-                        contributor: 'contributor', invitations: 'invitations', 'items.special.nyeReceived': 'some', 'items.special.valentineReceived': 'some',
-                        webhooks: 'some', 'achievements.challenges': 'some',
-                        'inbox.messages': [{ text: 'some text' }],
-                        tags: [{ name: 'some name', challenge: 'some challenge' }],
-                      });
+    await user.update({
+      newMessages: ['some', 'new', 'messages'],
+      'profile.name': 'profile',
+      'purchased.plan': 'purchased plan',
+      contributor: 'contributor',
+      invitations: 'invitations',
+      'items.special.nyeReceived': 'some',
+      'items.special.valentineReceived': 'some',
+      webhooks: [{url: 'https://somurl.com'}],
+      'achievements.challenges': 'some',
+      'inbox.messages': [{ text: 'some text' }],
+      tags: [{ name: 'some name', challenge: 'some challenge' }],
+    });

    await generateHabit({ userId: user._id });
    await generateHabit({ userId: user._id, text: generateUUID() });
@@ -1,29 +0,0 @@
-import {
-  generateUser,
-  translate as t,
-} from '../../../../helpers/api-integration/v3';
-
-let user;
-let endpoint = '/user/webhook';
-
-describe('POST /user/webhook', () => {
-  beforeEach(async () => {
-    user = await generateUser();
-  });
-
-  it('validates', async () => {
-    await expect(user.post(endpoint, { enabled: true })).to.eventually.be.rejected.and.eql({
-      code: 400,
-      error: 'BadRequest',
-      message: t('invalidUrl'),
-    });
-  });
-
-  it('successfully adds the webhook', async () => {
-    expect(user.preferences.webhooks).to.eql({});
-    let response = await user.post(endpoint, { enabled: true, url: 'http://some-url.com'});
-    expect(response.id).to.exist;
-    await user.sync();
-    expect(user.preferences.webhooks).to.not.eql({});
-  });
-});
@@ -62,15 +62,6 @@ describe('POST /user/buy/:key', () => {
    await user.post(`/user/buy/${key}`);
    await user.sync();

-    expect(user.items.gear.owned).to.eql({
-      armor_warrior_1: true,
-      eyewear_special_blackTopFrame: true,
-      eyewear_special_blueTopFrame: true,
-      eyewear_special_greenTopFrame: true,
-      eyewear_special_pinkTopFrame: true,
-      eyewear_special_redTopFrame: true,
-      eyewear_special_whiteTopFrame: true,
-      eyewear_special_yellowTopFrame: true,
-    });
+    expect(user.items.gear.owned.armor_warrior_1).to.eql(true);
  });
 });
@@ -31,15 +31,6 @@ describe('POST /user/buy-gear/:key', () => {
    await user.post(`/user/buy-gear/${key}`);
    await user.sync();

-    expect(user.items.gear.owned).to.eql({
-      armor_warrior_1: true,
-      eyewear_special_blackTopFrame: true,
-      eyewear_special_blueTopFrame: true,
-      eyewear_special_greenTopFrame: true,
-      eyewear_special_pinkTopFrame: true,
-      eyewear_special_redTopFrame: true,
-      eyewear_special_whiteTopFrame: true,
-      eyewear_special_yellowTopFrame: true,
-    });
+    expect(user.items.gear.owned.armor_warrior_1).to.eql(true);
  });
 });
@@ -20,6 +20,6 @@ describe('POST /user/purchase-hourglass/:type/:key', () => {

    expect(response.message).to.eql(t('hourglassPurchase'));
    expect(user.purchased.plan.consecutive.trinkets).to.eql(1);
-    expect(user.items.pets).to.eql({'MantisShrimp-Base': 5});
+    expect(user.items.pets['MantisShrimp-Base']).to.eql(5);
  });
 });
@@ -26,6 +26,32 @@ describe('PUT /user', () => {
      expect(user.preferences.costume).to.eql(true);
      expect(user.stats.hp).to.eql(14);
    });
+
+    it('profile.name cannot be an empty string or null', async () => {
+      await expect(user.put('/user', {
+        'profile.name': ' ', // string should be trimmed
+      })).to.eventually.be.rejected.and.eql({
+        code: 400,
+        error: 'BadRequest',
+        message: 'User validation failed',
+      });
+
+      await expect(user.put('/user', {
+        'profile.name': '',
+      })).to.eventually.be.rejected.and.eql({
+        code: 400,
+        error: 'BadRequest',
+        message: 'User validation failed',
+      });
+
+      await expect(user.put('/user', {
+        'profile.name': null,
+      })).to.eventually.be.rejected.and.eql({
+        code: 400,
+        error: 'BadRequest',
+        message: 'User validation failed',
+      });
+    });
  });

  context('Top Level Protected Operations', () => {
@@ -37,6 +63,7 @@ describe('PUT /user', () => {
      subscriptions: {'purchased.plan.extraMonths': 500, 'purchased.plan.consecutive.trinkets': 1000},
      'customization gem purchases': {'purchased.background.tavern': true, 'purchased.skin.bear': true},
      notifications: [{type: 123}],
+      webhooks: {webhooks: [{url: 'https://foobar.com'}]},
    };

    each(protectedOperations, (data, testName) => {
@@ -1,32 +0,0 @@
-import {
-  generateUser,
-  translate as t,
-} from '../../../../helpers/api-integration/v3';
-
-let user;
-let url = 'http://new-url.com';
-let enabled = true;
-
-describe('PUT /user/webhook/:id', () => {
-  beforeEach(async () => {
-    user = await generateUser();
-  });
-
-  it('validation fails', async () => {
-    await expect(user.put('/user/webhook/some-id'), { enabled: true }).to.eventually.be.rejected.and.eql({
-      code: 400,
-      error: 'BadRequest',
-      message: t('invalidUrl'),
-    });
-  });
-
-  it('succeeds', async () => {
-    let response = await user.post('/user/webhook', { enabled: true, url: 'http://some-url.com'});
-    await user.sync();
-    expect(user.preferences.webhooks[response.id].url).to.not.eql(url);
-    let response2 = await user.put(`/user/webhook/${response.id}`, {url, enabled});
-    expect(response2.url).to.eql(url);
-    await user.sync();
-    expect(user.preferences.webhooks[response.id].url).to.eql(url);
-  });
-});
@@ -5,36 +5,94 @@ import {

 describe('DELETE social registration', () => {
  let user;
-  let endpoint = '/user/auth/social/facebook';
+
  beforeEach(async () => {
    user = await generateUser();
-    await user.update({ 'auth.facebook.id': 'some-fb-id' });
-    expect(user.auth.local.username).to.not.be.empty;
-    expect(user.auth.facebook).to.not.be.empty;
  });
-  context('of NOT-FACEBOOK', () => {
+
+  context('NOT-SUPPORTED', () => {
    it('is not supported', async () => {
      await expect(user.del('/user/auth/social/SOME-OTHER-NETWORK')).to.eventually.be.rejected.and.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('onlyFbSupported'),
+        code: 400,
+        error: 'BadRequest',
+        message: t('unsupportedNetwork'),
      });
    });
  });
-  context('of facebook', () => {
-    it('fails if local registration does not exist for this user', async () => {
-      await user.update({ 'auth.local': { ok: true } });
-      await expect(user.del(endpoint)).to.eventually.be.rejected.and.eql({
+
+  context('Facebook', () => {
+    it('fails if user does not have an alternative registration method', async () => {
+      await user.update({
+        'auth.facebook.id': 'some-fb-id',
+        'auth.local': { ok: true },
+      });
+      await expect(user.del('/user/auth/social/facebook')).to.eventually.be.rejected.and.eql({
        code: 401,
        error: 'NotAuthorized',
-        message: t('cantDetachFb'),
+        message: t('cantDetachSocial'),
      });
    });
-    it('succeeds', async () => {
-      let response = await user.del(endpoint);
+
+    it('succeeds if user has a local registration', async () => {
+      await user.update({
+        'auth.facebook.id': 'some-fb-id',
+      });
+
+      let response = await user.del('/user/auth/social/facebook');
+      expect(response).to.eql({});
+      await user.sync();
+      expect(user.auth.facebook).to.be.empty;
+    });
+
+    it('succeeds if user has a google registration', async () => {
+      await user.update({
+        'auth.facebook.id': 'some-fb-id',
+        'auth.google.id': 'some-google-id',
+        'auth.local': { ok: true },
+      });
+
+      let response = await user.del('/user/auth/social/facebook');
      expect(response).to.eql({});
      await user.sync();
      expect(user.auth.facebook).to.be.empty;
    });
  });
+
+  context('Google', () => {
+    it('fails if user does not have an alternative registration method', async () => {
+      await user.update({
+        'auth.google.id': 'some-google-id',
+        'auth.local': { ok: true },
+      });
+      await expect(user.del('/user/auth/social/google')).to.eventually.be.rejected.and.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('cantDetachSocial'),
+      });
+    });
+
+    it('succeeds if user has a local registration', async () => {
+      await user.update({
+        'auth.google.id': 'some-google-id',
+      });
+
+      let response = await user.del('/user/auth/social/google');
+      expect(response).to.eql({});
+      await user.sync();
+      expect(user.auth.google).to.be.empty;
+    });
+
+    it('succeeds if user has a facebook registration', async () => {
+      await user.update({
+        'auth.google.id': 'some-google-id',
+        'auth.facebook.id': 'some-facebook-id',
+        'auth.local': { ok: true },
+      });
+
+      let response = await user.del('/user/auth/social/google');
+      expect(response).to.eql({});
+      await user.sync();
+      expect(user.auth.google).to.be.empty;
+    });
+  });
 });
@@ -32,6 +32,7 @@ describe('POST /user/auth/local/register', () => {
      expect(user._id).to.exist;
      expect(user.apiToken).to.exist;
      expect(user.auth.local.username).to.eql(username);
+      expect(user.profile.name).to.eql(username);
    });

    it('provides default tags and tasks', async () => {
@@ -66,6 +67,7 @@ describe('POST /user/auth/local/register', () => {
      });

      await expect(getProperty('users', user._id, '_ABtest')).to.eventually.be.a('string');
+      await expect(getProperty('users', user._id, '_ABtests')).to.eventually.be.a('object');
    });

    it('requires password and confirmPassword to match', async () => {
@@ -12,58 +12,134 @@ describe('POST /user/auth/social', () => {
  let endpoint = '/user/auth/social';
  let randomAccessToken = '123456';
  let facebookId = 'facebookId';
-  let network = 'facebook';
+  let googleId = 'googleId';
+  let network = 'NoNetwork';

-  before(async () => {
+  beforeEach(async () => {
    api = requester();
    user = await generateUser();
-
-    let expectedResult = {id: facebookId};
-    let passportFacebookProfile = sandbox.stub(passport._strategies.facebook, 'userProfile');
-    passportFacebookProfile.yields(null, expectedResult);
  });

-  it('fails if network is not facebook', async () => {
+  it('fails if network is not supported', async () => {
    await expect(api.post(endpoint, {
      authResponse: {access_token: randomAccessToken}, // eslint-disable-line camelcase
-      network: 'NotFacebook',
+      network,
    })).to.eventually.be.rejected.and.eql({
-      code: 401,
-      error: 'NotAuthorized',
-      message: t('onlyFbSupported'),
+      code: 400,
+      error: 'BadRequest',
+      message: t('unsupportedNetwork'),
    });
  });

-  it('registers a new user', async () => {
-    let response = await api.post(endpoint, {
-      authResponse: {access_token: randomAccessToken}, // eslint-disable-line camelcase
-      network,
+  describe('facebook', () => {
+    before(async () => {
+      let expectedResult = {id: facebookId, displayName: 'a facebook user'};
+      sandbox.stub(passport._strategies.facebook, 'userProfile').yields(null, expectedResult);
+      network = 'facebook';
    });

-    expect(response.apiToken).to.exist;
-    expect(response.id).to.exist;
-    expect(response.newUser).to.be.true;
+    it('registers a new user', async () => {
+      let response = await api.post(endpoint, {
+        authResponse: {access_token: randomAccessToken}, // eslint-disable-line camelcase
+        network,
+      });
+
+      expect(response.apiToken).to.exist;
+      expect(response.id).to.exist;
+      expect(response.newUser).to.be.true;
+      await expect(getProperty('users', response.id, 'profile.name')).to.eventually.equal('a facebook user');
+    });
+
+    it('logs an existing user in', async () => {
+      let registerResponse = await api.post(endpoint, {
+        authResponse: {access_token: randomAccessToken}, // eslint-disable-line camelcase
+        network,
+      });
+
+      let response = await api.post(endpoint, {
+        authResponse: {access_token: randomAccessToken}, // eslint-disable-line camelcase
+        network,
+      });
+
+      expect(response.apiToken).to.eql(registerResponse.apiToken);
+      expect(response.id).to.eql(registerResponse.id);
+      expect(response.newUser).to.be.false;
+    });
+
+    it('add social auth to an existing user', async () => {
+      let response = await user.post(endpoint, {
+        authResponse: {access_token: randomAccessToken}, // eslint-disable-line camelcase
+        network,
+      });
+
+      expect(response.apiToken).to.exist;
+      expect(response.id).to.exist;
+      expect(response.newUser).to.be.false;
+    });
+
+    it('enrolls a new user in an A/B test', async () => {
+      await api.post(endpoint, {
+        authResponse: {access_token: randomAccessToken}, // eslint-disable-line camelcase
+        network,
+      });
+
+      await expect(getProperty('users', user._id, '_ABtest')).to.eventually.be.a('string');
+    });
  });

-  it('enrolls a new user in an A/B test', async () => {
-    await api.post(endpoint, {
-      authResponse: {access_token: randomAccessToken}, // eslint-disable-line camelcase
-      network,
+  describe('google', () => {
+    before(async () => {
+      let expectedResult = {id: googleId, displayName: 'a google user'};
+      sandbox.stub(passport._strategies.google, 'userProfile').yields(null, expectedResult);
+      network = 'google';
    });

-    await expect(getProperty('users', user._id, '_ABtest')).to.eventually.be.a('string');
-  });
+    it('registers a new user', async () => {
+      let response = await api.post(endpoint, {
+        authResponse: {access_token: randomAccessToken}, // eslint-disable-line camelcase
+        network,
+      });

-  it('logs an existing user in', async () => {
-    await user.update({ 'auth.facebook.id': facebookId });
-
-    let response = await api.post(endpoint, {
-      authResponse: {access_token: randomAccessToken}, // eslint-disable-line camelcase
-      network,
+      expect(response.apiToken).to.exist;
+      expect(response.id).to.exist;
+      expect(response.newUser).to.be.true;
+      await expect(getProperty('users', response.id, 'profile.name')).to.eventually.equal('a google user');
    });

-    expect(response.apiToken).to.eql(user.apiToken);
-    expect(response.id).to.eql(user._id);
-    expect(response.newUser).to.be.false;
+    it('logs an existing user in', async () => {
+      let registerResponse = await api.post(endpoint, {
+        authResponse: {access_token: randomAccessToken}, // eslint-disable-line camelcase
+        network,
+      });
+
+      let response = await api.post(endpoint, {
+        authResponse: {access_token: randomAccessToken}, // eslint-disable-line camelcase
+        network,
+      });
+
+      expect(response.apiToken).to.eql(registerResponse.apiToken);
+      expect(response.id).to.eql(registerResponse.id);
+      expect(response.newUser).to.be.false;
+    });
+
+    it('add social auth to an existing user', async () => {
+      let response = await user.post(endpoint, {
+        authResponse: {access_token: randomAccessToken}, // eslint-disable-line camelcase
+        network,
+      });
+
+      expect(response.apiToken).to.exist;
+      expect(response.id).to.exist;
+      expect(response.newUser).to.be.false;
+    });
+
+    it('enrolls a new user in an A/B test', async () => {
+      await api.post(endpoint, {
+        authResponse: {access_token: randomAccessToken}, // eslint-disable-line camelcase
+        network,
+      });
+
+      await expect(getProperty('users', user._id, '_ABtest')).to.eventually.be.a('string');
+    });
  });
 });
@@ -0,0 +1,54 @@
+import {
+  generateUser,
+  translate as t,
+} from '../../../../helpers/api-integration/v3';
+
+let user, webhookToDelete;
+let endpoint = '/user/webhook';
+
+describe('DELETE /user/webhook', () => {
+  beforeEach(async () => {
+    user = await generateUser();
+
+    webhookToDelete = await user.post('/user/webhook', {
+      url: 'http://some-url.com',
+      enabled: true,
+    });
+    await user.post('/user/webhook', {
+      url: 'http://some-other-url.com',
+      enabled: false,
+    });
+
+    await user.sync();
+  });
+
+  it('deletes a webhook', async () => {
+    expect(user.webhooks).to.have.a.lengthOf(2);
+    await user.del(`${endpoint}/${webhookToDelete.id}`);
+
+    await user.sync();
+
+    expect(user.webhooks).to.have.a.lengthOf(1);
+  });
+
+  it('returns the remaining webhooks', async () => {
+    let [remainingWebhook] = await user.del(`${endpoint}/${webhookToDelete.id}`);
+
+    await user.sync();
+
+    let webhook = user.webhooks[0];
+
+    expect(remainingWebhook.id).to.eql(webhook.id);
+    expect(remainingWebhook.url).to.eql(webhook.url);
+    expect(remainingWebhook.type).to.eql(webhook.type);
+    expect(remainingWebhook.options).to.eql(webhook.options);
+  });
+
+  it('returns an error if webhook with id does not exist', async () => {
+    await expect(user.del(`${endpoint}/id-that-does-not-exist`)).to.eventually.be.rejected.and.eql({
+      code: 404,
+      error: 'NotFound',
+      message: t('noWebhookWithId', {id: 'id-that-does-not-exist'}),
+    });
+  });
+});
@@ -0,0 +1,221 @@
+import {
+  generateUser,
+  translate as t,
+} from '../../../../helpers/api-integration/v3';
+import { v4 as generateUUID } from 'uuid';
+
+describe('POST /user/webhook', () => {
+  let user, body;
+
+  beforeEach(async () => {
+    user = await generateUser();
+    body = {
+      id: generateUUID(),
+      url: 'https://example.com/endpoint',
+      type: 'taskActivity',
+      enabled: false,
+    };
+  });
+
+  it('requires a url', async () => {
+    delete body.url;
+
+    await expect(user.post('/user/webhook', body)).to.eventually.be.rejected.and.eql({
+      code: 400,
+      error: 'BadRequest',
+      message: 'User validation failed',
+    });
+  });
+
+  it('requires custom id to be a uuid', async () => {
+    body.id = 'not-a-uuid';
+
+    await expect(user.post('/user/webhook', body)).to.eventually.be.rejected.and.eql({
+      code: 400,
+      error: 'BadRequest',
+      message: 'User validation failed',
+    });
+  });
+
+  it('defaults id to a uuid', async () => {
+    delete body.id;
+
+    let webhook = await user.post('/user/webhook', body);
+
+    expect(webhook.id).to.exist;
+  });
+
+  it('requires type to be of an accetable type', async () => {
+    body.type = 'not a valid type';
+
+    await expect(user.post('/user/webhook', body)).to.eventually.be.rejected.and.eql({
+      code: 400,
+      error: 'BadRequest',
+      message: 'User validation failed',
+    });
+  });
+
+  it('defaults enabled to true', async () => {
+    delete body.enabled;
+
+    let webhook = await user.post('/user/webhook', body);
+
+    expect(webhook.enabled).to.be.true;
+  });
+
+  it('can pass a label', async () => {
+    body.label = 'Custom Label';
+
+    let webhook = await user.post('/user/webhook', body);
+
+    expect(webhook.label).to.equal('Custom Label');
+  });
+
+  it('defaults type to taskActivity', async () => {
+    delete body.type;
+
+    let webhook = await user.post('/user/webhook', body);
+
+    expect(webhook.type).to.eql('taskActivity');
+  });
+
+  it('successfully adds the webhook', async () => {
+    expect(user.webhooks).to.eql([]);
+
+    let response = await user.post('/user/webhook', body);
+
+    expect(response.id).to.eql(body.id);
+    expect(response.type).to.eql(body.type);
+    expect(response.url).to.eql(body.url);
+    expect(response.enabled).to.eql(body.enabled);
+
+    await user.sync();
+
+    expect(user.webhooks).to.not.eql([]);
+
+    let webhook = user.webhooks[0];
+
+    expect(webhook.enabled).to.be.false;
+    expect(webhook.type).to.eql('taskActivity');
+    expect(webhook.url).to.eql(body.url);
+  });
+
+  it('cannot use an id of a webhook that already exists', async () => {
+    await user.post('/user/webhook', body);
+
+    await expect(user.post('/user/webhook', body)).to.eventually.be.rejected.and.eql({
+      code: 400,
+      error: 'BadRequest',
+      message: t('webhookIdAlreadyTaken', { id: body.id }),
+    });
+  });
+
+  it('defaults taskActivity options', async () => {
+    body.type = 'taskActivity';
+
+    let webhook = await user.post('/user/webhook', body);
+
+    expect(webhook.options).to.eql({
+      created: false,
+      updated: false,
+      deleted: false,
+      scored: true,
+    });
+  });
+
+  it('can set taskActivity options', async () => {
+    body.type = 'taskActivity';
+    body.options = {
+      created: true,
+      updated: true,
+      deleted: true,
+      scored: false,
+    };
+
+    let webhook = await user.post('/user/webhook', body);
+
+    expect(webhook.options).to.eql({
+      created: true,
+      updated: true,
+      deleted: true,
+      scored: false,
+    });
+  });
+
+  it('discards extra properties in taskActivity options', async () => {
+    body.type = 'taskActivity';
+    body.options = {
+      created: true,
+      updated: true,
+      deleted: true,
+      scored: false,
+      foo: 'bar',
+    };
+
+    let webhook = await user.post('/user/webhook', body);
+
+    expect(webhook.options.foo).to.not.exist;
+    expect(webhook.options).to.eql({
+      created: true,
+      updated: true,
+      deleted: true,
+      scored: false,
+    });
+  });
+
+  ['created', 'updated', 'deleted', 'scored'].forEach((option) => {
+    it(`requires taskActivity option ${option} to be a boolean`, async () => {
+      body.type = 'taskActivity';
+      body.options = {
+        [option]: 'not a boolean',
+      };
+
+      await expect(user.post('/user/webhook', body)).to.eventually.be.rejected.and.eql({
+        code: 400,
+        error: 'BadRequest',
+        message: t('webhookBooleanOption', { option }),
+      });
+    });
+  });
+
+  it('can set groupChatReceived options', async () => {
+    body.type = 'groupChatReceived';
+    body.options = {
+      groupId: generateUUID(),
+    };
+
+    let webhook = await user.post('/user/webhook', body);
+
+    expect(webhook.options).to.eql({
+      groupId: body.options.groupId,
+    });
+  });
+
+  it('groupChatReceived options requires a uuid for the groupId', async () => {
+    body.type = 'groupChatReceived';
+    body.options = {
+      groupId: 'not-a-uuid',
+    };
+
+    await expect(user.post('/user/webhook', body)).to.eventually.be.rejected.and.eql({
+      code: 400,
+      error: 'BadRequest',
+      message: t('groupIdRequired'),
+    });
+  });
+
+  it('discards extra properties in groupChatReceived options', async () => {
+    body.type = 'groupChatReceived';
+    body.options = {
+      groupId: generateUUID(),
+      foo: 'bar',
+    };
+
+    let webhook = await user.post('/user/webhook', body);
+
+    expect(webhook.options.foo).to.not.exist;
+    expect(webhook.options).to.eql({
+      groupId: body.options.groupId,
+    });
+  });
+});
@@ -0,0 +1,132 @@
+import {
+  generateUser,
+  translate as t,
+} from '../../../../helpers/api-integration/v3';
+import { v4 as generateUUID} from 'uuid';
+
+describe('PUT /user/webhook/:id', () => {
+  let user, webhookToUpdate;
+
+  beforeEach(async () => {
+    user = await generateUser();
+
+    webhookToUpdate = await user.post('/user/webhook', {
+      url: 'http://some-url.com',
+      label: 'Original Label',
+      enabled: true,
+      type: 'taskActivity',
+      options: { created: true, scored: true },
+    });
+    await user.post('/user/webhook', {
+      url: 'http://some-other-url.com',
+      enabled: false,
+    });
+
+    await user.sync();
+  });
+
+  it('returns an error if webhook with id does not exist', async () => {
+    await expect(user.put('/user/webhook/id-that-does-not-exist')).to.eventually.be.rejected.and.eql({
+      code: 404,
+      error: 'NotFound',
+      message: t('noWebhookWithId', {id: 'id-that-does-not-exist'}),
+    });
+  });
+
+  it('returns an error if validation fails', async () => {
+    await expect(user.put(`/user/webhook/${webhookToUpdate.id}`, { url: 'foo', enabled: true })).to.eventually.be.rejected.and.eql({
+      code: 400,
+      error: 'BadRequest',
+      message: 'User validation failed',
+    });
+  });
+
+  it('updates a webhook', async () => {
+    let url = 'http://a-new-url.com';
+    let type = 'groupChatReceived';
+    let label = 'New Label';
+    let options = { groupId: generateUUID() };
+
+    await user.put(`/user/webhook/${webhookToUpdate.id}`, {url, type, options, label});
+
+    await user.sync();
+
+    let webhook = user.webhooks.find(hook => webhookToUpdate.id === hook.id);
+
+    expect(webhook.url).to.equal(url);
+    expect(webhook.label).to.equal(label);
+    expect(webhook.type).to.equal(type);
+    expect(webhook.options).to.eql(options);
+  });
+
+  it('returns the updated webhook', async () => {
+    let url = 'http://a-new-url.com';
+    let type = 'groupChatReceived';
+    let options = { groupId: generateUUID() };
+
+    let response = await user.put(`/user/webhook/${webhookToUpdate.id}`, {url, type, options});
+
+    expect(response.url).to.eql(url);
+    expect(response.type).to.eql(type);
+    expect(response.options).to.eql(options);
+  });
+
+  it('cannot update the id', async () => {
+    let id = generateUUID();
+    let url = 'http://a-new-url.com';
+
+    await user.put(`/user/webhook/${webhookToUpdate.id}`, {url, id});
+
+    await user.sync();
+
+    let webhook = user.webhooks.find(hook => webhookToUpdate.id === hook.id);
+
+    expect(webhook.id).to.eql(webhookToUpdate.id);
+    expect(webhook.url).to.eql(url);
+  });
+
+  it('can update taskActivity options', async () => {
+    let type = 'taskActivity';
+    let options = {
+      updated: false,
+      deleted: true,
+    };
+
+    let webhook = await user.put(`/user/webhook/${webhookToUpdate.id}`, {type, options});
+
+    expect(webhook.options).to.eql({
+      created: true, // starting value
+      updated: false,
+      deleted: true,
+      scored: true, // default value
+    });
+  });
+
+  it('errors if taskActivity option is not a boolean', async () => {
+    let type = 'taskActivity';
+    let options = {
+      created: 'not a boolean',
+      updated: false,
+      deleted: true,
+    };
+
+    await expect(user.put(`/user/webhook/${webhookToUpdate.id}`, {type, options})).to.eventually.be.rejected.and.eql({
+      code: 400,
+      error: 'BadRequest',
+      message: t('webhookBooleanOption', { option: 'created' }),
+    });
+  });
+
+  it('errors if groupChatRecieved groupId option is not a uuid', async () => {
+    let type = 'groupChatReceived';
+    let options = {
+      groupId: 'not-a-uuid',
+    };
+
+    await expect(user.put(`/user/webhook/${webhookToUpdate.id}`, {type, options})).to.eventually.be.rejected.and.eql({
+      code: 400,
+      error: 'BadRequest',
+      message: t('groupIdRequired'),
+    });
+  });
+});
@@ -11,6 +11,10 @@ describe('analyticsService', () => {
    sandbox.stub(Visitor.prototype, 'transaction');
  });

+  afterEach(() => {
+    sandbox.restore();
+  });
+
  describe('#track', () => {
    let eventType, data;

@@ -273,6 +277,8 @@ describe('analyticsService', () => {
          dailys: [{_id: 'daily'}],
          todos: [{_id: 'todo'}],
          rewards: [{_id: 'reward'}],
+          balance: 12,
+          loginIncentives: 1,
        };

        data.user = user;
@@ -296,6 +302,9 @@ describe('analyticsService', () => {
                },
                contributorLevel: 1,
                subscription: 'foo-plan',
+                balance: 12,
+                balanceGemAmount: 48,
+                loginIncentives: 1,
              },
            });
          });
@@ -345,7 +354,8 @@ describe('analyticsService', () => {
        purchaseType: 'checkout',
        gift: false,
        quantity: 1,
-        headers: {'x-client': 'habitica-web',
+        headers: {
+          'x-client': 'habitica-web',
          'user-agent': '',
        },
      };
@@ -8,6 +8,7 @@ import { model as User } from '../../../../../website/server/models/user';
 import * as Tasks from '../../../../../website/server/models/task';
 import { clone } from 'lodash';
 import common from '../../../../../website/common';
+import analytics from '../../../../../website/server/libs/analyticsService';

 // const scoreTask = common.ops.scoreTask;

@@ -17,9 +18,6 @@ describe('cron', () => {
  let user;
  let tasksByType = {habits: [], dailys: [], todos: [], rewards: []};
  let daysMissed = 0;
-  let analytics = {
-    track: sinon.spy(),
-  };

  beforeEach(() => {
    user = new User({
@@ -34,11 +32,17 @@ describe('cron', () => {
      },
    });

+    sinon.spy(analytics, 'track');
+
    user._statsComputed = {
      mp: 10,
    };
  });

+  afterEach(() => {
+    analytics.track.restore();
+  });
+
  it('updates user.preferences.timezoneOffsetAtLastCron', () => {
    let timezoneOffsetFromUserPrefs = 1;

@@ -59,10 +63,15 @@ describe('cron', () => {
    expect(user.flags.cronCount).to.be.greaterThan(cronCountBefore);
  });

+  it('calls analytics', () => {
+    cron({user, tasksByType, daysMissed, analytics});
+    expect(analytics.track.callCount).to.equal(1);
+  });
+
  describe('end of the month perks', () => {
    beforeEach(() => {
      user.purchased.plan.customerId = 'subscribedId';
-      user.purchased.plan.dateUpdated = moment('012013', 'MMYYYY');
+      user.purchased.plan.dateUpdated = moment().subtract(1, 'months').toDate();
    });

    it('resets plan.gemsBought on a new month', () => {
@@ -71,10 +80,21 @@ describe('cron', () => {
      expect(user.purchased.plan.gemsBought).to.equal(0);
    });

-    it('resets plan.dateUpdated on a new month', () => {
-      let currentMonth = moment().format('MMYYYY');
+    it('does not reset plan.gemsBought within the month', () => {
+      let clock = sinon.useFakeTimers(moment().startOf('month').add(2, 'days').unix());
+      user.purchased.plan.dateUpdated = moment().startOf('month').toDate();
+
+      user.purchased.plan.gemsBought = 10;
      cron({user, tasksByType, daysMissed, analytics});
-      expect(moment(user.purchased.plan.dateUpdated).format('MMYYYY')).to.equal(currentMonth);
+      expect(user.purchased.plan.gemsBought).to.equal(10);
+
+      clock.restore();
+    });
+
+    it('resets plan.dateUpdated on a new month', () => {
+      let currentMonth = moment().startOf('month');
+      cron({user, tasksByType, daysMissed, analytics});
+      expect(moment(user.purchased.plan.dateUpdated).startOf('month').isSame(currentMonth)).to.eql(true);
    });

    it('increments plan.consecutive.count', () => {
@@ -83,6 +103,13 @@ describe('cron', () => {
      expect(user.purchased.plan.consecutive.count).to.equal(1);
    });

+    it('increments plan.consecutive.count by more than 1 if user skipped months between logins', () => {
+      user.purchased.plan.dateUpdated = moment().subtract(2, 'months').toDate();
+      user.purchased.plan.consecutive.count = 0;
+      cron({user, tasksByType, daysMissed, analytics});
+      expect(user.purchased.plan.consecutive.count).to.equal(2);
+    });
+
    it('decrements plan.consecutive.offset when offset is greater than 0', () => {
      user.purchased.plan.consecutive.offset = 2;
      cron({user, tasksByType, daysMissed, analytics});
@@ -97,6 +124,21 @@ describe('cron', () => {
      expect(user.purchased.plan.consecutive.offset).to.equal(0);
    });

+    it('increments plan.consecutive.trinkets multiple times if user has been absent with continuous subscription', () => {
+      user.purchased.plan.dateUpdated = moment().subtract(6, 'months').toDate();
+      user.purchased.plan.consecutive.count = 5;
+      cron({user, tasksByType, daysMissed, analytics});
+      expect(user.purchased.plan.consecutive.trinkets).to.equal(2);
+    });
+
+    it('does not award unearned plan.consecutive.trinkets if subscription ended during an absence', () => {
+      user.purchased.plan.dateUpdated = moment().subtract(6, 'months').toDate();
+      user.purchased.plan.dateTerminated = moment().subtract(3, 'months').toDate();
+      user.purchased.plan.consecutive.count = 5;
+      cron({user, tasksByType, daysMissed, analytics});
+      expect(user.purchased.plan.consecutive.trinkets).to.equal(1);
+    });
+
    it('increments plan.consecutive.gemCapExtra when user has reached a month that is a multiple of 3', () => {
      user.purchased.plan.consecutive.count = 5;
      user.purchased.plan.consecutive.offset = 1;
@@ -105,6 +147,13 @@ describe('cron', () => {
      expect(user.purchased.plan.consecutive.offset).to.equal(0);
    });

+    it('increments plan.consecutive.gemCapExtra multiple times if user has been absent with continuous subscription', () => {
+      user.purchased.plan.dateUpdated = moment().subtract(6, 'months').toDate();
+      user.purchased.plan.consecutive.count = 5;
+      cron({user, tasksByType, daysMissed, analytics});
+      expect(user.purchased.plan.consecutive.gemCapExtra).to.equal(10);
+    });
+
    it('does not increment plan.consecutive.gemCapExtra when user has reached the gemCap limit', () => {
      user.purchased.plan.consecutive.gemCapExtra = 25;
      user.purchased.plan.consecutive.count = 5;
@@ -118,7 +167,7 @@ describe('cron', () => {
      expect(user.purchased.plan.customerId).to.exist;
    });

-    it('does reset plan stats until we are after the last day of the cancelled month', () => {
+    it('does reset plan stats if we are after the last day of the cancelled month', () => {
      user.purchased.plan.dateTerminated = moment(new Date()).subtract({days: 1});
      user.purchased.plan.consecutive.gemCapExtra = 20;
      user.purchased.plan.consecutive.count = 5;
@@ -134,10 +183,25 @@ describe('cron', () => {
  });

  describe('end of the month perks when user is not subscribed', () => {
-    it('does not reset plan.gemsBought on a new month', () => {
+    beforeEach(() => {
+      user.purchased.plan.dateUpdated = moment().subtract(1, 'months').toDate();
+    });
+
+    it('resets plan.gemsBought on a new month', () => {
+      user.purchased.plan.gemsBought = 10;
+      cron({user, tasksByType, daysMissed, analytics});
+      expect(user.purchased.plan.gemsBought).to.equal(0);
+    });
+
+    it('does not reset plan.gemsBought within the month', () => {
+      let clock = sinon.useFakeTimers(moment().startOf('month').add(2, 'days').unix());
+      user.purchased.plan.dateUpdated = moment().startOf('month').toDate();
+
      user.purchased.plan.gemsBought = 10;
      cron({user, tasksByType, daysMissed, analytics});
      expect(user.purchased.plan.gemsBought).to.equal(10);
+
+      clock.restore();
    });

    it('does not reset plan.dateUpdated on a new month', () => {
@@ -202,6 +266,11 @@ describe('cron', () => {
      user.preferences.sleep = true;
    });

+    it('calls analytics', () => {
+      cron({user, tasksByType, daysMissed, analytics});
+      expect(analytics.track.callCount).to.equal(1);
+    });
+
    it('clears user buffs', () => {
      user.stats.buffs = {
        str: 1,
@@ -231,7 +300,7 @@ describe('cron', () => {
        startDate: new Date(),
      };

-      let task = new Tasks.daily(Tasks.Task.sanitize(daily)); // eslint-disable-line babel/new-cap
+      let task = new Tasks.daily(Tasks.Task.sanitize(daily)); // eslint-disable-line new-cap
      tasksByType.dailys.push(task);
      tasksByType.dailys[0].completed = true;

@@ -252,7 +321,7 @@ describe('cron', () => {
        value: 0,
      };

-      let task = new Tasks.todo(Tasks.Task.sanitize(todo)); // eslint-disable-line babel/new-cap
+      let task = new Tasks.todo(Tasks.Task.sanitize(todo)); // eslint-disable-line new-cap
      tasksByType.todos.push(task);
    });

@@ -278,7 +347,7 @@ describe('cron', () => {
        type: 'daily',
      };

-      let task = new Tasks.daily(Tasks.Task.sanitize(daily)); // eslint-disable-line babel/new-cap
+      let task = new Tasks.daily(Tasks.Task.sanitize(daily)); // eslint-disable-line new-cap
      tasksByType.dailys = [];
      tasksByType.dailys.push(task);

@@ -380,7 +449,7 @@ describe('cron', () => {
        type: 'habit',
      };

-      let task = new Tasks.habit(Tasks.Task.sanitize(habit)); // eslint-disable-line babel/new-cap
+      let task = new Tasks.habit(Tasks.Task.sanitize(habit)); // eslint-disable-line new-cap
      tasksByType.habits = [];
      tasksByType.habits.push(task);
    });
@@ -421,7 +490,7 @@ describe('cron', () => {
        type: 'daily',
      };

-      let task = new Tasks.daily(Tasks.Task.sanitize(daily)); // eslint-disable-line babel/new-cap
+      let task = new Tasks.daily(Tasks.Task.sanitize(daily)); // eslint-disable-line new-cap
      tasksByType.dailys = [];
      tasksByType.dailys.push(task);

@@ -564,7 +633,7 @@ describe('cron', () => {
        type: 'daily',
      };

-      let task = new Tasks.daily(Tasks.Task.sanitize(daily)); // eslint-disable-line babel/new-cap
+      let task = new Tasks.daily(Tasks.Task.sanitize(daily)); // eslint-disable-line new-cap
      tasksByType.dailys = [];
      tasksByType.dailys.push(task);

@@ -601,9 +670,9 @@ describe('cron', () => {

      cron({user, tasksByType, daysMissed, analytics});

-      expect(user.notifications.length).to.equal(1);
-      expect(user.notifications[0].type).to.equal('CRON');
-      expect(user.notifications[0].data).to.eql({
+      expect(user.notifications.length).to.be.greaterThan(0);
+      expect(user.notifications[1].type).to.equal('CRON');
+      expect(user.notifications[1].data).to.eql({
        hp: user.stats.hp - hpBefore,
        mp: user.stats.mp - mpBefore,
      });
@@ -620,13 +689,14 @@ describe('cron', () => {

      cron({user, tasksByType, daysMissed, analytics});

-      expect(user.notifications.length).to.equal(1);
-      expect(user.notifications[0].type).to.equal('CRON');
-      expect(user.notifications[0].data).to.eql({
+      expect(user.notifications.length).to.be.greaterThan(0);
+      expect(user.notifications[1].type).to.equal('CRON');
+      expect(user.notifications[1].data).to.eql({
        hp: user.stats.hp - hpBefore1,
        mp: user.stats.mp - mpBefore1,
      });

+      let notifsBefore2 = user.notifications.length;
      let hpBefore2 = user.stats.hp;
      let mpBefore2 = user.stats.mp;

@@ -634,12 +704,14 @@ describe('cron', () => {

      cron({user, tasksByType, daysMissed, analytics});

-      expect(user.notifications.length).to.equal(1);
-      expect(user.notifications[0].type).to.equal('CRON');
-      expect(user.notifications[0].data).to.eql({
+      expect(user.notifications.length - notifsBefore2).to.equal(0);
+      expect(user.notifications[0].type).to.not.equal('CRON');
+      expect(user.notifications[1].type).to.equal('CRON');
+      expect(user.notifications[1].data).to.eql({
        hp: user.stats.hp - hpBefore2 - (hpBefore2 - hpBefore1),
        mp: user.stats.mp - mpBefore2 - (mpBefore2 - mpBefore1),
      });
+      expect(user.notifications[0].type).to.not.equal('CRON');
    });
  });

@@ -692,6 +764,188 @@ describe('cron', () => {
      expect(user.inbox.messages[messageId]).to.not.exist;
    });
  });
+
+  describe('login incentives', () => {
+    it('increments incentive counter each cron', () => {
+      cron({user, tasksByType, daysMissed, analytics});
+      expect(user.loginIncentives).to.eql(1);
+      user.lastCron = moment(new Date()).subtract({days: 1});
+      cron({user, tasksByType, daysMissed, analytics});
+      expect(user.loginIncentives).to.eql(2);
+    });
+
+    it('pushes a notification of the day\'s incentive each cron', () => {
+      cron({user, tasksByType, daysMissed, analytics});
+      expect(user.notifications.length).to.be.greaterThan(1);
+      expect(user.notifications[0].type).to.eql('LOGIN_INCENTIVE');
+    });
+
+    it('replaces previous notifications', () => {
+      cron({user, tasksByType, daysMissed, analytics});
+      cron({user, tasksByType, daysMissed, analytics});
+      cron({user, tasksByType, daysMissed, analytics});
+
+      let filteredNotifications = user.notifications.filter(n => n.type === 'LOGIN_INCENTIVE');
+
+      expect(filteredNotifications.length).to.equal(1);
+    });
+
+    it('increments loginIncentives by 1 even if days are skipped in between', () => {
+      daysMissed = 3;
+      cron({user, tasksByType, daysMissed, analytics});
+      expect(user.loginIncentives).to.eql(1);
+    });
+
+    it('increments loginIncentives by 1 even if user has Dailies paused', () => {
+      user.preferences.sleep = true;
+      cron({user, tasksByType, daysMissed, analytics});
+      expect(user.loginIncentives).to.eql(1);
+    });
+
+    it('awards user bard robes if login incentive is 1', () => {
+      cron({user, tasksByType, daysMissed, analytics});
+      expect(user.loginIncentives).to.eql(1);
+      expect(user.items.gear.owned.armor_special_bardRobes).to.eql(true);
+      expect(user.notifications[0].type).to.eql('LOGIN_INCENTIVE');
+    });
+
+    it('awards user incentive backgrounds if login incentive is 2', () => {
+      user.loginIncentives = 1;
+      cron({user, tasksByType, daysMissed, analytics});
+      expect(user.loginIncentives).to.eql(2);
+      expect(user.purchased.background.blue).to.eql(true);
+      expect(user.purchased.background.green).to.eql(true);
+      expect(user.purchased.background.purple).to.eql(true);
+      expect(user.purchased.background.red).to.eql(true);
+      expect(user.purchased.background.yellow).to.eql(true);
+      expect(user.notifications[0].type).to.eql('LOGIN_INCENTIVE');
+    });
+
+    it('awards user Bard Hat if login incentive is 3', () => {
+      user.loginIncentives = 2;
+      cron({user, tasksByType, daysMissed, analytics});
+      expect(user.loginIncentives).to.eql(3);
+      expect(user.items.gear.owned.head_special_bardHat).to.eql(true);
+      expect(user.notifications[0].type).to.eql('LOGIN_INCENTIVE');
+    });
+
+    it('awards user RoyalPurple Hatching Potion if login incentive is 4', () => {
+      user.loginIncentives = 3;
+      cron({user, tasksByType, daysMissed, analytics});
+      expect(user.loginIncentives).to.eql(4);
+      expect(user.items.hatchingPotions.RoyalPurple).to.eql(1);
+      expect(user.notifications[0].type).to.eql('LOGIN_INCENTIVE');
+    });
+
+    it('awards user a Chocolate, Meat and Pink Contton Candy if login incentive is 5', () => {
+      user.loginIncentives = 4;
+      cron({user, tasksByType, daysMissed, analytics});
+      expect(user.loginIncentives).to.eql(5);
+
+      expect(user.items.food.Chocolate).to.eql(1);
+      expect(user.items.food.Meat).to.eql(1);
+      expect(user.items.food.CottonCandyPink).to.eql(1);
+
+      expect(user.notifications[0].type).to.eql('LOGIN_INCENTIVE');
+    });
+
+    it('awards user moon quest if login incentive is 7', () => {
+      user.loginIncentives = 6;
+      cron({user, tasksByType, daysMissed, analytics});
+      expect(user.loginIncentives).to.eql(7);
+      expect(user.items.quests.moon1).to.eql(1);
+      expect(user.notifications[0].type).to.eql('LOGIN_INCENTIVE');
+    });
+
+    it('awards user RoyalPurple Hatching Potion if login incentive is 10', () => {
+      user.loginIncentives = 9;
+      cron({user, tasksByType, daysMissed, analytics});
+      expect(user.loginIncentives).to.eql(10);
+      expect(user.items.hatchingPotions.RoyalPurple).to.eql(1);
+      expect(user.notifications[0].type).to.eql('LOGIN_INCENTIVE');
+    });
+
+    it('awards user a Strawberry, Patato and Blue Contton Candy if login incentive is 14', () => {
+      user.loginIncentives = 13;
+      cron({user, tasksByType, daysMissed, analytics});
+      expect(user.loginIncentives).to.eql(14);
+
+      expect(user.items.food.Strawberry).to.eql(1);
+      expect(user.items.food.Potatoe).to.eql(1);
+      expect(user.items.food.CottonCandyBlue).to.eql(1);
+
+      expect(user.notifications[0].type).to.eql('LOGIN_INCENTIVE');
+    });
+
+    it('awards user a bard instrument if login incentive is 18', () => {
+      user.loginIncentives = 17;
+      cron({user, tasksByType, daysMissed, analytics});
+      expect(user.loginIncentives).to.eql(18);
+      expect(user.items.gear.owned.weapon_special_bardInstrument).to.eql(true);
+      expect(user.notifications[0].type).to.eql('LOGIN_INCENTIVE');
+    });
+
+    it('awards user second moon quest if login incentive is 22', () => {
+      user.loginIncentives = 21;
+      cron({user, tasksByType, daysMissed, analytics});
+      expect(user.loginIncentives).to.eql(22);
+      expect(user.items.quests.moon2).to.eql(1);
+      expect(user.notifications[0].type).to.eql('LOGIN_INCENTIVE');
+    });
+
+    it('awards user a RoyalPurple hatching potion if login incentive is 26', () => {
+      user.loginIncentives = 25;
+      cron({user, tasksByType, daysMissed, analytics});
+      expect(user.loginIncentives).to.eql(26);
+      expect(user.items.hatchingPotions.RoyalPurple).to.eql(1);
+      expect(user.notifications[0].type).to.eql('LOGIN_INCENTIVE');
+    });
+
+    it('awards user Fish, Milk, Rotten Meat and Honey if login incentive is 30', () => {
+      user.loginIncentives = 29;
+      cron({user, tasksByType, daysMissed, analytics});
+      expect(user.loginIncentives).to.eql(30);
+
+      expect(user.items.food.Fish).to.eql(1);
+      expect(user.items.food.Milk).to.eql(1);
+      expect(user.items.food.RottenMeat).to.eql(1);
+      expect(user.items.food.Honey).to.eql(1);
+
+      expect(user.notifications[0].type).to.eql('LOGIN_INCENTIVE');
+    });
+
+    it('awards user a RoyalPurple hatching potion if login incentive is 35', () => {
+      user.loginIncentives = 34;
+      cron({user, tasksByType, daysMissed, analytics});
+      expect(user.loginIncentives).to.eql(35);
+      expect(user.items.hatchingPotions.RoyalPurple).to.eql(1);
+      expect(user.notifications[0].type).to.eql('LOGIN_INCENTIVE');
+    });
+
+    it('awards user the third moon quest if login incentive is 40', () => {
+      user.loginIncentives = 39;
+      cron({user, tasksByType, daysMissed, analytics});
+      expect(user.loginIncentives).to.eql(40);
+      expect(user.items.quests.moon3).to.eql(1);
+      expect(user.notifications[0].type).to.eql('LOGIN_INCENTIVE');
+    });
+
+    it('awards user a RoyalPurple hatching potion if login incentive is 45', () => {
+      user.loginIncentives = 44;
+      cron({user, tasksByType, daysMissed, analytics});
+      expect(user.loginIncentives).to.eql(45);
+      expect(user.items.hatchingPotions.RoyalPurple).to.eql(1);
+      expect(user.notifications[0].type).to.eql('LOGIN_INCENTIVE');
+    });
+
+    it('awards user a saddle if login incentive is 50', () => {
+      user.loginIncentives = 49;
+      cron({user, tasksByType, daysMissed, analytics});
+      expect(user.loginIncentives).to.eql(50);
+      expect(user.items.food.Saddle).to.eql(1);
+      expect(user.notifications[0].type).to.eql('LOGIN_INCENTIVE');
+    });
+  });
 });

 describe('recoverCron', () => {
@@ -53,31 +53,32 @@ describe('emails', () => {
  let pathToEmailLib = '../../../../../website/server/libs/email';

  describe('sendEmail', () => {
-    it('can send an email using the default transport', () => {
-      let sendMailSpy = sandbox.stub().returns(defer().promise);
+    let sendMailSpy;

+    beforeEach(() => {
+      sendMailSpy = sandbox.stub().returns(defer().promise);
      sandbox.stub(nodemailer, 'createTransport').returns({
        sendMail: sendMailSpy,
      });
+    });

+    afterEach(() => {
+      sandbox.restore();
+    });
+
+    it('can send an email using the default transport', () => {
      let attachEmail = requireAgain(pathToEmailLib);
      attachEmail.send();
      expect(sendMailSpy).to.be.calledOnce;
    });

    it('logs errors', (done) => {
-      let deferred = defer();
-      let sendMailSpy = sandbox.stub().returns(deferred.promise);
-
-      sandbox.stub(nodemailer, 'createTransport').returns({
-        sendMail: sendMailSpy,
-      });
      sandbox.stub(logger, 'error');

      let attachEmail = requireAgain(pathToEmailLib);
      attachEmail.send();
      expect(sendMailSpy).to.be.calledOnce;
-      deferred.reject();
+      defer().reject();

      // wait for unhandledRejection event to fire
      setTimeout(() => {
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .3.1