4.6.1

* Removed max height from text section

* Added items to mystery sets

* Group manager fixes

* Fixed promo code apply

.babelrc

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

.bowerrc

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

.ebextensions/deploy.config

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

.gitignore

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

.travis.yml

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

Dockerfile

@@ -1,18 +1,21 @@
-FROM node:boron
-
-# Install global packages
-RUN npm install -g gulp grunt-cli bower mocha
-
-# Clone Habitica repo and install dependencies
-RUN mkdir -p /usr/src/habitrpg
-WORKDIR /usr/src/habitrpg
-RUN git clone https://github.com/HabitRPG/habitica.git /usr/src/habitrpg
-RUN npm install
-RUN bower install --allow-root
-
-# Create Build dir
-RUN mkdir -p ./website/build
-
-# Start Habitica
-EXPOSE 3000
-CMD ["npm", "start"]
+FROM node:boron
+
+# Upgrade NPM to v5 (Yarn is needed because of this bug https://github.com/npm/npm/issues/16807)
+# The used solution is suggested here https://github.com/npm/npm/issues/16807#issuecomment-313591975
+RUN yarn global add npm@5
+# Install global packages
+RUN npm install -g gulp mocha
+
+# Clone Habitica repo and install dependencies
+RUN mkdir -p /usr/src/habitrpg
+WORKDIR /usr/src/habitrpg
+RUN git clone https://github.com/HabitRPG/habitica.git /usr/src/habitrpg
+RUN cp config.json.example config.json
+RUN npm install
+
+# Create Build dir
+RUN mkdir -p ./website/build
+
+# Start Habitica
+EXPOSE 3000
+CMD ["npm", "start"]

Dockerfile-Production

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

Dockerfile-prod

@@ -1,18 +0,0 @@
-FROM node:boron
-
-# Install global packages
-RUN npm install -g gulp grunt-cli bower mocha
-
-# Clone Habitica repo and install dependencies
-RUN mkdir -p /usr/src/habitrpg
-WORKDIR /usr/src/habitrpg
-RUN git clone --branch v3.99.0 https://github.com/HabitRPG/habitica.git /usr/src/habitrpg
-RUN npm install
-RUN bower install --allow-root
-
-# Create Build dir
-RUN mkdir -p ./website/build
-
-# Start Habitica
-EXPOSE 3000
-CMD ["npm", "start"]

Gruntfile.js

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

bower.json

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

config.json.example

@@ -66,7 +66,8 @@
         },
         "mode":"sandbox",
         "client_id":"client_id",
-        "client_secret":"client_secret"
+        "client_secret":"client_secret",
+        "experience_profile_id": ""
     },
     "IAP_GOOGLE_KEYDIR": "/path/to/google/public/key/dir/",
     "LOGGLY_TOKEN": "token",

docker-compose.dev.yml

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

gulp/gulp-apidoc.js

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

gulp/gulp-babelify.js

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

gulp/gulp-build.js

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

gulp/gulp-newstuff.js

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

gulp/gulp-sprites.js

@@ -10,25 +10,24 @@ import {each} from 'lodash';
 
 // https://github.com/Ensighten/grunt-spritesmith/issues/67#issuecomment-34786248
 const MAX_SPRITESHEET_SIZE = 1024 * 1024 * 3;
-const DIST_PATH = 'website/assets/sprites/dist/';
 
-const IMG_DIST_PATH_NEW_CLIENT = 'website/static/sprites/';
-const CSS_DIST_PATH_NEW_CLIENT = 'website/client/assets/css/sprites/';
+const IMG_DIST_PATH = 'website/static/sprites/';
+const CSS_DIST_PATH = 'website/client/assets/css/sprites/';
 
 gulp.task('sprites:compile', ['sprites:clean', 'sprites:main', 'sprites:largeSprites', 'sprites:checkCompiledDimensions']);
 
 gulp.task('sprites:main', () => {
-  let mainSrc = sync('website/assets/sprites/spritesmith/**/*.png');
+  let mainSrc = sync('website/raw_sprites/spritesmith/**/*.png');
   return createSpritesStream('main', mainSrc);
 });
 
 gulp.task('sprites:largeSprites', () => {
-  let largeSrc = sync('website/assets/sprites/spritesmith_large/**/*.png');
+  let largeSrc = sync('website/raw_sprites/spritesmith_large/**/*.png');
   return createSpritesStream('largeSprites', largeSrc);
 });
 
 gulp.task('sprites:clean', (done) => {
-  clean(`{${DIST_PATH}spritesmith*,${IMG_DIST_PATH_NEW_CLIENT}spritesmith*,${CSS_DIST_PATH_NEW_CLIENT}spritesmith*}`, done);
+  clean(`${IMG_DIST_PATH}spritesmith*,${CSS_DIST_PATH}spritesmith*}`, done);
 });
 
 gulp.task('sprites:checkCompiledDimensions', ['sprites:main', 'sprites:largeSprites'], () => {
@@ -36,7 +35,7 @@ gulp.task('sprites:checkCompiledDimensions', ['sprites:main', 'sprites:largeSpri
 
   let numberOfSheetsThatAreTooBig = 0;
 
-  let distSpritesheets = sync(`${DIST_PATH}*.png`);
+  let distSpritesheets = sync(`${IMG_DIST_PATH}*.png`);
 
   each(distSpritesheets, (img, index) => {
     let spriteSize = calculateImgDimensions(img);
@@ -68,18 +67,16 @@ function createSpritesStream (name, src) {
         cssName: `spritesmith-${name}-${index}.css`,
         algorithm: 'binary-tree',
         padding: 1,
-        cssTemplate: 'website/assets/sprites/css/css.template.handlebars',
+        cssTemplate: 'website/raw_sprites/css/css.template.handlebars',
         cssVarMap: cssVarMap,
       }));
 
     let imgStream = spriteData.img
       .pipe(imagemin())
-      .pipe(gulp.dest(IMG_DIST_PATH_NEW_CLIENT))
-      .pipe(gulp.dest(DIST_PATH));
+      .pipe(gulp.dest(IMG_DIST_PATH));
 
     let cssStream = spriteData.css
-      .pipe(gulp.dest(CSS_DIST_PATH_NEW_CLIENT))
-      .pipe(gulp.dest(DIST_PATH));
+      .pipe(gulp.dest(CSS_DIST_PATH));
 
     stream.add(imgStream);
     stream.add(cssStream);

gulp/gulp-start.js

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

gulp/gulp-tests.js

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

gulpfile.js

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

kubernetes/README.md

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

kubernetes/habitica-rc.yaml

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

kubernetes/habitica-service.yaml

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

kubernetes/habitica.yaml

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

kubernetes/mongo-service.yaml

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

kubernetes/mongo.yaml

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

migrations/20170711_orcas.js

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

migrations/20170731_naming_day.js

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

migrations/20170928_redesign_guilds.js

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

migrations/20170928_redesign_launch.js

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

migrations/mystery_items.js

@@ -2,7 +2,7 @@ var _id = '';
 var update = {
   $addToSet: {
     'purchased.plan.mysteryItems':{
-      $each:['body_mystery_201706','back_mystery_201706']
+      $each:['armor_mystery_201710','head_mystery_201710']
     }
   }
 };

migrations/s3-upload.js

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

package.json

@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "3.101.0",
+  "version": "4.6.1",
   "main": "./website/server/index.js",
   "dependencies": {
     "@slack/client": "^3.8.1",
@@ -14,6 +14,7 @@
     "autoprefixer": "^6.4.0",
     "aws-sdk": "^2.0.25",
     "axios": "^0.16.0",
+    "axios-progress-bar": "^0.1.7",
     "babel-core": "^6.0.0",
     "babel-eslint": "^7.2.3",
     "babel-loader": "^6.0.0",
@@ -30,17 +31,17 @@
     "bcrypt": "^1.0.2",
     "bluebird": "^3.3.5",
     "body-parser": "^1.15.0",
-    "bootstrap": "^4.0.0-alpha.6",
-    "bootstrap-vue": "^0.15.8",
-    "bower": "~1.3.12",
+    "bootstrap": "4.0.0-alpha.6",
+    "bootstrap-vue": "1.0.0-beta.7",
     "browserify": "~12.0.1",
     "compression": "^1.6.1",
     "connect-ratelimit": "0.0.7",
     "cookie-session": "^1.2.0",
     "coupon-code": "^0.4.5",
+    "cross-env": "^4.0.0",
     "css-loader": "^0.28.0",
     "csv-stringify": "^1.0.2",
-    "cwait": "^1.0.0",
+    "cwait": "~1.0.1",
     "domain-middleware": "~0.1.0",
     "estraverse": "^4.1.1",
     "express": "~4.14.0",
@@ -51,18 +52,8 @@
     "file-loader": "^0.10.0",
     "glob": "^4.3.5",
     "got": "^6.1.1",
-    "grunt": "~0.4.1",
-    "grunt-cli": "~0.1.9",
-    "grunt-contrib-clean": "~0.6.0",
-    "grunt-contrib-copy": "~0.6.0",
-    "grunt-contrib-cssmin": "~0.10.0",
-    "grunt-contrib-stylus": "~0.20.0",
-    "grunt-contrib-uglify": "~0.6.0",
-    "grunt-contrib-watch": "~0.6.1",
-    "grunt-hashres": "habitrpg/grunt-hashres#v0.4.2",
     "gulp": "^3.9.0",
     "gulp-babel": "^6.1.2",
-    "gulp-grunt": "^0.5.2",
     "gulp-imagemin": "^2.4.0",
     "gulp-nodemon": "^2.0.4",
     "gulp-sourcemaps": "^1.6.0",
@@ -73,15 +64,16 @@
     "html-webpack-plugin": "^2.8.1",
     "image-size": "~0.3.2",
     "in-app-purchase": "^1.1.6",
+    "intro.js": "^2.6.0",
     "jade": "~1.11.0",
-    "jquery": "^3.1.1",
+    "jquery": ">=3.0.0",
     "js2xmlparser": "~1.0.0",
     "lodash": "^4.17.4",
     "merge-stream": "^1.0.0",
     "method-override": "^2.3.5",
     "moment": "^2.13.0",
-    "moment-recur": "habitrpg/moment-recur#v1.0.6",
-    "mongoose": "^4.8.6",
+    "moment-recur": "git://github.com/habitrpg/moment-recur#f147ef27bbc26ca67638385f3db4a44084c76626",
+    "mongoose": "~4.8.6",
     "mongoose-id-autoinc": "~2013.7.14-4",
     "morgan": "^1.7.0",
     "nconf": "~0.8.2",
@@ -97,11 +89,12 @@
     "passport-google-oauth20": "1.0.0",
     "paypal-ipn": "3.0.0",
     "paypal-rest-sdk": "^1.2.1",
+    "popper.js": "^1.11.0",
     "postcss-easy-import": "^2.0.0",
     "pretty-data": "^0.40.0",
     "ps-tree": "^1.0.0",
     "pug": "^2.0.0-beta.12",
-    "push-notify": "habitrpg/push-notify#v1.2.0",
+    "push-notify": "git://github.com/habitrpg/push-notify#6bc2b5fdb1bdc9649b9ec1964d79ca50187fc8a9",
     "pusher": "^1.3.0",
     "request": "~2.74.0",
     "rimraf": "^2.4.3",
@@ -110,6 +103,7 @@
     "sass-loader": "^6.0.2",
     "serve-favicon": "^2.3.0",
     "shelljs": "^0.7.6",
+    "sortablejs": "^1.6.1",
     "stripe": "^4.2.0",
     "superagent": "^3.4.3",
     "svg-inline-loader": "^0.7.1",
@@ -128,6 +122,7 @@
     "vue-router": "^2.0.0-rc.5",
     "vue-style-loader": "^3.0.0",
     "vue-template-compiler": "^2.1.10",
+    "vuejs-datepicker": "git://github.com/habitrpg/vuejs-datepicker#45e607a7bccf4e3e089761b3b7b33e3f2c5dc21f",
     "webpack": "^2.2.1",
     "webpack-merge": "^4.0.0",
     "winston": "^2.1.0",
@@ -137,7 +132,7 @@
   "private": true,
   "engines": {
     "node": "^6.9.1",
-    "npm": "^4.0.2"
+    "npm": "^5.0.0"
   },
   "scripts": {
     "lint": "eslint --ext .js,.vue .",
@@ -150,22 +145,17 @@
     "test:sanity": "istanbul cover --dir coverage/sanity --report lcovonly node_modules/mocha/bin/_mocha -- test/sanity --recursive",
     "test:common": "istanbul cover --dir coverage/common --report lcovonly node_modules/mocha/bin/_mocha -- test/common --recursive",
     "test:content": "istanbul cover --dir coverage/content --report lcovonly node_modules/mocha/bin/_mocha -- test/content --recursive",
-    "test:karma": "karma start test/client-old/spec/karma.conf.js --single-run",
-    "test:karma:watch": "karma start test/client-old/spec/karma.conf.js",
-    "test:prepare:webdriver": "webdriver-manager update",
-    "test:e2e:webdriver": "webdriver-manager start",
-    "test:e2e": "protractor test/client-old/e2e/protractor.conf.js",
     "test:nodemon": "gulp test:nodemon",
     "coverage": "COVERAGE=true mocha --require register-handlers.js --reporter html-cov > coverage.html; open coverage.html",
     "sprites": "gulp sprites:compile",
     "client:dev": "gulp bootstrap && node webpack/dev-server.js",
-    "client:build": "gulp bootstrap && node webpack/build.js",
+    "client:build": "gulp build:client",
     "client:unit": "cross-env NODE_ENV=test karma start test/client/unit/karma.conf.js --single-run",
     "client:unit:watch": "cross-env NODE_ENV=test karma start test/client/unit/karma.conf.js",
     "client:e2e": "node test/client/e2e/runner.js",
     "client:test": "npm run client:unit && npm run client:e2e",
-    "start": "gulp run:dev",
-    "postinstall": "bower --config.interactive=false install -f && gulp build && npm run client:build",
+    "start": "gulp nodemon",
+    "postinstall": "gulp build",
     "apidoc": "gulp apidoc"
   },
   "devDependencies": {
@@ -176,7 +166,6 @@
     "chromedriver": "^2.27.2",
     "connect-history-api-fallback": "^1.1.0",
     "coveralls": "^2.11.2",
-    "cross-env": "^4.0.0",
     "cross-spawn": "^5.0.1",
     "csv": "~0.3.6",
     "deep-diff": "~0.1.4",
@@ -189,7 +178,6 @@
     "event-stream": "^3.2.2",
     "eventsource-polyfill": "^0.9.6",
     "expect.js": "~0.2.0",
-    "grunt-karma": "~0.12.1",
     "http-proxy-middleware": "^0.17.0",
     "inject-loader": "^3.0.0-beta4",
     "istanbul": "^1.1.0-alpha.1",

scripts/paypalBillingSetup.js

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

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

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

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

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

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

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

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

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

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

@@ -114,6 +114,26 @@ describe('POST /challenges/:challengeId/winner/:winnerId', () => {
       await expect(winningUser.sync()).to.eventually.have.property('balance', oldBalance + challenge.prize / 4);
     });
 
+    it('doesn\'t gives winner gems if group policy prevents it', async () => {
+      let oldBalance = winningUser.balance;
+      let oldLeaderBalance = (await groupLeader.sync()).balance;
+
+      await winningUser.update({
+        'purchased.plan.customerId': 'group-plan',
+      });
+      await group.update({
+        'leaderOnly.getGems': true,
+        'purchased.plan.customerId': 123,
+      });
+
+      await groupLeader.post(`/challenges/${challenge._id}/selectWinner/${winningUser._id}`);
+
+      await sleep(0.5);
+
+      await expect(winningUser.sync()).to.eventually.have.property('balance', oldBalance);
+      await expect(groupLeader.sync()).to.eventually.have.property('balance', oldLeaderBalance + challenge.prize / 4);
+    });
+
     it('doesn\'t refund gems to group leader', async () => {
       let oldBalance = (await groupLeader.sync()).balance;
 

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

@@ -10,11 +10,22 @@ import {
   TAVERN_ID,
 } from '../../../../../website/server/models/group';
 import { v4 as generateUUID } from 'uuid';
+import { getMatchesByWordArray, removePunctuationFromString } from '../../../../../website/server/libs/stringUtils';
+import bannedWords from '../../../../../website/server/libs/bannedWords';
+import * as email from '../../../../../website/server/libs/email';
+import { IncomingWebhook } from '@slack/client';
+import nconf from 'nconf';
+
+const BASE_URL = nconf.get('BASE_URL');
 
 describe('POST /chat', () => {
   let user, groupWithChat, member, additionalMember;
   let testMessage = 'Test Message';
   let testBannedWordMessage = 'TEST_PLACEHOLDER_SWEAR_WORD_HERE';
+  let testSlurMessage = 'message with TEST_PLACEHOLDER_SLUR_WORD_HERE';
+  let bannedWordErrorMessage = t('bannedWordUsed').split('.');
+  bannedWordErrorMessage[0] += ` (${removePunctuationFromString(testBannedWordMessage.toLowerCase())})`;
+  bannedWordErrorMessage = bannedWordErrorMessage.join('.');
 
   before(async () => {
     let { group, groupLeader, members } = await createAndPopulateGroup({
@@ -25,7 +36,6 @@ describe('POST /chat', () => {
       },
       members: 2,
     });
-
     user = groupLeader;
     groupWithChat = group;
     member = members[0];
@@ -79,11 +89,11 @@ describe('POST /chat', () => {
   context('banned word', () => {
     it('returns an error when chat message contains a banned word in tavern', async () => {
       await expect(user.post('/groups/habitrpg/chat', { message: testBannedWordMessage}))
-      .to.eventually.be.rejected.and.eql({
-        code: 400,
-        error: 'BadRequest',
-        message: t('bannedWordUsed'),
-      });
+        .to.eventually.be.rejected.and.eql({
+          code: 400,
+          error: 'BadRequest',
+          message: bannedWordErrorMessage,
+        });
     });
 
     it('errors when word is part of a phrase', async () => {
@@ -92,7 +102,7 @@ describe('POST /chat', () => {
       .to.eventually.be.rejected.and.eql({
         code: 400,
         error: 'BadRequest',
-        message: t('bannedWordUsed'),
+        message: bannedWordErrorMessage,
       });
     });
 
@@ -102,10 +112,26 @@ describe('POST /chat', () => {
       .to.eventually.be.rejected.and.eql({
         code: 400,
         error: 'BadRequest',
-        message: t('bannedWordUsed'),
+        message: bannedWordErrorMessage,
       });
     });
 
+    it('checks error message has the banned words used', async () => {
+      let randIndex = Math.floor(Math.random() * (bannedWords.length + 1));
+      let testBannedWords = bannedWords.slice(randIndex, randIndex + 2).map((w) => w.replace(/\\/g, ''));
+      let chatMessage = `Mixing ${testBannedWords[0]} and ${testBannedWords[1]} is bad for you.`;
+      await expect(user.post('/groups/habitrpg/chat', { message: chatMessage}))
+        .to.eventually.be.rejected
+        .and.have.property('message')
+        .that.includes(testBannedWords.join(', '));
+    });
+
+    it('check all banned words are matched', async () => {
+      let message = bannedWords.join(',').replace(/\\/g, '');
+      let matches = getMatchesByWordArray(message, bannedWords);
+      expect(matches.length).to.equal(bannedWords.length);
+    });
+
     it('does not error when bad word is suffix of a word', async () => {
       let wordAsSuffix = `prefix${testBannedWordMessage}`;
       let message = await user.post('/groups/habitrpg/chat', { message: wordAsSuffix});
@@ -166,6 +192,114 @@ describe('POST /chat', () => {
     });
   });
 
+  context('banned slur', () => {
+    beforeEach(() => {
+      sandbox.spy(email, 'sendTxn');
+      sandbox.stub(IncomingWebhook.prototype, 'send');
+    });
+
+    afterEach(() => {
+      sandbox.restore();
+    });
+
+    it('errors and revokes privileges when chat message contains a banned slur', async () => {
+      await expect(user.post(`/groups/${groupWithChat._id}/chat`, { message: testSlurMessage})).to.eventually.be.rejected.and.eql({
+        code: 400,
+        error: 'BadRequest',
+        message: t('bannedSlurUsed'),
+      });
+
+      // Email sent to mods
+      await sleep(0.5);
+      expect(email.sendTxn).to.be.calledOnce;
+      expect(email.sendTxn.args[0][1]).to.be.eql('slur-report-to-mods');
+
+      // Slack message to mods
+      expect(IncomingWebhook.prototype.send).to.be.calledOnce;
+      /* eslint-disable camelcase */
+      expect(IncomingWebhook.prototype.send).to.be.calledWith({
+        text: `${user.profile.name} (${user.id}) tried to post a slur`,
+        attachments: [{
+          fallback: 'Slur Message',
+          color: 'danger',
+          author_name: `${user.profile.name} - ${user.auth.local.email} - ${user._id}`,
+          title: 'Slur in Test Guild',
+          title_link: `${BASE_URL}/groups/guild/${groupWithChat.id}`,
+          text: testSlurMessage,
+          // footer: sandbox.match(/<.*?groupId=group-id&chatId=chat-id\|Flag this message>/),
+          mrkdwn_in: [
+            'text',
+          ],
+        }],
+      });
+      /* eslint-enable camelcase */
+
+      // Chat privileges are revoked
+      await expect(user.post(`/groups/${groupWithChat._id}/chat`, { message: testMessage})).to.eventually.be.rejected.and.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('chatPrivilegesRevoked'),
+      });
+
+      // Restore chat privileges to continue testing
+      user.flags.chatRevoked = false;
+      await user.update({'flags.chatRevoked': false});
+    });
+
+    it('does not allow slurs in private groups', async () => {
+      let { group, members } = await createAndPopulateGroup({
+        groupDetails: {
+          name: 'Party',
+          type: 'party',
+          privacy: 'private',
+        },
+        members: 1,
+      });
+
+      await expect(members[0].post(`/groups/${group._id}/chat`, { message: testSlurMessage})).to.eventually.be.rejected.and.eql({
+        code: 400,
+        error: 'BadRequest',
+        message: t('bannedSlurUsed'),
+      });
+
+      // Email sent to mods
+      await sleep(0.5);
+      expect(email.sendTxn).to.be.calledThrice;
+      expect(email.sendTxn.args[2][1]).to.be.eql('slur-report-to-mods');
+
+      // Slack message to mods
+      expect(IncomingWebhook.prototype.send).to.be.calledOnce;
+      /* eslint-disable camelcase */
+      expect(IncomingWebhook.prototype.send).to.be.calledWith({
+        text: `${members[0].profile.name} (${members[0].id}) tried to post a slur`,
+        attachments: [{
+          fallback: 'Slur Message',
+          color: 'danger',
+          author_name: `${members[0].profile.name} - ${members[0].auth.local.email} - ${members[0]._id}`,
+          title: 'Slur in Party - (private party)',
+          title_link: undefined,
+          text: testSlurMessage,
+          // footer: sandbox.match(/<.*?groupId=group-id&chatId=chat-id\|Flag this message>/),
+          mrkdwn_in: [
+            'text',
+          ],
+        }],
+      });
+      /* eslint-enable camelcase */
+
+      // Chat privileges are revoked
+      await expect(members[0].post(`/groups/${groupWithChat._id}/chat`, { message: testMessage})).to.eventually.be.rejected.and.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('chatPrivilegesRevoked'),
+      });
+
+      // Restore chat privileges to continue testing
+      members[0].flags.chatRevoked = false;
+      await members[0].update({'flags.chatRevoked': false});
+    });
+  });
+
   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: {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -177,13 +177,13 @@ describe('POST /groups/:groupId/removeMember/:memberId', () => {
     });
 
     it('can remove other invites', async () => {
-      expect(partyInvitedUser.invitations.party).to.not.be.empty;
+      expect(partyInvitedUser.invitations.parties[0]).to.not.be.empty;
 
       await partyLeader.post(`/groups/${party._id}/removeMember/${partyInvitedUser._id}`);
 
       let invitedUserWithoutInvite = await partyInvitedUser.get('/user');
 
-      expect(invitedUserWithoutInvite.invitations.party).to.be.empty;
+      expect(invitedUserWithoutInvite.invitations.parties[0]).to.be.empty;
     });
 
     it('removes new messages from a member who is removed', async () => {

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

@@ -440,7 +440,38 @@ describe('Post /groups/:groupId/invite', () => {
       await inviter.post(`/groups/${party._id}/invite`, {
         uuids: [userToInvite._id],
       });
-      expect((await userToInvite.get('/user')).invitations.party.id).to.equal(party._id);
+      expect((await userToInvite.get('/user')).invitations.parties[0].id).to.equal(party._id);
+    });
+
+    it('allow inviting a user to 2 different parties', async () => {
+      // Create another inviter
+      let inviter2 = await generateUser();
+
+      // Create user to invite
+      let userToInvite = await generateUser();
+
+      // Create second group
+      let party2 = await inviter2.post('/groups', {
+        name: 'Test Party 2',
+        type: 'party',
+      });
+
+      // Invite to first party
+      await inviter.post(`/groups/${party._id}/invite`, {
+        uuids: [userToInvite._id],
+      });
+
+      // Invite to second party
+      await inviter2.post(`/groups/${party2._id}/invite`, {
+        uuids: [userToInvite._id],
+      });
+
+      // Get updated user
+      let invitedUser = await userToInvite.get('/user');
+
+      expect(invitedUser.invitations.parties.length).to.equal(2);
+      expect(invitedUser.invitations.parties[0].id).to.equal(party._id);
+      expect(invitedUser.invitations.parties[1].id).to.equal(party2._id);
     });
 
     it('allow inviting a user if party id is not associated with a real party', async () => {
@@ -451,7 +482,7 @@ describe('Post /groups/:groupId/invite', () => {
       await inviter.post(`/groups/${party._id}/invite`, {
         uuids: [userToInvite._id],
       });
-      expect((await userToInvite.get('/user')).invitations.party.id).to.equal(party._id);
+      expect((await userToInvite.get('/user')).invitations.parties[0].id).to.equal(party._id);
     });
 
     it('allows 30 members in a party', async () => {

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

@@ -45,6 +45,20 @@ describe('PUT /group', () => {
     expect(updatedGroup.name).to.equal(groupUpdatedName);
   });
 
+  it('updates a group categories', async () => {
+    let categories = [{
+      slug: 'newCat',
+      name: 'New Category',
+    }];
+
+    let updatedGroup = await leader.put(`/groups/${groupToUpdate._id}`, {
+      categories,
+    });
+
+    expect(updatedGroup.categories[0].slug).to.eql(categories[0].slug);
+    expect(updatedGroup.categories[0].name).to.eql(categories[0].name);
+  });
+
   it('allows an admin to update a guild', async () => {
     let updatedGroup = await adminUser.put(`/groups/${groupToUpdate._id}`, {
       name: groupUpdatedName,

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

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

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

@@ -13,7 +13,7 @@ describe('GET /tasks/user', () => {
   it('returns all user\'s tasks', async () => {
     let createdTasks = await user.post('/tasks/user', [{text: 'test habit', type: 'habit'}, {text: 'test todo', type: 'todo'}]);
     let tasks = await user.get('/tasks/user');
-    expect(tasks.length).to.equal(createdTasks.length + 1); // + 1 because 1 is a default task
+    expect(tasks.length).to.equal(createdTasks.length + 1); // Plus one for generated todo
   });
 
   it('returns only a type of user\'s tasks if req.query.type is specified', async () => {
@@ -130,7 +130,8 @@ describe('GET /tasks/user', () => {
   });
 
   it('returns dailies with isDue for the date specified', async () => {
-    let startDate = moment().subtract('1', 'days').toDate();
+    // @TODO Add required format
+    let startDate = moment().subtract('1', 'days').toISOString();
     let createdTasks = await user.post('/tasks/user', [
       {
         text: 'test daily',
@@ -150,4 +151,83 @@ describe('GET /tasks/user', () => {
     expect(dailys2[0]._id).to.equal(createdTasks._id);
     expect(dailys2[0].isDue).to.be.true;
   });
+
+  xit('returns dailies with isDue for the date specified and will add CDS offset if time is not supplied and assumes timezones', async () => {
+    let timezone = 420;
+    await user.update({
+      'preferences.dayStart': 0,
+      'preferences.timezoneOffset': timezone,
+    });
+    let startDate = moment().zone(timezone).subtract('4', 'days').startOf('day').toISOString();
+    await user.post('/tasks/user', [
+      {
+        text: 'test daily',
+        type: 'daily',
+        startDate,
+        frequency: 'daily',
+        everyX: 2,
+      },
+    ]);
+
+    let today = moment().format('YYYY-MM-DD');
+    let dailys = await user.get(`/tasks/user?type=dailys&dueDate=${today}`);
+    expect(dailys[0].isDue).to.be.true;
+
+    let yesterday = moment().subtract('1', 'days').format('YYYY-MM-DD');
+    let dailys2 = await user.get(`/tasks/user?type=dailys&dueDate=${yesterday}`);
+    expect(dailys2[0].isDue).to.be.false;
+  });
+
+
+  xit('returns dailies with isDue for the date specified and will add CDS offset if time is not supplied and assumes timezones', async () => {
+    let timezone = 240;
+    await user.update({
+      'preferences.dayStart': 0,
+      'preferences.timezoneOffset': timezone,
+    });
+    let startDate = moment().zone(timezone).subtract('4', 'days').startOf('day').toISOString();
+    await user.post('/tasks/user', [
+      {
+        text: 'test daily',
+        type: 'daily',
+        startDate,
+        frequency: 'daily',
+        everyX: 2,
+      },
+    ]);
+
+    let today = moment().format('YYYY-MM-DD');
+    let dailys = await user.get(`/tasks/user?type=dailys&dueDate=${today}`);
+    expect(dailys[0].isDue).to.be.true;
+
+    let yesterday = moment().subtract('1', 'days').format('YYYY-MM-DD');
+    let dailys2 = await user.get(`/tasks/user?type=dailys&dueDate=${yesterday}`);
+    expect(dailys2[0].isDue).to.be.false;
+  });
+
+  xit('returns dailies with isDue for the date specified and will add CDS offset if time is not supplied and assumes timezones', async () => {
+    let timezone = 540;
+    await user.update({
+      'preferences.dayStart': 0,
+      'preferences.timezoneOffset': timezone,
+    });
+    let startDate = moment().zone(timezone).subtract('4', 'days').startOf('day').toISOString();
+    await user.post('/tasks/user', [
+      {
+        text: 'test daily',
+        type: 'daily',
+        startDate,
+        frequency: 'daily',
+        everyX: 2,
+      },
+    ]);
+
+    let today = moment().format('YYYY-MM-DD');
+    let dailys = await user.get(`/tasks/user?type=dailys&dueDate=${today}`);
+    expect(dailys[0].isDue).to.be.true;
+
+    let yesterday = moment().subtract('1', 'days').format('YYYY-MM-DD');
+    let dailys2 = await user.get(`/tasks/user?type=dailys&dueDate=${yesterday}`);
+    expect(dailys2[0].isDue).to.be.false;
+  });
 });

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

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

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

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

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

@@ -131,7 +131,7 @@ describe('POST /tasks/user', () => {
       expect(task.updatedAt).not.to.equal('tomorrow');
       expect(task.challenge).not.to.equal('no');
       expect(task.completed).to.equal(false);
-      expect(task.streak).not.to.equal('never');
+      expect(task.dateCompleted).not.to.equal('never');
       expect(task.value).not.to.equal(324);
       expect(task.yesterDaily).to.equal(true);
     });

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

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

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

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

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

@@ -1,67 +0,0 @@
-/* eslint-disable camelcase */
-
-import {
-  generateUser,
-  translate as t,
-} from '../../../../helpers/api-integration/v3';
-import shared from '../../../../../website/common/script';
-
-let content = shared.content;
-
-describe('POST /user/buy/:key', () => {
-  let user;
-
-  beforeEach(async () => {
-    user = await generateUser({
-      'stats.gp': 400,
-    });
-  });
-
-  // More tests in common code unit tests
-
-  it('returns an error if the item is not found', async () => {
-    await expect(user.post('/user/buy/notExisting'))
-      .to.eventually.be.rejected.and.eql({
-        code: 404,
-        error: 'NotFound',
-        message: t('itemNotFound', {key: 'notExisting'}),
-      });
-  });
-
-  it('buys a potion', async () => {
-    await user.update({
-      'stats.gp': 400,
-      'stats.hp': 40,
-    });
-
-    let potion = content.potion;
-    let res = await user.post('/user/buy/potion');
-    await user.sync();
-
-    expect(user.stats.hp).to.equal(50);
-    expect(res.data).to.eql(user.stats);
-    expect(res.message).to.equal(t('messageBought', {itemText: potion.text()}));
-  });
-
-  it('returns an error if user tries to buy a potion with full health', async () => {
-    await user.update({
-      'stats.gp': 40,
-      'stats.hp': 50,
-    });
-
-    await expect(user.post('/user/buy/potion'))
-      .to.eventually.be.rejected.and.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('messageHealthAlreadyMax'),
-      });
-  });
-  it('buys a piece of gear', async () => {
-    let key = 'armor_warrior_1';
-
-    await user.post(`/user/buy/${key}`);
-    await user.sync();
-
-    expect(user.items.gear.owned.armor_warrior_1).to.eql(true);
-  });
-});

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

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

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

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

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

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

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

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

test/api/v3/integration/user/auth/GET-auth_reset-password-set-new-one.js

@@ -10,43 +10,31 @@ import nconf from 'nconf';
 
 const API_TEST_SERVER_PORT = nconf.get('PORT');
 
-describe('GET /user/auth/local/reset-password-set-new-one', () => {
+// @TODO skipped because on travis the client isn't available and the redirect fails
+xdescribe('GET /user/auth/local/reset-password-set-new-one', () => {
   let endpoint = `http://localhost:${API_TEST_SERVER_PORT}/static/user/auth/local/reset-password-set-new-one`;
 
   // Tests to validate the validatePasswordResetCodeAndFindUser function
 
   it('renders an error page if the code is missing', async () => {
-    try {
-      await superagent.get(endpoint);
-      throw new Error('Request should fail.');
-    } catch (err) {
-      expect(err.status).to.equal(401);
-    }
+    const res = await superagent.get(endpoint);
+    expect(res.req.path.indexOf('hasError=true') !== -1).to.equal(true);
   });
 
   it('renders an error page if the code is invalid json', async () => {
-    try {
-      await superagent.get(`${endpoint}?code=invalid`);
-      throw new Error('Request should fail.');
-    } catch (err) {
-      expect(err.status).to.equal(401);
-    }
+    const res = await superagent.get(`${endpoint}?code=invalid`);
+    expect(res.req.path.indexOf('hasError=true') !== -1).to.equal(true);
   });
 
   it('renders an error page if the code cannot be decrypted', async () => {
     let user = await generateUser();
 
-    try {
-      let code = JSON.stringify({ // not encrypted
-        userId: user._id,
-        expiresAt: new Date(),
-      });
-      await superagent.get(`${endpoint}?code=${code}`);
-
-      throw new Error('Request should fail.');
-    } catch (err) {
-      expect(err.status).to.equal(401);
-    }
+    let code = JSON.stringify({ // not encrypted
+      userId: user._id,
+      expiresAt: new Date(),
+    });
+    const res = await superagent.get(`${endpoint}?code=${code}`);
+    expect(res.req.path.indexOf('hasError=true') !== -1).to.equal(true);
   });
 
   it('renders an error page if the code is expired', async () => {
@@ -60,12 +48,8 @@ describe('GET /user/auth/local/reset-password-set-new-one', () => {
       'auth.local.passwordResetCode': code,
     });
 
-    try {
-      await superagent.get(`${endpoint}?code=${code}`);
-      throw new Error('Request should fail.');
-    } catch (err) {
-      expect(err.status).to.equal(401);
-    }
+    const res = await superagent.get(`${endpoint}?code=${code}`);
+    expect(res.req.path.indexOf('hasError=true') !== -1).to.equal(true);
   });
 
   it('renders an error page if the user does not exist', async () => {
@@ -74,12 +58,8 @@ describe('GET /user/auth/local/reset-password-set-new-one', () => {
       expiresAt: moment().add({days: 1}),
     }));
 
-    try {
-      await superagent.get(`${endpoint}?code=${code}`);
-      throw new Error('Request should fail.');
-    } catch (err) {
-      expect(err.status).to.equal(401);
-    }
+    const res = await superagent.get(`${endpoint}?code=${code}`);
+    expect(res.req.path.indexOf('hasError=true') !== -1).to.equal(true);
   });
 
   it('renders an error page if the user has no local auth', async () => {
@@ -93,12 +73,8 @@ describe('GET /user/auth/local/reset-password-set-new-one', () => {
       auth: 'not an object with valid fields',
     });
 
-    try {
-      await superagent.get(`${endpoint}?code=${code}`);
-      throw new Error('Request should fail.');
-    } catch (err) {
-      expect(err.status).to.equal(401);
-    }
+    const res = await superagent.get(`${endpoint}?code=${code}`);
+    expect(res.req.path.indexOf('hasError=true') !== -1).to.equal(true);
   });
 
   it('renders an error page if the code doesn\'t match the one saved at user.auth.passwordResetCode', async () => {
@@ -112,12 +88,8 @@ describe('GET /user/auth/local/reset-password-set-new-one', () => {
       'auth.local.passwordResetCode': 'invalid',
     });
 
-    try {
-      await superagent.get(`${endpoint}?code=${code}`);
-      throw new Error('Request should fail.');
-    } catch (err) {
-      expect(err.status).to.equal(401);
-    }
+    const res = await superagent.get(`${endpoint}?code=${code}`);
+    expect(res.req.path.indexOf('hasError=true') !== -1).to.equal(true);
   });
 
   //
@@ -134,7 +106,8 @@ describe('GET /user/auth/local/reset-password-set-new-one', () => {
     });
 
     let res = await superagent.get(`${endpoint}?code=${code}`);
-    expect(res.status).to.equal(200);
+    expect(res.req.path.indexOf('hasError=false') !== -1).to.equal(true);
+    expect(res.req.path.indexOf('code=') !== -1).to.equal(true);
   });
 });
 

test/api/v3/integration/user/auth/POST-auth_reset-password-set-new-one.js

@@ -10,49 +10,46 @@ import {
 import moment from 'moment';
 import {
   generateUser,
+  requester,
+  translate as t,
 } from '../../../../../helpers/api-integration/v3';
-import superagent from 'superagent';
-import nconf from 'nconf';
 
-const API_TEST_SERVER_PORT = nconf.get('PORT');
-
-describe('POST /user/auth/local/reset-password-set-new-one', () => {
-  let endpoint = `http://localhost:${API_TEST_SERVER_PORT}/static/user/auth/local/reset-password-set-new-one`;
+describe('POST /user/auth/reset-password-set-new-one', () => {
+  const endpoint = '/user/auth/reset-password-set-new-one';
+  const api = requester();
 
   // Tests to validate the validatePasswordResetCodeAndFindUser function
-
   it('renders an error page if the code is missing', async () => {
-    try {
-      await superagent.post(endpoint);
-      throw new Error('Request should fail.');
-    } catch (err) {
-      expect(err.status).to.equal(401);
-    }
+    await expect(api.post(endpoint)).to.eventually.be.rejected.and.eql({
+      code: 401,
+      error: 'NotAuthorized',
+      message: t('invalidPasswordResetCode'),
+    });
   });
 
   it('renders an error page if the code is invalid json', async () => {
-    try {
-      await superagent.post(`${endpoint}?code=invalid`);
-      throw new Error('Request should fail.');
-    } catch (err) {
-      expect(err.status).to.equal(401);
-    }
+    await expect(api.post(`${endpoint}?code=invalid`)).to.eventually.be.rejected.and.eql({
+      code: 401,
+      error: 'NotAuthorized',
+      message: t('invalidPasswordResetCode'),
+    });
   });
 
   it('renders an error page if the code cannot be decrypted', async () => {
     let user = await generateUser();
 
-    try {
-      let code = JSON.stringify({ // not encrypted
-        userId: user._id,
-        expiresAt: new Date(),
-      });
-      await superagent.post(`${endpoint}?code=${code}`);
+    let code = JSON.stringify({ // not encrypted
+      userId: user._id,
+      expiresAt: new Date(),
+    });
 
-      throw new Error('Request should fail.');
-    } catch (err) {
-      expect(err.status).to.equal(401);
-    }
+    await expect(api.post(`${endpoint}`, {
+      code,
+    })).to.eventually.be.rejected.and.eql({
+      code: 401,
+      error: 'NotAuthorized',
+      message: t('invalidPasswordResetCode'),
+    });
   });
 
   it('renders an error page if the code is expired', async () => {
@@ -66,12 +63,13 @@ describe('POST /user/auth/local/reset-password-set-new-one', () => {
       'auth.local.passwordResetCode': code,
     });
 
-    try {
-      await superagent.post(`${endpoint}?code=${code}`);
-      throw new Error('Request should fail.');
-    } catch (err) {
-      expect(err.status).to.equal(401);
-    }
+    await expect(api.post(`${endpoint}`, {
+      code,
+    })).to.eventually.be.rejected.and.eql({
+      code: 401,
+      error: 'NotAuthorized',
+      message: t('invalidPasswordResetCode'),
+    });
   });
 
   it('renders an error page if the user does not exist', async () => {
@@ -80,12 +78,13 @@ describe('POST /user/auth/local/reset-password-set-new-one', () => {
       expiresAt: moment().add({days: 1}),
     }));
 
-    try {
-      await superagent.post(`${endpoint}?code=${code}`);
-      throw new Error('Request should fail.');
-    } catch (err) {
-      expect(err.status).to.equal(401);
-    }
+    await expect(api.post(`${endpoint}`, {
+      code,
+    })).to.eventually.be.rejected.and.eql({
+      code: 401,
+      error: 'NotAuthorized',
+      message: t('invalidPasswordResetCode'),
+    });
   });
 
   it('renders an error page if the user has no local auth', async () => {
@@ -99,12 +98,13 @@ describe('POST /user/auth/local/reset-password-set-new-one', () => {
       auth: 'not an object with valid fields',
     });
 
-    try {
-      await superagent.post(`${endpoint}?code=${code}`);
-      throw new Error('Request should fail.');
-    } catch (err) {
-      expect(err.status).to.equal(401);
-    }
+    await expect(api.post(`${endpoint}`, {
+      code,
+    })).to.eventually.be.rejected.and.eql({
+      code: 401,
+      error: 'NotAuthorized',
+      message: t('invalidPasswordResetCode'),
+    });
   });
 
   it('renders an error page if the code doesn\'t match the one saved at user.auth.passwordResetCode', async () => {
@@ -118,12 +118,13 @@ describe('POST /user/auth/local/reset-password-set-new-one', () => {
       'auth.local.passwordResetCode': 'invalid',
     });
 
-    try {
-      await superagent.post(`${endpoint}?code=${code}`);
-      throw new Error('Request should fail.');
-    } catch (err) {
-      expect(err.status).to.equal(401);
-    }
+    await expect(api.post(`${endpoint}`, {
+      code,
+    })).to.eventually.be.rejected.and.eql({
+      code: 401,
+      error: 'NotAuthorized',
+      message: t('invalidPasswordResetCode'),
+    });
   });
 
   //
@@ -139,12 +140,13 @@ describe('POST /user/auth/local/reset-password-set-new-one', () => {
       'auth.local.passwordResetCode': code,
     });
 
-    try {
-      await superagent.post(`${endpoint}?code=${code}`);
-      throw new Error('Request should fail.');
-    } catch (err) {
-      expect(err.status).to.equal(401);
-    }
+    await expect(api.post(`${endpoint}`, {
+      code,
+    })).to.eventually.be.rejected.and.eql({
+      code: 400,
+      error: 'BadRequest',
+      message: t('invalidReqParams'),
+    });
   });
 
   it('renders the error page if the password confirmation is missing', async () => {
@@ -158,14 +160,14 @@ describe('POST /user/auth/local/reset-password-set-new-one', () => {
       'auth.local.passwordResetCode': code,
     });
 
-    try {
-      await superagent
-        .post(`${endpoint}?code=${code}`)
-        .send({newPassword: 'my new password'});
-      throw new Error('Request should fail.');
-    } catch (err) {
-      expect(err.status).to.equal(401);
-    }
+    await expect(api.post(`${endpoint}`, {
+      newPassword: 'my new password',
+      code,
+    })).to.eventually.be.rejected.and.eql({
+      code: 400,
+      error: 'BadRequest',
+      message: t('invalidReqParams'),
+    });
   });
 
   it('renders the error page if the password confirmation does not match', async () => {
@@ -179,17 +181,15 @@ describe('POST /user/auth/local/reset-password-set-new-one', () => {
       'auth.local.passwordResetCode': code,
     });
 
-    try {
-      await superagent
-        .post(`${endpoint}?code=${code}`)
-        .send({
-          newPassword: 'my new password',
-          confirmPassword: 'not matching',
-        });
-      throw new Error('Request should fail.');
-    } catch (err) {
-      expect(err.status).to.equal(401);
-    }
+    await expect(api.post(`${endpoint}`, {
+      newPassword: 'my new password',
+      confirmPassword: 'not matching',
+      code,
+    })).to.eventually.be.rejected.and.eql({
+      code: 400,
+      error: 'BadRequest',
+      message: t('passwordConfirmationMatch'),
+    });
   });
 
   it('renders the success page and save the user', async () => {
@@ -203,14 +203,13 @@ describe('POST /user/auth/local/reset-password-set-new-one', () => {
       'auth.local.passwordResetCode': code,
     });
 
-    let res = await superagent
-      .post(`${endpoint}?code=${code}`)
-      .send({
-        newPassword: 'my new password',
-        confirmPassword: 'my new password',
-      });
+    let res = await api.post(`${endpoint}`, {
+      newPassword: 'my new password',
+      confirmPassword: 'my new password',
+      code,
+    });
 
-    expect(res.status).to.equal(200);
+    expect(res.message).to.equal(t('passwordChangeSuccess'));
 
     await user.sync();
     expect(user.auth.local.passwordResetCode).to.equal(undefined);
@@ -246,14 +245,13 @@ describe('POST /user/auth/local/reset-password-set-new-one', () => {
       'auth.local.passwordResetCode': code,
     });
 
-    let res = await superagent
-      .post(`${endpoint}?code=${code}`)
-      .send({
-        newPassword: 'my new password',
-        confirmPassword: 'my new password',
-      });
+    let res = await api.post(`${endpoint}`, {
+      newPassword: 'my new password',
+      confirmPassword: 'my new password',
+      code,
+    });
 
-    expect(res.status).to.equal(200);
+    expect(res.message).to.equal(t('passwordChangeSuccess'));
 
     await user.sync();
     expect(user.auth.local.passwordResetCode).to.equal(undefined);

test/api/v3/integration/user/auth/POST-register_local.test.js

@@ -59,13 +59,8 @@ describe('POST /user/auth/local/register', () => {
         let tags = await requests.get('/tags');
 
         expect(habits).to.have.a.lengthOf(0);
-
         expect(dailys).to.have.a.lengthOf(0);
-
         expect(todos).to.have.a.lengthOf(1);
-        expect(todos[0].text).to.eql(t('defaultTodo1Text'));
-        expect(todos[0].notes).to.eql(t('defaultTodoNotes'));
-
         expect(rewards).to.have.a.lengthOf(0);
 
         expect(tags).to.have.a.lengthOf(7);
@@ -78,7 +73,7 @@ describe('POST /user/auth/local/register', () => {
         expect(tags[6].name).to.eql(t('defaultTag7'));
       });
 
-      it('for Web', async () => {
+      xit('for Web', async () => {
         api = requester(
           null,
           {'x-client': 'habitica-web'},
@@ -129,7 +124,9 @@ describe('POST /user/auth/local/register', () => {
         expect(tags[5].name).to.eql(t('defaultTag6'));
         expect(tags[6].name).to.eql(t('defaultTag7'));
       });
+    });
 
+    context('does not provide default tags and tasks', async () => {
       it('for Android', async () => {
         api = requester(
           null,
@@ -154,34 +151,11 @@ describe('POST /user/auth/local/register', () => {
         let rewards = await requests.get('/tasks/user?type=rewards');
         let tags = await requests.get('/tags');
 
-        expect(habits).to.have.a.lengthOf(2);
-        expect(habits[0].text).to.eql(t('defaultHabit4Text'));
-        expect(habits[0].notes).to.eql(t('defaultHabit4Notes'));
-        expect(habits[1].text).to.eql(t('defaultHabit5Text'));
-        expect(habits[1].notes).to.eql(t('defaultHabit5Notes'));
-
-        expect(dailys).to.have.a.lengthOf(1);
-        expect(dailys[0].text).to.eql(t('defaultDaily1Text'));
-        expect(dailys[0].notes).to.eql('');
-
-        expect(todos).to.have.a.lengthOf(2);
-        expect(todos[0].text).to.eql(t('defaultTodo1Text'));
-        expect(todos[0].notes).to.eql(t('defaultTodoNotes'));
-        expect(todos[1].text).to.eql(t('defaultTodo2Text'));
-        expect(todos[1].notes).to.eql(t('defaultTodo2Notes'));
-
-        expect(rewards).to.have.a.lengthOf(1);
-        expect(rewards[0].text).to.eql(t('defaultReward2Text'));
-        expect(rewards[0].notes).to.eql(t('defaultReward2Notes'));
-
-        expect(tags).to.have.a.lengthOf(7);
-        expect(tags[0].name).to.eql(t('defaultTag1'));
-        expect(tags[1].name).to.eql(t('defaultTag2'));
-        expect(tags[2].name).to.eql(t('defaultTag3'));
-        expect(tags[3].name).to.eql(t('defaultTag4'));
-        expect(tags[4].name).to.eql(t('defaultTag5'));
-        expect(tags[5].name).to.eql(t('defaultTag6'));
-        expect(tags[6].name).to.eql(t('defaultTag7'));
+        expect(habits).to.have.a.lengthOf(0);
+        expect(dailys).to.have.a.lengthOf(0);
+        expect(todos).to.have.a.lengthOf(0);
+        expect(rewards).to.have.a.lengthOf(0);
+        expect(tags).to.have.a.lengthOf(0);
       });
 
       it('for iOS', async () => {
@@ -208,34 +182,11 @@ describe('POST /user/auth/local/register', () => {
         let rewards = await requests.get('/tasks/user?type=rewards');
         let tags = await requests.get('/tags');
 
-        expect(habits).to.have.a.lengthOf(2);
-        expect(habits[0].text).to.eql(t('defaultHabit4Text'));
-        expect(habits[0].notes).to.eql(t('defaultHabit4Notes'));
-        expect(habits[1].text).to.eql(t('defaultHabit5Text'));
-        expect(habits[1].notes).to.eql(t('defaultHabit5Notes'));
-
-        expect(dailys).to.have.a.lengthOf(1);
-        expect(dailys[0].text).to.eql(t('defaultDaily1Text'));
-        expect(dailys[0].notes).to.eql('');
-
-        expect(todos).to.have.a.lengthOf(2);
-        expect(todos[0].text).to.eql(t('defaultTodo1Text'));
-        expect(todos[0].notes).to.eql(t('defaultTodoNotes'));
-        expect(todos[1].text).to.eql(t('defaultTodo2Text'));
-        expect(todos[1].notes).to.eql(t('defaultTodo2Notes'));
-
-        expect(rewards).to.have.a.lengthOf(1);
-        expect(rewards[0].text).to.eql(t('defaultReward2Text'));
-        expect(rewards[0].notes).to.eql(t('defaultReward2Notes'));
-
-        expect(tags).to.have.a.lengthOf(7);
-        expect(tags[0].name).to.eql(t('defaultTag1'));
-        expect(tags[1].name).to.eql(t('defaultTag2'));
-        expect(tags[2].name).to.eql(t('defaultTag3'));
-        expect(tags[3].name).to.eql(t('defaultTag4'));
-        expect(tags[4].name).to.eql(t('defaultTag5'));
-        expect(tags[5].name).to.eql(t('defaultTag6'));
-        expect(tags[6].name).to.eql(t('defaultTag7'));
+        expect(habits).to.have.a.lengthOf(0);
+        expect(dailys).to.have.a.lengthOf(0);
+        expect(todos).to.have.a.lengthOf(0);
+        expect(rewards).to.have.a.lengthOf(0);
+        expect(tags).to.have.a.lengthOf(0);
       });
     });
 
@@ -509,7 +460,73 @@ describe('POST /user/auth/local/register', () => {
         confirmPassword: password,
       });
 
-      expect(user.invitations.party).to.eql({
+      expect(user.invitations.parties[0].id).to.eql(group._id);
+      expect(user.invitations.parties[0].name).to.eql(group.name);
+      expect(user.invitations.parties[0].inviter).to.eql(groupLeader._id);
+    });
+
+    it('awards achievement to inviter', async () => {
+      let { group, groupLeader } = await createAndPopulateGroup({
+        groupDetails: { type: 'party', privacy: 'private' },
+      });
+
+      let invite = encrypt(JSON.stringify({
+        id: group._id,
+        inviter: groupLeader._id,
+        sentAt: Date.now(),
+      }));
+
+      await api.post(`/user/auth/local/register?groupInvite=${invite}`, {
+        username,
+        email,
+        password,
+        confirmPassword: password,
+      });
+
+      await groupLeader.sync();
+      expect(groupLeader.achievements.invitedFriend).to.be.true;
+    });
+
+    it('user not added to a party on expired invite', async () => {
+      let { group, groupLeader } = await createAndPopulateGroup({
+        groupDetails: { type: 'party', privacy: 'private' },
+      });
+
+      let invite = encrypt(JSON.stringify({
+        id: group._id,
+        inviter: groupLeader._id,
+        sentAt: Date.now() - 6.912e8, // 8 days old
+      }));
+
+      let user = await api.post(`/user/auth/local/register?groupInvite=${invite}`, {
+        username,
+        email,
+        password,
+        confirmPassword: password,
+      });
+
+      expect(user.invitations.party).to.eql({});
+    });
+
+    it('adds a user to a guild on an invite of type other than party', async () => {
+      let { group, groupLeader } = await createAndPopulateGroup({
+          groupDetails: { type: 'guild', privacy: 'private' },
+      });
+
+      let invite = encrypt(JSON.stringify({
+        id: group._id,
+        inviter: groupLeader._id,
+        sentAt: Date.now(),
+      }));
+
+      let user = await api.post(`/user/auth/local/register?groupInvite=${invite}`, {
+        username,
+        email,
+        password,
+        confirmPassword: password,
+      });
+
+      expect(user.invitations.guilds[0]).to.eql({
         id: group._id,
         name: group.name,
         inviter: groupLeader._id,
@@ -601,10 +618,10 @@ describe('POST /user/auth/local/register', () => {
         confirmPassword: password,
       });
 
-      expect(user.tasksOrder.todos).to.not.be.empty;
+      expect(user.tasksOrder.todos).to.be.empty;
       expect(user.tasksOrder.dailys).to.be.empty;
-      expect(user.tasksOrder.habits).to.not.be.empty;
-      expect(user.tasksOrder.rewards).to.not.be.empty;
+      expect(user.tasksOrder.habits).to.be.empty;
+      expect(user.tasksOrder.rewards).to.be.empty;
     });
 
     it('populates user with default tags', async () => {
@@ -631,23 +648,8 @@ describe('POST /user/auth/local/register', () => {
       let habits = await requests.get('/tasks/user?type=habits');
       let todos = await requests.get('/tasks/user?type=todos');
 
-      function findTag (tagName) {
-        let tag = user.tags.find((userTag) => {
-          return userTag.name === t(tagName);
-        });
-        return tag.id;
-      }
-
-      expect(habits[0].tags).to.have.a.lengthOf(3);
-      expect(habits[0].tags).to.include.members(['defaultTag1', 'defaultTag4', 'defaultTag6'].map(findTag));
-
-      expect(habits[1].tags).to.have.a.lengthOf(1);
-      expect(habits[1].tags).to.include.members(['defaultTag3'].map(findTag));
-
-      expect(habits[2].tags).to.have.a.lengthOf(2);
-      expect(habits[2].tags).to.include.members(['defaultTag2', 'defaultTag3'].map(findTag));
-
-      expect(todos[0].tags).to.have.a.lengthOf(0);
+      expect(habits).to.have.a.lengthOf(0);
+      expect(todos).to.have.a.lengthOf(0);
     });
   });
 });

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

@@ -0,0 +1,100 @@
+/* eslint-disable camelcase */
+
+import {
+  generateUser,
+  translate as t,
+} from '../../../../../helpers/api-integration/v3';
+import shared from '../../../../../../website/common/script';
+
+let content = shared.content;
+
+describe('POST /user/buy/:key', () => {
+  let user;
+
+  beforeEach(async () => {
+    user = await generateUser({
+      'stats.gp': 400,
+    });
+  });
+
+  // More tests in common code unit tests
+
+  it('returns an error if the item is not found', async () => {
+    await expect(user.post('/user/buy/notExisting'))
+      .to.eventually.be.rejected.and.eql({
+        code: 404,
+        error: 'NotFound',
+        message: t('itemNotFound', {key: 'notExisting'}),
+      });
+  });
+
+  it('buys a potion', async () => {
+    await user.update({
+      'stats.gp': 400,
+      'stats.hp': 40,
+    });
+
+    let potion = content.potion;
+    let res = await user.post('/user/buy/potion');
+    await user.sync();
+
+    expect(user.stats.hp).to.equal(50);
+    expect(res.data).to.eql(user.stats);
+    expect(res.message).to.equal(t('messageBought', {itemText: potion.text()}));
+  });
+
+  it('returns an error if user tries to buy a potion with full health', async () => {
+    await user.update({
+      'stats.gp': 40,
+      'stats.hp': 50,
+    });
+
+    await expect(user.post('/user/buy/potion'))
+      .to.eventually.be.rejected.and.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('messageHealthAlreadyMax'),
+      });
+  });
+
+  it('buys a piece of gear', async () => {
+    let key = 'armor_warrior_1';
+
+    await user.post(`/user/buy/${key}`);
+    await user.sync();
+
+    expect(user.items.gear.owned.armor_warrior_1).to.eql(true);
+  });
+
+  it('buys a special spell', async () => {
+    let key = 'spookySparkles';
+    let item = content.special[key];
+
+    await user.update({'stats.gp': 250});
+    let res = await user.post(`/user/buy/${key}`);
+    await user.sync();
+
+    expect(res.data).to.eql({
+      items: JSON.parse(JSON.stringify(user.items)), // otherwise dates can't be compared
+      stats: user.stats,
+    });
+    expect(res.message).to.equal(t('messageBought', {
+      itemText: item.text(),
+    }));
+  });
+
+  it('allows for bulk purchases', async () => {
+    await user.update({
+      'stats.gp': 400,
+      'stats.hp': 20,
+    });
+
+    let potion = content.potion;
+    let res = await user.post('/user/buy/potion', {quantity: 2});
+    await user.sync();
+
+    expect(user.stats.hp).to.equal(50);
+    expect(res.data).to.eql(user.stats);
+    expect(res.message).to.equal(t('messageBought', {itemText: potion.text()}));
+  });
+});

test/api/v3/integration/user/buy/POST-user_buy_armoire.test.js

@@ -1,7 +1,7 @@
 import {
   generateUser,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../../helpers/api-integration/v3';
 
 describe('POST /user/buy-armoire', () => {
   let user;

test/api/v3/integration/user/buy/POST-user_buy_gear.test.js

@@ -3,7 +3,7 @@
 import {
   generateUser,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../../helpers/api-integration/v3';
 
 describe('POST /user/buy-gear/:key', () => {
   let user;

test/api/v3/integration/user/buy/POST-user_buy_health_potion.test.js

@@ -1,8 +1,8 @@
 import {
   generateUser,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
-import shared from '../../../../../website/common/script';
+} from '../../../../../helpers/api-integration/v3';
+import shared from '../../../../../../website/common/script';
 
 let content = shared.content;
 

test/api/v3/integration/user/buy/POST-user_buy_mystery_set.test.js

@@ -1,7 +1,7 @@
 import {
   generateUser,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../../helpers/api-integration/v3';
 
 describe('POST /user/buy-mystery-set/:key', () => {
   let user;

test/api/v3/integration/user/buy/POST-user_buy_quest.test.js

@@ -1,8 +1,8 @@
 import {
   generateUser,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
-import shared from '../../../../../website/common/script';
+} from '../../../../../helpers/api-integration/v3';
+import shared from '../../../../../../website/common/script';
 
 let content = shared.content;
 

test/api/v3/integration/user/buy/POST-user_buy_special_spell.test.js

@@ -1,8 +1,8 @@
 import {
   generateUser,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
-import shared from '../../../../../website/common/script';
+} from '../../../../../helpers/api-integration/v3';
+import shared from '../../../../../../website/common/script';
 
 let content = shared.content;
 

test/api/v3/unit/libs/amazonPayments.test.js

@@ -102,6 +102,7 @@ describe('Amazon Payments', () => {
     });
 
     it('should purchase gems', async () => {
+      sinon.stub(user, 'canGetGems').returnsPromise().resolves(true);
       await amzLib.checkout({user, orderReferenceId, headers});
 
       expect(paymentBuyGemsStub).to.be.calledOnce;
@@ -111,22 +112,52 @@ describe('Amazon Payments', () => {
         headers,
       });
       expectAmazonStubs();
+      expect(user.canGetGems).to.be.calledOnce;
+      user.canGetGems.restore();
     });
 
-    it('should gift gems', async () => {
+    it('should error if gem amount is too low', async () => {
       let receivingUser = new User();
       receivingUser.save();
       let gift = {
         type: 'gems',
         gems: {
-          amount: 16,
+          amount: 0,
           uuid: receivingUser._id,
         },
       };
+
+      await expect(amzLib.checkout({gift, user, orderReferenceId, headers}))
+      .to.eventually.be.rejected.and.to.eql({
+        httpCode: 400,
+        message: 'Amount must be at least 1.',
+        name: 'BadRequest',
+      });
+    });
+
+    it('should error if user cannot get gems gems', async () => {
+      sinon.stub(user, 'canGetGems').returnsPromise().resolves(false);
+      await expect(amzLib.checkout({user, orderReferenceId, headers})).to.eventually.be.rejected.and.to.eql({
+        httpCode: 401,
+        message: i18n.t('groupPolicyCannotGetGems'),
+        name: 'NotAuthorized',
+      });
+      user.canGetGems.restore();
+    });
+
+    it('should gift gems', async () => {
+      let receivingUser = new User();
+      await receivingUser.save();
+      let gift = {
+        type: 'gems',
+        uuid: receivingUser._id,
+        gems: {
+          amount: 16,
+        },
+      };
       amount = 16 / 4;
       await amzLib.checkout({gift, user, orderReferenceId, headers});
 
-      gift.member = receivingUser;
       expect(paymentBuyGemsStub).to.be.calledOnce;
       expect(paymentBuyGemsStub).to.be.calledWith({
         user,

test/api/v3/unit/libs/applePayments.test.js

@@ -57,7 +57,20 @@ describe('Apple Payments', ()  => {
         });
     });
 
+    it('errors if the user cannot purchase gems', async () => {
+      sinon.stub(user, 'canGetGems').returnsPromise().resolves(false);
+      await expect(applePayments.verifyGemPurchase(user, receipt, headers))
+        .to.eventually.be.rejected.and.to.eql({
+          httpCode: 401,
+          name: 'NotAuthorized',
+          message: i18n.t('groupPolicyCannotGetGems'),
+        });
+
+      user.canGetGems.restore();
+    });
+
     it('purchases gems', async () => {
+      sinon.stub(user, 'canGetGems').returnsPromise().resolves(true);
       await applePayments.verifyGemPurchase(user, receipt, headers);
 
       expect(iapSetupStub).to.be.calledOnce;
@@ -74,6 +87,8 @@ describe('Apple Payments', ()  => {
         amount: 5.25,
         headers,
       });
+      expect(user.canGetGems).to.be.calledOnce;
+      user.canGetGems.restore();
     });
   });
 

test/api/v3/unit/libs/buildManifest.test.js

@@ -1,31 +0,0 @@
-import {
-  getManifestFiles,
-} from '../../../../../website/server/libs/buildManifest';
-
-describe('Build Manifest', () => {
-  describe('getManifestFiles', () => {
-    it('returns an html string', () => {
-      let htmlCode = getManifestFiles('app');
-
-      expect(htmlCode.startsWith('<script') || htmlCode.startsWith('<link')).to.be.true;
-    });
-
-    it('can return only js files', () => {
-      let htmlCode = getManifestFiles('app', 'js');
-
-      expect(htmlCode.indexOf('<link') === -1).to.be.true;
-    });
-
-    it('can return only css files', () => {
-      let htmlCode = getManifestFiles('app', 'css');
-
-      expect(htmlCode.indexOf('<script') === -1).to.be.true;
-    });
-
-    it('throws an error in case the page does not exist', () => {
-      expect(() => {
-        getManifestFiles('strange name here');
-      }).to.throw(Error);
-    });
-  });
-});

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

@@ -566,6 +566,17 @@ describe('cron', () => {
         expect(tasksByType.habits[0].counterDown).to.equal(0);
       });
 
+      it('should reset habit counters even if user is resting in the Inn', () => {
+        user.preferences.sleep = true;
+        tasksByType.habits[0].counterUp = 1;
+        tasksByType.habits[0].counterDown = 1;
+
+        cron({user, tasksByType, daysMissed, analytics});
+
+        expect(tasksByType.habits[0].counterUp).to.equal(0);
+        expect(tasksByType.habits[0].counterDown).to.equal(0);
+      });
+
       it('should reset a weekly habit counter each Monday', () => {
         tasksByType.habits[0].frequency = 'weekly';
         tasksByType.habits[0].counterUp = 1;
@@ -585,6 +596,114 @@ describe('cron', () => {
         expect(tasksByType.habits[0].counterDown).to.equal(0);
       });
 
+      it('should reset a weekly habit counter with custom daily start', () => {
+        clock.restore();
+
+        // Server clock: Monday 12am UTC
+        let monday = new Date('May 22, 2017 00:00:00 GMT').getTime();
+        clock = sinon.useFakeTimers(monday);
+
+        // cron runs at 2am
+        user.preferences.dayStart = 2;
+
+        tasksByType.habits[0].frequency = 'weekly';
+        tasksByType.habits[0].counterUp = 1;
+        tasksByType.habits[0].counterDown = 1;
+        daysMissed = 1;
+
+        // should not reset
+        cron({user, tasksByType, daysMissed, analytics});
+
+        expect(tasksByType.habits[0].counterUp).to.equal(1);
+        expect(tasksByType.habits[0].counterDown).to.equal(1);
+
+        clock.restore();
+
+        // Server clock: Monday 3am UTC
+        monday = new Date('May 22, 2017 03:00:00 GMT').getTime();
+        clock = sinon.useFakeTimers(monday);
+
+        // should reset after user CDS
+        cron({user, tasksByType, daysMissed, analytics});
+
+        expect(tasksByType.habits[0].counterUp).to.equal(0);
+        expect(tasksByType.habits[0].counterDown).to.equal(0);
+      });
+
+      it('should not reset a weekly habit counter when server tz is Monday but user\'s tz is Tuesday', () => {
+        clock.restore();
+
+        // Server clock: Monday 11pm UTC
+        let monday = new Date('May 22, 2017 23:00:00 GMT').getTime();
+        clock = sinon.useFakeTimers(monday);
+
+        // User clock: Tuesday 1am UTC + 2
+        user.preferences.timezoneOffset = -120;
+
+        tasksByType.habits[0].frequency = 'weekly';
+        tasksByType.habits[0].counterUp = 1;
+        tasksByType.habits[0].counterDown = 1;
+        daysMissed = 1;
+
+        // should not reset
+        cron({user, tasksByType, daysMissed, analytics});
+
+        expect(tasksByType.habits[0].counterUp).to.equal(1);
+        expect(tasksByType.habits[0].counterDown).to.equal(1);
+
+        // User missed one cron, which will subtract User clock back to Monday 1am UTC + 2
+        // should reset
+        daysMissed = 2;
+        cron({user, tasksByType, daysMissed, analytics});
+
+        expect(tasksByType.habits[0].counterUp).to.equal(0);
+        expect(tasksByType.habits[0].counterDown).to.equal(0);
+      });
+
+      it('should reset a weekly habit counter when server tz is Sunday but user\'s tz is Monday', () => {
+        clock.restore();
+
+        // Server clock: Sunday 11pm UTC
+        let sunday = new Date('May 21, 2017 23:00:00 GMT').getTime();
+        clock = sinon.useFakeTimers(sunday);
+
+        // User clock: Monday 2am UTC + 3
+        user.preferences.timezoneOffset = -180;
+
+        tasksByType.habits[0].frequency = 'weekly';
+        tasksByType.habits[0].counterUp = 1;
+        tasksByType.habits[0].counterDown = 1;
+        daysMissed = 1;
+
+        // should reset
+        cron({user, tasksByType, daysMissed, analytics});
+
+        expect(tasksByType.habits[0].counterUp).to.equal(0);
+        expect(tasksByType.habits[0].counterDown).to.equal(0);
+      });
+
+      it('should not reset a weekly habit counter when server tz is Monday but user\'s tz is Sunday', () => {
+        clock.restore();
+
+        // Server clock: Monday 2am UTC
+        let monday = new Date('May 22, 2017 02:00:00 GMT').getTime();
+        clock = sinon.useFakeTimers(monday);
+
+        // User clock: Sunday 11pm UTC - 3
+        user.preferences.timezoneOffset = 180;
+
+        tasksByType.habits[0].frequency = 'weekly';
+        tasksByType.habits[0].counterUp = 1;
+        tasksByType.habits[0].counterDown = 1;
+        daysMissed = 1;
+
+        // should not reset
+        cron({user, tasksByType, daysMissed, analytics});
+
+        expect(tasksByType.habits[0].counterUp).to.equal(1);
+        expect(tasksByType.habits[0].counterDown).to.equal(1);
+      });
+
       it('should reset a monthly habit counter the first day of each month', () => {
         tasksByType.habits[0].frequency = 'monthly';
         tasksByType.habits[0].counterUp = 1;
@@ -603,6 +722,59 @@ describe('cron', () => {
         expect(tasksByType.habits[0].counterUp).to.equal(0);
         expect(tasksByType.habits[0].counterDown).to.equal(0);
       });
+
+      it('should reset a monthly habit counter when server tz is last day of month but user tz is first day of the month', () => {
+        clock.restore();
+        daysMissed = 0;
+
+        // Server clock: 4/30/17 11pm UTC
+        let monday = new Date('April 30, 2017 23:00:00 GMT').getTime();
+        clock = sinon.useFakeTimers(monday);
+
+        // User clock: 5/1/17 2am UTC + 3
+        user.preferences.timezoneOffset = -180;
+
+        tasksByType.habits[0].frequency = 'monthly';
+        tasksByType.habits[0].counterUp = 1;
+        tasksByType.habits[0].counterDown = 1;
+        daysMissed = 1;
+
+        // should reset
+        cron({user, tasksByType, daysMissed, analytics});
+
+        expect(tasksByType.habits[0].counterUp).to.equal(0);
+        expect(tasksByType.habits[0].counterDown).to.equal(0);
+      });
+
+      it('should not reset a monthly habit counter when server tz is first day of month but user tz is 2nd day of the month', () => {
+        clock.restore();
+
+        // Server clock: 5/1/17 11pm UTC
+        let monday = new Date('May 1, 2017 23:00:00 GMT').getTime();
+        clock = sinon.useFakeTimers(monday);
+
+        // User clock: 5/2/17 2am UTC + 3
+        user.preferences.timezoneOffset = -180;
+
+        tasksByType.habits[0].frequency = 'monthly';
+        tasksByType.habits[0].counterUp = 1;
+        tasksByType.habits[0].counterDown = 1;
+        daysMissed = 1;
+
+        // should not reset
+        cron({user, tasksByType, daysMissed, analytics});
+
+        expect(tasksByType.habits[0].counterUp).to.equal(1);
+        expect(tasksByType.habits[0].counterDown).to.equal(1);
+
+        // User missed one day, which will subtract User clock back to 5/1/17 2am UTC + 3
+        // should reset
+        daysMissed = 2;
+        cron({user, tasksByType, daysMissed, analytics});
+
+        expect(tasksByType.habits[0].counterUp).to.equal(0);
+        expect(tasksByType.habits[0].counterDown).to.equal(0);
+      });
     });
   });
 

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

@@ -142,12 +142,12 @@ describe('emails', () => {
   describe('getGroupUrl', () => {
     it('returns correct url if group is the tavern', () => {
       let getGroupUrl = require(pathToEmailLib).getGroupUrl;
-      expect(getGroupUrl({_id: TAVERN_ID, type: 'guild'})).to.eql('/#/options/groups/tavern');
+      expect(getGroupUrl({_id: TAVERN_ID, type: 'guild'})).to.eql('/groups/tavern');
     });
 
     it('returns correct url if group is a guild', () => {
       let getGroupUrl = require(pathToEmailLib).getGroupUrl;
-      expect(getGroupUrl({_id: 'random _id', type: 'guild'})).to.eql('/#/options/groups/guilds/random _id');
+      expect(getGroupUrl({_id: 'random _id', type: 'guild'})).to.eql('/groups/guild/random _id');
     });
 
     it('returns correct url if group is a party', () => {

test/api/v3/unit/libs/googlePayments.test.js

@@ -63,7 +63,21 @@ describe('Google Payments', ()  => {
         });
     });
 
+    it('should throw an error if user cannot purchase gems', async () => {
+      sinon.stub(user, 'canGetGems').returnsPromise().resolves(false);
+
+      await expect(googlePayments.verifyGemPurchase(user, receipt, signature, headers))
+        .to.eventually.be.rejected.and.to.eql({
+          httpCode: 401,
+          name: 'NotAuthorized',
+          message: i18n.t('groupPolicyCannotGetGems'),
+        });
+
+      user.canGetGems.restore();
+    });
+
     it('purchases gems', async () => {
+      sinon.stub(user, 'canGetGems').returnsPromise().resolves(true);
       await googlePayments.verifyGemPurchase(user, receipt, signature, headers);
 
       expect(iapSetupStub).to.be.calledOnce;
@@ -82,6 +96,8 @@ describe('Google Payments', ()  => {
         amount: 5.25,
         headers,
       });
+      expect(user.canGetGems).to.be.calledOnce;
+      user.canGetGems.restore();
     });
   });
 

test/api/v3/unit/libs/paypalPayments.test.js

@@ -61,23 +61,54 @@ describe('Paypal Payments', ()  => {
     });
 
     it('creates a link for gem purchases', async () => {
-      let link = await paypalPayments.checkout();
+      let link = await paypalPayments.checkout({user: new User()});
 
       expect(paypalPaymentCreateStub).to.be.calledOnce;
       expect(paypalPaymentCreateStub).to.be.calledWith(getPaypalCreateOptions('Habitica Gems', 5.00));
       expect(link).to.eql(approvalHerf);
     });
 
-    it('creates a link for gifting gems', async () => {
+    it('should error if gem amount is too low', async () => {
       let receivingUser = new User();
+      receivingUser.save();
       let gift = {
         type: 'gems',
         gems: {
-          amount: 16,
+          amount: 0,
           uuid: receivingUser._id,
         },
       };
 
+      await expect(paypalPayments.checkout({gift}))
+      .to.eventually.be.rejected.and.to.eql({
+        httpCode: 400,
+        message: 'Amount must be at least 1.',
+        name: 'BadRequest',
+      });
+    });
+
+    it('should error if the user cannot get gems', async () => {
+      let user = new User();
+      sinon.stub(user, 'canGetGems').returnsPromise().resolves(false);
+
+      await expect(paypalPayments.checkout({user})).to.eventually.be.rejected.and.to.eql({
+        httpCode: 401,
+        message: i18n.t('groupPolicyCannotGetGems'),
+        name: 'NotAuthorized',
+      });
+    });
+
+    it('creates a link for gifting gems', async () => {
+      let receivingUser = new User();
+      await receivingUser.save();
+      let gift = {
+        type: 'gems',
+        uuid: receivingUser._id,
+        gems: {
+          amount: 16,
+        },
+      };
+
       let link = await paypalPayments.checkout({gift});
 
       expect(paypalPaymentCreateStub).to.be.calledOnce;

test/api/v3/unit/libs/slack.js

@@ -71,7 +71,7 @@ describe('slack', () => {
       expect(IncomingWebhook.prototype.send).to.be.calledWithMatch({
         attachments: [sandbox.match({
           title: 'Flag in Some group',
-          title_link: sandbox.match(/.*\/#\/options\/groups\/guilds\/group-id/),
+          title_link: sandbox.match(/.*\/groups\/guild\/group-id/),
         })],
       });
     });
@@ -86,7 +86,7 @@ describe('slack', () => {
       expect(IncomingWebhook.prototype.send).to.be.calledWithMatch({
         attachments: [sandbox.match({
           title: 'Flag in Tavern',
-          title_link: sandbox.match(/.*\/#\/options\/groups\/tavern/),
+          title_link: sandbox.match(/.*\/groups\/tavern/),
         })],
       });
     });

test/api/v3/unit/libs/stripePayments.test.js

@@ -48,7 +48,57 @@ describe('Stripe Payments', () => {
       payments.createSubscription.restore();
     });
 
+    it('should error if gem amount is too low', async () => {
+      let receivingUser = new User();
+      receivingUser.save();
+      gift = {
+        type: 'gems',
+        gems: {
+          amount: 0,
+          uuid: receivingUser._id,
+        },
+      };
+
+      await expect(stripePayments.checkout({
+        token,
+        user,
+        gift,
+        groupId,
+        email,
+        headers,
+        coupon,
+      }, stripe))
+      .to.eventually.be.rejected.and.to.eql({
+        httpCode: 400,
+        message: 'Amount must be at least 1.',
+        name: 'BadRequest',
+      });
+    });
+
+
+    it('should error if user cannot get gems', async () => {
+      gift = undefined;
+      sinon.stub(user, 'canGetGems').returnsPromise().resolves(false);
+
+      await expect(stripePayments.checkout({
+        token,
+        user,
+        gift,
+        groupId,
+        email,
+        headers,
+        coupon,
+      }, stripe)).to.eventually.be.rejected.and.to.eql({
+        httpCode: 401,
+        message: i18n.t('groupPolicyCannotGetGems'),
+        name: 'NotAuthorized',
+      });
+    });
+
     it('should purchase gems', async () => {
+      gift = undefined;
+      sinon.stub(user, 'canGetGems').returnsPromise().resolves(true);
+
       await stripePayments.checkout({
         token,
         user,
@@ -73,16 +123,18 @@ describe('Stripe Payments', () => {
         paymentMethod: 'Stripe',
         gift,
       });
+      expect(user.canGetGems).to.be.calledOnce;
+      user.canGetGems.restore();
     });
 
     it('should gift gems', async () => {
       let receivingUser = new User();
-      receivingUser.save();
+      await receivingUser.save();
       gift = {
         type: 'gems',
+        uuid: receivingUser._id,
         gems: {
           amount: 16,
-          uuid: receivingUser._id,
         },
       };
 
@@ -96,7 +148,6 @@ describe('Stripe Payments', () => {
         coupon,
       }, stripe);
 
-      gift.member = receivingUser;
       expect(stripeChargeStub).to.be.calledOnce;
       expect(stripeChargeStub).to.be.calledWith({
         amount: '400',

test/api/v3/unit/middlewares/response.js

@@ -4,6 +4,7 @@ import {
   generateNext,
 } from '../../../../helpers/api-unit.helper';
 import responseMiddleware from '../../../../../website/server/middlewares/response';
+import packageInfo from '../../../../../package.json';
 
 describe('response middleware', () => {
   let res, req, next;
@@ -33,6 +34,8 @@ describe('response middleware', () => {
       success: true,
       data: {field: 1},
       notifications: [],
+      userV: res.locals.user._v,
+      appVersion: packageInfo.version,
     });
   });
 
@@ -49,6 +52,8 @@ describe('response middleware', () => {
       data: {field: 1},
       message: 'hello',
       notifications: [],
+      userV: res.locals.user._v,
+      appVersion: packageInfo.version,
     });
   });
 
@@ -64,12 +69,13 @@ describe('response middleware', () => {
       success: false,
       data: {field: 1},
       notifications: [],
+      userV: res.locals.user._v,
+      appVersion: packageInfo.version,
     });
   });
 
-  it('returns userV if a user is authenticated req.query.userV is passed', () => {
+  it('returns userV if a user is authenticated', () => {
     responseMiddleware(req, res, next);
-    req.query.userV = 3;
     res.respond(200, {field: 1});
 
     expect(res.json).to.be.calledOnce;
@@ -79,6 +85,7 @@ describe('response middleware', () => {
       data: {field: 1},
       notifications: [],
       userV: 0,
+      appVersion: packageInfo.version,
     });
   });
 
@@ -101,6 +108,8 @@ describe('response middleware', () => {
           data: {},
         },
       ],
+      userV: res.locals.user._v,
+      appVersion: packageInfo.version,
     });
   });
 });

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

@@ -282,7 +282,7 @@ describe('Group Model', () => {
           expect(finishQuest).to.be.calledWith(quest);
         });
 
-        context('with Rage', () => {
+        context('with healing Rage', () => {
           beforeEach(async () => {
             party.quest.active = false;
             party.quest.key = 'trex_undead';
@@ -327,6 +327,46 @@ describe('Group Model', () => {
             expect(party.quest.progress.hp).to.eql(500);
           });
         });
+
+        context('with Mana drain Rage', () => {
+          beforeEach(async () => {
+            party.quest.active = false;
+            party.quest.key = 'lostMasterclasser4';
+
+            await party.startQuest(questLeader);
+            await party.save();
+          });
+
+          it('applies down progress to boss rage', async () => {
+            progress.down = -2;
+
+            await Group.processQuestProgress(participatingMember, progress);
+
+            party = await Group.findOne({_id: party._id});
+
+            expect(party.quest.progress.rage).to.eql(8);
+
+            let drainedUser = await User.findById(participatingMember._id);
+            expect(drainedUser.stats.mp).to.eql(10);
+          });
+
+          it('activates rage when progress.down triggers rage bar', async () => {
+            let quest = questScrolls[party.quest.key];
+
+            progress.down = -999;
+
+            await party.save();
+            await Group.processQuestProgress(participatingMember, progress);
+
+            party = await Group.findOne({_id: party._id});
+
+            expect(Group.prototype.sendChat).to.be.calledWith(quest.boss.rage.effect('en'));
+            expect(party.quest.progress.rage).to.eql(0);
+
+            let drainedUser = await User.findById(participatingMember._id);
+            expect(drainedUser.stats.mp).to.eql(0);
+          });
+        });
       });
 
       context('Collection Quests', () => {
@@ -1342,6 +1382,42 @@ describe('Group Model', () => {
         expect(updatedParticipatingMember.achievements.quests[quest.key]).to.eql(1);
       });
 
+      it('gives out super awesome Masterclasser achievement to the deserving', async () => {
+        quest = questScrolls.lostMasterclasser4;
+        party.quest.key = quest.key;
+
+        questLeader.achievements.quests = {
+          mayhemMistiflying1: 1,
+          mayhemMistiflying2: 1,
+          mayhemMistiflying3: 1,
+          stoikalmCalamity1: 1,
+          stoikalmCalamity2: 1,
+          stoikalmCalamity3: 1,
+          taskwoodsTerror1: 1,
+          taskwoodsTerror2: 1,
+          taskwoodsTerror3: 1,
+          dilatoryDistress1: 1,
+          dilatoryDistress2: 1,
+          dilatoryDistress3: 1,
+          lostMasterclasser1: 1,
+          lostMasterclasser2: 1,
+          lostMasterclasser3: 1,
+        };
+        await questLeader.save();
+        await party.finishQuest(quest);
+
+        let [
+          updatedLeader,
+          updatedParticipatingMember,
+        ] = await Promise.all([
+          User.findById(questLeader._id),
+          User.findById(participatingMember._id),
+        ]);
+
+        expect(updatedLeader.achievements.lostMasterclasser).to.eql(true);
+        expect(updatedParticipatingMember.achievements.lostMasterclasser).to.not.eql(true);
+      });
+
       it('gives xp and gold', async () => {
         await party.finishQuest(quest);
 

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

@@ -1,6 +1,7 @@
 import Bluebird from 'bluebird';
 import moment from 'moment';
 import { model as User } from '../../../../../website/server/models/user';
+import { model as Group } from '../../../../../website/server/models/group';
 import common from '../../../../../website/common';
 
 describe('User Model', () => {
@@ -179,6 +180,75 @@ describe('User Model', () => {
     });
   });
 
+  context('canGetGems', () => {
+    let user;
+    let group;
+    beforeEach(() => {
+      user = new User();
+      let leader = new User();
+      group = new Group({
+        name: 'test',
+        type: 'guild',
+        privacy: 'private',
+        leader: leader._id,
+      });
+    });
+
+    it('returns true if user is not subscribed', async () => {
+      expect(await user.canGetGems()).to.equal(true);
+    });
+
+    it('returns true if user is not subscribed with a group plan', async () => {
+      user.purchased.plan.customerId = 123;
+      expect(await user.canGetGems()).to.equal(true);
+    });
+
+    it('returns true if user is subscribed with a group plan', async () => {
+      user.purchased.plan.customerId = 'group-plan';
+      expect(await user.canGetGems()).to.equal(true);
+    });
+
+    it('returns true if user is part of a group', async () => {
+      user.guilds.push(group._id);
+      expect(await user.canGetGems()).to.equal(true);
+    });
+
+    it('returns true if user is part of a group with a subscription', async () => {
+      user.guilds.push(group._id);
+      user.purchased.plan.customerId = 'group-plan';
+      group.purchased.plan.customerId = 123;
+      await group.save();
+      expect(await user.canGetGems()).to.equal(true);
+    });
+
+    it('returns true if leader is part of a group with a subscription and canGetGems: false', async () => {
+      user.guilds.push(group._id);
+      user.purchased.plan.customerId = 'group-plan';
+      group.purchased.plan.customerId = 123;
+      group.leader = user._id;
+      group.leaderOnly.getGems = true;
+      await group.save();
+      expect(await user.canGetGems()).to.equal(true);
+    });
+
+    it('returns true if user is part of a group with no subscription but canGetGems: false', async () => {
+      user.guilds.push(group._id);
+      user.purchased.plan.customerId = 'group-plan';
+      group.leaderOnly.getGems = true;
+      await group.save();
+      expect(await user.canGetGems()).to.equal(true);
+    });
+
+    it('returns false if user is part of a group with a subscription and canGetGems: false', async () => {
+      user.guilds.push(group._id);
+      user.purchased.plan.customerId = 'group-plan';
+      group.purchased.plan.customerId = 123;
+      group.leaderOnly.getGems = true;
+      await group.save();
+      expect(await user.canGetGems()).to.equal(false);
+    });
+  });
+
   context('hasNotCancelled', () => {
     let user;
     beforeEach(() => {

test/client-old/e2e/.eslintrc

@@ -1,7 +0,0 @@
-{
-    "globals": {
-      "browser": true,
-      "by": true,
-      "element": true
-    }
-}

test/client-old/e2e/helper.js

@@ -1,22 +0,0 @@
-import fs from 'fs';
-import { resetHabiticaDB } from '../../helpers/mongo';
-
-before(async () => {
-  await resetHabiticaDB();
-});
-
-// based on https://github.com/angular/protractor/issues/114#issuecomment-29046939
-afterEach(async function () {
-  let lastTest = this.currentTest;
-
-  if (lastTest.state === 'failed') {
-    let filename = `exception_${lastTest.title}.png`;
-    let png = await browser.takeScreenshot();
-    let buffer = new Buffer(png, 'base64');
-    let stream = fs.createWriteStream(filename);
-
-    stream.write(buffer);
-    stream.end();
-  }
-});
-

test/client-old/e2e/protractor.conf.js

@@ -1,30 +0,0 @@
-'use strict';
-
-let chai = require('chai');
-let chaiAsPromised = require('chai-as-promised');
-
-require('babel-register');
-require('babel-polyfill');
-
-exports.config = {
-  specs: ['./helper.js', './**/*.test.js'],
-  baseUrl: 'http://localhost:3003/',
-  capabilities: {
-    browserName: 'firefox',
-  },
-  directConnect: true,
-  seleniumAddress: 'http://localhost:4444/wd/hub',
-  framework: 'mocha',
-  mochaOpts: {
-    reporter: 'spec',
-    slow: 6000,
-    timeout: 10000,
-    compilers: 'js:babel-register',
-  },
-  onPrepare: () => {
-    browser.ignoreSynchronization = true;
-
-    chai.use(chaiAsPromised);
-    global.expect = chai.expect;
-  },
-};

test/client-old/e2e/static-pages/front-page.test.js

@@ -1,64 +0,0 @@
-import { v4 as generateUniqueId } from 'uuid';
-
-describe('Static Front Page', () => {
-  beforeEach(() => {
-    browser.get('/');
-    browser.sleep(1000);
-  });
-
-  it('shows the front page', async () => {
-    let button = element(by.id('play-btn'));
-
-    await expect(button.getText()).to.eventually.eql('Join for free');
-  });
-
-  it('does not login when using wrong credentials', async () => {
-    let button = element(by.id('play-btn'));
-    let randomName = generateUniqueId();
-
-    button.click();
-    browser.sleep(1000);
-
-    element(by.model('loginUsername')).sendKeys(randomName);
-    element(by.model('loginPassword')).sendKeys('pass');
-
-    let login = element(by.css('#loginForm input[value="Login"]'));
-
-    login.click();
-    browser.sleep(1000);
-
-    let alertDialog = browser.switchTo().alert();
-
-    await expect(alertDialog.getText()).to.eventually.match(/username or password is incorrect./);
-
-    alertDialog.accept();
-  });
-
-  it('registers a new user', async function () {
-    this.timeout(30000); // TODO: Speed up registration action. Takes way too long and times out unless you extend the timeout
-
-    let button = element(by.id('play-btn'));
-    let randomName = generateUniqueId();
-
-    button.click();
-    browser.sleep(1000);
-
-    let registerTab = element(by.linkText('Register'));
-    registerTab.click();
-    element(by.model('registerVals.username')).sendKeys(randomName);
-    element(by.model('registerVals.email')).sendKeys(`${randomName}@example.com`);
-    element(by.model('registerVals.password')).sendKeys('pass');
-    element(by.model('registerVals.confirmPassword')).sendKeys('pass');
-
-    let register = element(by.css('#registrationForm input[type="submit"]'));
-
-    register.click();
-    browser.sleep(3000);
-
-    let url = await browser.getCurrentUrl();
-
-    expect(url).to.not.match(/static\/front/);
-  });
-
-  it('logs in an existing user');
-});

test/client-old/spec/app.js

@@ -1,31 +0,0 @@
-'use strict';
-
-describe('AppJS', function() {
-  describe('Automatic page refresh', function(){
-    var clock;
-    beforeEach(function () {
-      clock = sandbox.useFakeTimers();
-      sandbox.stub(window, "refresher", function(){return true});
-    });
-
-    it('should not call refresher if idle time is less than 6 hours', function() {
-      window.awaitIdle();
-      clock.tick(21599999);
-      expect(window.refresher).to.not.be.called;
-    });
-
-    it('should not call refresher if awaitIdle is called within 6 hours', function() {
-      window.awaitIdle();
-      clock.tick(21500000);
-      window.awaitIdle();
-      clock.tick(21500000);
-      expect(window.refresher).to.not.be.called;
-    });
-
-    it('should call refresher if idle time is 6 hours or greater', function() {
-      window.awaitIdle();
-      clock.tick(21900000);
-      expect(window.refresher).to.be.called;
-    });
-  });
-});

test/client-old/spec/controllers/authCtrlSpec.js

@@ -1,125 +0,0 @@
-'use strict';
-
-describe('Auth Controller', function() {
-  var scope, ctrl, user, $httpBackend, $window, $modal, alert, Auth;
-
-  beforeEach(function(){
-    module(function($provide) {
-      Auth = {
-        runAuth: sandbox.spy(),
-      };
-      $provide.value('Analytics', analyticsMock);
-      $provide.value('Chat', { seenMessage: function() {} });
-      $provide.value('Auth', Auth);
-    });
-
-    inject(function(_$httpBackend_, $rootScope, $controller, _$modal_) {
-      $httpBackend = _$httpBackend_;
-      scope = $rootScope.$new();
-      scope.loginUsername = 'user';
-      scope.loginPassword = 'pass';
-      $window = { location: { href: ""}, alert: sandbox.spy() };
-      $modal = _$modal_;
-      user = { user: {}, authenticate: sandbox.spy() };
-      alert = { authErrorAlert: sandbox.spy() };
-
-      ctrl = $controller('AuthCtrl', {$scope: scope, $window: $window, User: user, Alert: alert});
-    })
-  });
-
-  describe('logging in', function() {
-    it('should log in users with correct uname / pass', function() {
-      $httpBackend.expectPOST('/api/v3/user/auth/local/login').respond({data: {id: 'abc', apiToken: 'abc'}});
-      scope.auth();
-      $httpBackend.flush();
-      expect(Auth.runAuth).to.be.calledOnce;
-      expect(alert.authErrorAlert).to.not.be.called;
-    });
-
-    it('should not log in users with incorrect uname / pass', function() {
-      $httpBackend.expectPOST('/api/v3/user/auth/local/login').respond(404, '');
-      scope.auth();
-      $httpBackend.flush();
-      expect(Auth.runAuth).to.not.be.called;
-      expect(alert.authErrorAlert).to.be.calledOnce;
-    });
-  });
-
-  describe('#clearLocalStorage', function () {
-    var timer;
-
-    beforeEach(function () {
-      timer = sandbox.useFakeTimers();
-      sandbox.stub($modal, 'open');
-    });
-
-    it('opens modal with message about clearing local storage and logging out', function () {
-      scope.clearLocalStorage();
-
-      expect($modal.open).to.be.calledOnce;
-      expect($modal.open).to.be.calledWith({
-        templateUrl: 'modals/message-modal.html',
-        scope: scope
-      });
-
-      expect(scope.messageModal.title).to.eql(window.env.t('localStorageClearing'));
-      expect(scope.messageModal.body).to.eql(window.env.t('localStorageClearingExplanation'));
-    });
-
-    it('does not call $scope.logout before 3 seconds', function () {
-      sandbox.stub(scope, 'logout');
-
-      scope.clearLocalStorage();
-
-      timer.tick(2999);
-
-      expect(scope.logout).to.not.be.called;
-    });
-
-    it('calls $scope.logout after 3 seconds', function () {
-      sandbox.stub(scope, 'logout');
-
-      scope.clearLocalStorage();
-
-      timer.tick(3000);
-
-      expect(scope.logout).to.be.calledOnce;
-    });
-
-    it('does not clear local storage before 3 seconds', function () {
-      sandbox.stub(localStorage, 'clear');
-
-      scope.clearLocalStorage();
-
-      timer.tick(2999);
-
-      expect(localStorage.clear).to.not.be.called;
-    });
-
-    it('clears local storage after 3 seconds', function () {
-      sandbox.stub(localStorage, 'clear');
-
-      scope.clearLocalStorage();
-
-      timer.tick(3000);
-
-      expect(localStorage.clear).to.be.calledOnce;
-    });
-
-    it('does not redirect to /logout route before 3 seconds', function () {
-      scope.clearLocalStorage();
-
-      timer.tick(2999);
-
-      expect($window.location.href).to.eql('');
-    });
-
-    it('redirects to /logout after 3 seconds', function () {
-      scope.clearLocalStorage();
-
-      timer.tick(3000);
-
-      expect($window.location.href).to.eql('/logout');
-    });
-  });
-});

test/client-old/spec/controllers/autocompleteCtrlSpec.js

@@ -1,120 +0,0 @@
-'use strict';
-
-describe("Autocomplete controller", function() {
-  var scope, ctrl, user, $rootScope, $controller;
-
-  beforeEach(function() {
-    module(function($provide) {
-      $provide.value('User', {});
-    });
-
-    inject(function($rootScope, _$controller_){
-      user = specHelper.newUser();
-      user._id = "unique-user-id";
-
-      scope = $rootScope.$new();
-      scope.group = {}
-      scope.group.chat = [];
-
-      $controller = _$controller_;
-
-      // Load RootCtrl to ensure shared behaviors are loaded
-      $controller('RootCtrl',  {$scope: scope, User: {user: user}});
-
-      ctrl = $controller('AutocompleteCtrl', {$scope: scope});
-    });
-  });
-
-  describe("clearUserList", function() {
-    it('calling the function clears the list of usernames and responses', function() {
-      scope.response.push("blah");
-      scope.usernames.push("blub");
-
-      scope.clearUserlist();
-      expect(scope.response).to.be.empty;
-      expect(scope.usernames).to.be.empty;
-    });
-
-    it('the function is called upon initialization of the controller', function() {
-      scope.response.push("blah");
-      scope.response.push("blub");
-      ctrl = $controller('AutocompleteCtrl', {$scope: scope});
-
-      expect(scope.response).to.be.empty;
-      expect(scope.usernames).to.be.empty;
-    });
-  })
-
-  describe("filterUser", function() {
-    it('filters with undefined query (not loaded yet) and returns false (so it will not be rendered)', function() {
-        expect(scope.filterUser({user: "boo"})).to.be.eq(false);
-    });
-
-    it('filters with null query (no typing yet) and returns false (so it will not be rendered)', function() {
-      scope.query = null
-      expect(scope.filterUser({user: "boo"})).to.be.eq(false);
-    });
-
-    it('filters with empty prefix and returns true', function() {
-      scope.query = {text: ""};
-      expect(scope.filterUser({user: "prefix"})).to.be.eq(true);
-    });
-
-    it('filters with prefix element and returns true', function() {
-      scope.query = {text: "pre"}
-      expect(scope.filterUser({user: "prefix"})).to.be.eq(true);
-    });
-
-    it('filters with prefix element of a different case and returns true', function() {
-      scope.query = {text: "pre"}
-      expect(scope.filterUser({user: "Prefix"})).to.be.eq(true);
-    });
-
-    it('filters with nonprefix element and returns false', function() {
-      scope.query = {text: "noprefix"}
-      expect(scope.filterUser({user: "prefix"})).to.be.eq(false);
-    });
-
-    it('filters out system messages (messages without username)', function() {
-      scope.query = {text: "myquery"}
-      expect(scope.filterUser({uuid: "system"})).to.be.eq(false);
-    });
-  });
-
-  describe("performCompletion", function() {
-    it('triggers autoComplete', function() {
-      scope.autoComplete = sandbox.spy();
-
-      var msg = {user: "boo"}; // scope.autoComplete only cares about user
-      scope.query = {text: "b"};
-      scope.performCompletion(msg);
-
-      expect(scope.query).to.be.eq(null);
-      expect(scope.autoComplete.callCount).to.be.eq(1);
-      expect(scope.autoComplete).to.have.been.calledWith(msg);
-    });
-  });
-
-  describe("addNewUser", function() {
-    it('a new message from a new user will modify the usernames', function() {
-      expect(scope.response).to.be.empty;
-      expect(scope.usernames).to.be.empty;
-
-      var msg = {user: "boo"};
-      scope.addNewUser(msg);
-      expect(scope.response[0]).to.be.eq(msg);
-      expect(scope.usernames[0]).to.be.eq("boo");
-    });
-  });
-
-  describe("chatChanged", function() {
-    it('if a new chat arrives, the new user name is extracted', function() {
-      var chatChanged = sandbox.spy(scope, 'chatChanged');
-      scope.$watch('group.chat',scope.chatChanged); // reinstantiate watch so spy works
-
-      scope.$digest(); // trigger watch
-      scope.group.chat.push({msg: "new chat", user: "boo"});
-      expect(chatChanged.callCount).to.be.eq(1);
-    });
-  });
-});

test/client-old/spec/controllers/challengesCtrlSpec.js

@@ -1,774 +0,0 @@
-'use strict';
-
-describe('Challenges Controller', function() {
-  var rootScope, scope, user, User, ctrl, groups, members, notification, state, challenges, tasks, tavernId;
-
-  beforeEach(function() {
-    module(function($provide) {
-      user = specHelper.newUser();
-      User = {
-        getBalanceInGems: sandbox.stub(),
-        sync: sandbox.stub(),
-        user: user
-      }
-      $provide.value('User', User);
-    });
-
-    inject(function($rootScope, $controller, _$state_, _Groups_, _Members_, _Notification_, _Challenges_, _Tasks_, _TAVERN_ID_){
-      scope = $rootScope.$new();
-      rootScope = $rootScope;
-
-      // Load RootCtrl to ensure shared behaviors are loaded
-      $controller('RootCtrl',  {$scope: scope, User: User});
-
-      ctrl = $controller('ChallengesCtrl', {$scope: scope, User: User});
-
-      challenges = _Challenges_;
-      tasks = _Tasks_;
-      groups = _Groups_;
-      members = _Members_;
-      notification = _Notification_;
-      state = _$state_;
-      tavernId = _TAVERN_ID_;
-    });
-  });
-
-  context('filtering', function() {
-    describe('filterChallenges', function() {
-      var ownMem, ownNotMem, notOwnMem, notOwnNotMem;
-
-      beforeEach(function() {
-        ownMem = specHelper.newChallenge({
-          description: 'You are the owner and member',
-          leader: user._id,
-          members: [user],
-          _isMember: true,
-          _id: 'ownMem-id',
-        });
-
-        ownNotMem = specHelper.newChallenge({
-          description: 'You are the owner, but not a member',
-          leader: user._id,
-          members: [],
-          _isMember: false,
-          _id: 'ownNotMem-id',
-        });
-
-        notOwnMem = specHelper.newChallenge({
-          description: 'Not owner but a member',
-          leader: {_id:"test"},
-          members: [user],
-          _isMember: true,
-          _id: 'notOwnMem-id',
-        });
-
-        notOwnNotMem = specHelper.newChallenge({
-          description: 'Not owner or member',
-          leader: {_id:"test"},
-          members: [],
-          _isMember: false,
-          _id: 'notOwnNotMem-id',
-        });
-
-        user.challenges = [ownMem._id, notOwnMem._id];
-
-        scope.search = {
-          group: _.transform(groups, function(m,g){m[g._id]=true;})
-        };
-      });
-
-      it('displays challenges that match membership: either and owner: either', function() {
-        scope.search._isMember = 'either';
-        scope.search._isOwner = 'either';
-        expect(scope.filterChallenges(ownMem)).to.eql(true);
-        expect(scope.filterChallenges(ownNotMem)).to.eql(true);
-        expect(scope.filterChallenges(notOwnMem)).to.eql(true);
-        expect(scope.filterChallenges(notOwnNotMem)).to.eql(true);
-      });
-
-      it('displays challenges that match membership: either and owner: true', function() {
-        scope.search._isMember = 'either';
-        scope.search._isOwner = true;
-        expect(scope.filterChallenges(ownMem)).to.eql(true);
-        expect(scope.filterChallenges(ownNotMem)).to.eql(true);
-        expect(scope.filterChallenges(notOwnMem)).to.eql(false);
-        expect(scope.filterChallenges(notOwnNotMem)).to.eql(false);
-      });
-
-      it('displays challenges that match membership: either and owner: false', function() {
-        scope.search._isMember = 'either';
-        scope.search._isOwner = false;
-        expect(scope.filterChallenges(ownMem)).to.eql(false);
-        expect(scope.filterChallenges(ownNotMem)).to.eql(false);
-        expect(scope.filterChallenges(notOwnMem)).to.eql(true);
-        expect(scope.filterChallenges(notOwnNotMem)).to.eql(true);
-      });
-
-      it('displays challenges that match membership: true and owner: either', function() {
-        scope.search._isMember = true;
-        scope.search._isOwner = 'either';
-        expect(scope.filterChallenges(ownMem)).to.eql(true);
-        expect(scope.filterChallenges(ownNotMem)).to.eql(false);
-        expect(scope.filterChallenges(notOwnMem)).to.eql(true);
-        expect(scope.filterChallenges(notOwnNotMem)).to.eql(false);
-      });
-
-      it('displays challenges that match membership: true and owner: true', function() {
-        scope.search._isMember = true;
-        scope.search._isOwner = true;
-        expect(scope.filterChallenges(ownMem)).to.eql(true);
-        expect(scope.filterChallenges(ownNotMem)).to.eql(false);
-        expect(scope.filterChallenges(notOwnMem)).to.eql(false);
-        expect(scope.filterChallenges(notOwnNotMem)).to.eql(false);
-      });
-
-      it('displays challenges that match membership: true and owner: false', function() {
-        scope.search._isMember = true;
-        scope.search._isOwner = false;
-        expect(scope.filterChallenges(ownMem)).to.eql(false);
-        expect(scope.filterChallenges(ownNotMem)).to.eql(false);
-        expect(scope.filterChallenges(notOwnMem)).to.eql(true);
-        expect(scope.filterChallenges(notOwnNotMem)).to.eql(false);
-      });
-
-      it('displays challenges that match membership: false and owner: either', function() {
-        scope.search._isMember = false;
-        scope.search._isOwner = 'either';
-        expect(scope.filterChallenges(ownMem)).to.eql(false);
-        expect(scope.filterChallenges(ownNotMem)).to.eql(true);
-        expect(scope.filterChallenges(notOwnMem)).to.eql(false);
-        expect(scope.filterChallenges(notOwnNotMem)).to.eql(true);
-      });
-
-      it('displays challenges that match membership: false and owner: true', function() {
-        scope.search._isMember = false;
-        scope.search._isOwner = true;
-        expect(scope.filterChallenges(ownMem)).to.eql(false);
-        expect(scope.filterChallenges(ownNotMem)).to.eql(true);
-        expect(scope.filterChallenges(notOwnMem)).to.eql(false);
-        expect(scope.filterChallenges(notOwnNotMem)).to.eql(false);
-      });
-
-      it('displays challenges that match membership: false and owner: false', function() {
-        scope.search._isMember = false;
-        scope.search._isOwner = false;
-        expect(scope.filterChallenges(ownMem)).to.eql(false);
-        expect(scope.filterChallenges(ownNotMem)).to.eql(false);
-        expect(scope.filterChallenges(notOwnMem)).to.eql(false);
-        expect(scope.filterChallenges(notOwnNotMem)).to.eql(true);
-      });
-
-      it('filters challenges to a single group when group id filter is set', inject(function($controller) {
-        scope.search = { };
-        scope.groupsFilter = {
-          0: specHelper.newGroup({_id: 'group-one'}),
-          1: specHelper.newGroup({_id: 'group-two'}),
-          2: specHelper.newGroup({_id: 'group-three'})
-        };
-
-        scope.groupIdFilter = 'group-one';
-        scope.filterInitialChallenges();
-        expect(scope.search.group).to.eql({'group-one': true});
-      }));
-    });
-
-    describe('selectAll', function() {
-      it('sets all groups in seach.group to true', function() {
-        scope.search = { };
-        scope.groupsFilter = {
-          0: specHelper.newGroup({_id: 'group-one'}),
-          1: specHelper.newGroup({_id: 'group-two'}),
-          2: specHelper.newGroup({_id: 'group-three'})
-        };
-        scope.selectAll();
-
-        expect(scope.search.group).to.eql({
-          'group-one': true,
-          'group-two': true,
-          'group-three': true
-        });
-      });
-    });
-
-    describe('selectNone', function() {
-      it('sets all groups in seach.group to false', function() {
-        scope.search = { };
-        scope.groupsFilter = {
-          0: specHelper.newGroup({_id: 'group-one'}),
-          1: specHelper.newGroup({_id: 'group-two'}),
-          2: specHelper.newGroup({_id: 'group-three'})
-        };
-        scope.selectNone();
-
-        expect(scope.search.group).to.eql({
-          'group-one': false,
-          'group-two': false,
-          'group-three': false
-        });
-      });
-    });
-  });
-
-  context('task manipulation', function() {
-
-    describe('shouldShow', function() {
-      it('overrides task controller function by always returning true', function() {
-        expect(scope.shouldShow()).to.eq(true);
-      });
-    });
-
-    describe('addTask', function() {
-      var challenge;
-
-      beforeEach(function () {
-        challenge = specHelper.newChallenge({
-          description: 'You are the owner and member',
-          leader: user._id,
-          members: [user],
-          _isMember: true
-        });
-      });
-
-      it('adds default task to array', function() {
-        var taskArray = [];
-        var listDef = {
-          newTask: 'new todo text',
-          type: 'todo'
-        }
-
-        scope.addTask(listDef, challenge);
-
-        expect(challenge['todos'].length).to.eql(1);
-        expect(challenge['todos'][0].text).to.eql('new todo text');
-        expect(challenge['todos'][0].type).to.eql('todo');
-      });
-
-      it('adds the task to the front of the array', function() {
-        var previousTask = specHelper.newTodo({ text: 'previous task' });
-        var taskArray = [];
-        challenge['todos'] = [previousTask];
-        var listDef = {
-          newTask: 'new todo',
-          type: 'todo'
-        }
-
-        scope.addTask(listDef, challenge);
-
-        expect(challenge['todos'].length).to.eql(2);
-        expect(challenge['todos'][0].text).to.eql('new todo');
-        expect(challenge['todos'][1].text).to.eql('previous task');
-      });
-
-      it('removes text from new task input box', function() {
-        var taskArray = [];
-        var listDef = {
-          newTask: 'new todo text',
-          type: 'todo'
-        }
-
-        scope.addTask(listDef, challenge);
-
-        expect(listDef.newTask).to.not.exist;
-      });
-    });
-
-    describe('editTask', function() {
-      it('is Tasks.editTask', function() {
-        inject(function(Tasks) {
-          // @TODO: Currently we override the task function in the challenge ctrl, but we should abstract it again
-          // expect(scope.editTask).to.eql(Tasks.editTask);
-        });
-      });
-    });
-
-    describe('removeTask', function() {
-      var task, challenge;
-
-      beforeEach(function() {
-        sandbox.stub(window, 'confirm');
-        task = specHelper.newTodo();
-        challenge = specHelper.newChallenge({
-          description: 'You are the owner and member',
-          leader: user._id,
-          members: [user],
-          _isMember: true
-        });
-        challenge['todos'] = [task];
-      });
-
-      it('asks user to confirm deletion', function() {
-        scope.removeTask(task, challenge);
-        expect(window.confirm).to.be.calledOnce;
-      });
-
-      it('does not remove task from list if not confirmed', function() {
-        window.confirm.returns(false);
-        scope.removeTask(task, challenge);
-
-        expect(challenge['todos']).to.include(task);
-      });
-
-      it('removes task from list', function() {
-        window.confirm.returns(true);
-        scope.removeTask(task, challenge);
-
-        expect(challenge['todos']).to.not.include(task);
-      });
-    });
-
-    describe('saveTask', function() {
-      it('sets task._editing to false', function() {
-        var task = specHelper.newTask({ _editing: true });
-
-        scope.saveTask(task);
-
-        expect(task._editing).to.be.eql(false);
-      });
-    });
-  });
-
-  context('challenge owner interactions', function() {
-    describe("save challenge", function() {
-      var alert, createChallengeSpy, challengeResponse, taskChallengeCreateSpy;
-
-      beforeEach(function(){
-        alert = sandbox.stub(window, "alert");
-        createChallengeSpy = sinon.stub(challenges, 'createChallenge');
-        challengeResponse = {data: {data: {_id: 'new-challenge'}}};
-        createChallengeSpy.returns(Promise.resolve(challengeResponse));
-
-        taskChallengeCreateSpy = sinon.stub(tasks, 'createChallengeTasks');
-        var taskResponse = {data: {data: []}};
-        taskChallengeCreateSpy.returns(Promise.resolve(taskResponse));
-      });
-
-      it("opens an alert box if challenge.group is not specified", function() {
-        var challenge = specHelper.newChallenge({
-          name: 'Challenge without a group',
-          shortName: 'chal without group',
-          group: null
-        });
-
-        scope.save(challenge);
-
-        expect(alert).to.be.calledOnce;
-        expect(alert).to.be.calledWith(window.env.t('selectGroup'));
-      });
-
-      it("opens an alert box if isNew and user does not have enough gems", function() {
-        var challenge = specHelper.newChallenge({
-          name: 'Challenge without enough gems',
-          shortName: 'chal without gem',
-          prize: 5
-        });
-
-        scope.maxPrize = 4;
-        scope.save(challenge);
-
-        expect(alert).to.be.calledOnce;
-        expect(alert).to.be.calledWith(window.env.t('challengeNotEnoughGems'));
-      });
-
-      it("saves the challenge if user does not have enough gems, but the challenge is not new", function() {
-        var updateChallengeSpy = sinon.spy(challenges, 'updateChallenge');
-
-        var challenge = specHelper.newChallenge({
-          _id: 'challenge-has-id-so-its-not-new',
-          name: 'Challenge without enough gems',
-          shortName: 'chal without gem',
-          prize: 5,
-        });
-
-        scope.maxPrize = 0;
-        scope.save(challenge);
-
-        expect(updateChallengeSpy).to.be.calledOnce;
-        expect(alert).to.not.be.called;
-      });
-
-      it("saves the challenge if user has enough gems and challenge is new", function() {
-        var challenge = specHelper.newChallenge({
-          name: 'Challenge without enough gems',
-          shortName: 'chal without gem',
-          prize: 5,
-        });
-
-        scope.maxPrize = 5;
-        scope.save(challenge);
-
-        expect(createChallengeSpy).to.be.calledOnce;
-        expect(alert).to.not.be.called;
-      });
-
-      it('saves challenge and then proceeds to detail page', function(done) {
-        sandbox.stub(state, 'transitionTo');
-
-        var challenge = specHelper.newChallenge({
-          name: 'Challenge',
-          shortName: 'chal',
-        });
-
-        setTimeout(function() {
-          expect(createChallengeSpy).to.be.calledOnce;
-          expect(state.transitionTo).to.be.calledWith(
-            'options.social.challenges.detail',
-            { cid: 'new-challenge' },
-            {
-              reload: true, inherit: false, notify: true
-            }
-          );
-          done();
-        }, 1000);
-
-        scope.save(challenge);
-      });
-
-      it('saves new challenge and syncs User', function(done) {
-        var challenge = specHelper.newChallenge();
-        challenge.shortName = 'chal';
-
-        setTimeout(function() {
-          expect(User.sync).to.be.calledOnce;
-          done();
-        }, 1000);
-
-        scope.save(challenge);
-      });
-
-      it('saves new challenge and syncs User', function(done) {
-        sinon.stub(notification, 'text');
-
-        var challenge = specHelper.newChallenge();
-        challenge.shortName = 'chal';
-
-        setTimeout(function() {
-          expect(notification.text).to.be.calledOnce;
-          expect(notification.text).to.be.calledWith(window.env.t('challengeCreated'));
-          done();
-        }, 1000);
-
-        scope.save(challenge);
-      });
-    });
-
-    describe('create', function() {
-      it('creates new challenge with group that user has selected in filter', function() {
-        var party = specHelper.newGroup({
-          type: 'party',
-          _id: 'user-party'
-        });
-        scope.groupsFilter = [party];
-        scope.search = {
-          group: {
-            'user-party': true
-          }
-        };
-
-        scope.create();
-
-        expect(scope.newChallenge.group).to.eql('user-party');
-      });
-
-      it('uses first group in $scope.groups if more than one exists', function() {
-        var party = specHelper.newGroup({
-          type: 'party',
-          _id: 'user-party'
-        });
-        var guild = specHelper.newGroup({
-          type: 'guild',
-          _id: 'guild'
-        });
-        scope.groups = [party, guild];
-        scope.groupsFilter = [party, guild];
-        scope.search = {
-          group: {
-            'user-party': true,
-            'guild': true
-          }
-        };
-
-        scope.create();
-
-        expect(scope.newChallenge.group).to.eql('user-party');
-      });
-
-      it('defaults to tavern if no group can be set as default', function() {
-        scope.create();
-
-        expect(scope.newChallenge.group).to.eql(tavernId);
-      });
-
-      it('calculates maxPrize', function() {
-        User.getBalanceInGems.returns(20);
-        scope.create();
-
-        expect(scope.maxPrize).to.eql(20);
-      });
-
-      it('sets newChallenge to a blank challenge', function() {
-        scope.create();
-
-        var chal = scope.newChallenge;
-
-        expect(chal.name).to.eql('');
-        expect(chal.description).to.eql('');
-        expect(chal.habits).to.eql([]);
-        expect(chal.dailys).to.eql([]);
-        expect(chal.todos).to.eql([]);
-        expect(chal.rewards).to.eql([]);
-        expect(chal.leader).to.eql('unique-user-id');
-        expect(chal.group).to.eql(tavernId);
-        expect(chal.timestamp).to.be.greaterThan(0);
-        expect(chal.official).to.eql(false);
-      });
-    });
-
-    describe('insufficientGemsForTavernChallenge', function() {
-      context('tavern challenge', function() {
-        it('returns true if user has no gems', function() {
-          User.user.balance = 0;
-          scope.newChallenge = specHelper.newChallenge({
-            group: tavernId
-          });
-
-          var cannotCreateTavernChallenge = scope.insufficientGemsForTavernChallenge();
-          expect(cannotCreateTavernChallenge).to.eql(true);
-        });
-
-        it('returns false if user has gems', function() {
-          User.user.balance = .25;
-          scope.newChallenge = specHelper.newChallenge({
-            group: tavernId
-          });
-
-          var cannotCreateTavernChallenge = scope.insufficientGemsForTavernChallenge();
-          expect(cannotCreateTavernChallenge).to.eql(false);
-        });
-      });
-
-      context('non-tavern challenge', function() {
-        it('returns false', function() {
-          User.user.balance = 0;
-          scope.newChallenge = specHelper.newChallenge({
-            group: 'not-tavern'
-          });
-
-          var cannotCreateTavernChallenge = scope.insufficientGemsForTavernChallenge();
-          expect(cannotCreateTavernChallenge).to.eql(false);
-        });
-      });
-    });
-
-    describe('edit', function() {
-      it('transitions to edit page', function() {
-        sandbox.stub(state, 'transitionTo');
-        var challenge = specHelper.newChallenge({
-          _id: 'challenge-id'
-        });
-
-        scope.edit(challenge);
-
-        expect(state.transitionTo).to.be.calledOnce;
-        expect(state.transitionTo).to.be.calledWith(
-          'options.social.challenges.edit',
-          { cid: challenge._id },
-          { reload: true, inherit: false, notify: true }
-        );
-      });
-    });
-
-    describe('discard', function() {
-      it('sets new challenge to null', function() {
-        scope.newChallenge = specHelper.newChallenge();
-
-        scope.discard();
-
-        expect(scope.newChallenge).to.not.exist;
-      });
-    });
-
-    describe('clone', function() {
-
-      var challengeToClone = {
-        name: 'copyChallenge',
-        description: 'copyChallenge',
-        habits: [specHelper.newHabit()],
-        dailys: [specHelper.newDaily()],
-        todos: [specHelper.newTodo()],
-        rewards: [specHelper.newReward()],
-        leader: 'unique-user-id',
-        group: { _id: "copyGroup" },
-        timestamp: new Date("October 13, 2014 11:13:00"),
-        members: ['id', 'another-id'],
-        official: true,
-        _isMember: true,
-        prize: 1
-      };
-
-      it('Clones the basic challenge info', function() {
-
-        scope.clone(challengeToClone);
-
-        expect(scope.newChallenge.name).to.eql(challengeToClone.name);
-        expect(scope.newChallenge.shortName).to.eql(challengeToClone.shortName);
-        expect(scope.newChallenge.description).to.eql(challengeToClone.description);
-        expect(scope.newChallenge.leader).to.eql(user._id);
-        expect(scope.newChallenge.group).to.eql(challengeToClone.group._id);
-        expect(scope.newChallenge.official).to.eql(challengeToClone.official);
-        expect(scope.newChallenge.prize).to.eql(challengeToClone.prize);
-      });
-
-      it('does not clone members', function() {
-        scope.clone(challengeToClone);
-
-        expect(scope.newChallenge.members).to.not.exist;
-      });
-
-      it('does not clone timestamp', function() {
-        scope.clone(challengeToClone);
-
-        expect(scope.newChallenge.timestamp).to.not.exist;
-      });
-
-      it('clones habits', function() {
-        scope.clone(challengeToClone);
-
-        expect(scope.newChallenge.habits.length).to.eql(challengeToClone.habits.length);
-        expect(scope.newChallenge.habits[0].text).to.eql(challengeToClone.habits[0].text);
-        expect(scope.newChallenge.habits[0].notes).to.eql(challengeToClone.habits[0].notes);
-      });
-
-      it('clones dailys', function() {
-        scope.clone(challengeToClone);
-
-        expect(scope.newChallenge.dailys.length).to.eql(challengeToClone.dailys.length);
-        expect(scope.newChallenge.dailys[0].text).to.eql(challengeToClone.dailys[0].text);
-        expect(scope.newChallenge.dailys[0].notes).to.eql(challengeToClone.dailys[0].notes);
-      });
-
-      it('clones todos', function() {
-        scope.clone(challengeToClone);
-
-        expect(scope.newChallenge.todos.length).to.eql(challengeToClone.todos.length);
-        expect(scope.newChallenge.todos[0].text).to.eql(challengeToClone.todos[0].text);
-        expect(scope.newChallenge.todos[0].notes).to.eql(challengeToClone.todos[0].notes);
-      });
-
-      it('clones rewards', function() {
-        scope.clone(challengeToClone);
-
-        expect(scope.newChallenge.rewards.length).to.eql(challengeToClone.rewards.length);
-        expect(scope.newChallenge.rewards[0].text).to.eql(challengeToClone.rewards[0].text);
-        expect(scope.newChallenge.rewards[0].notes).to.eql(challengeToClone.rewards[0].notes);
-      });
-    });
-  });
-
-  context('User interactions', function() {
-    describe('join', function() {
-      it('calls challenge join', function(){
-        var joinChallengeSpy = sinon.spy(challenges, 'joinChallenge');
-
-        var challenge = specHelper.newChallenge({
-          _id: 'challenge-to-join',
-        });
-
-        scope.join(challenge);
-
-        expect(joinChallengeSpy).to.be.calledOnce;
-      });
-    });
-
-    describe('clickLeave', function() {
-      var clickEvent = {
-        target: 'button'
-      };
-
-      it('sets selectedChal to passed in challenge', function() {
-        var challenge = specHelper.newChallenge({
-          _id: 'popover-challenge-to-leave'
-        });
-
-        expect(scope.selectedChal).to.not.exist;
-
-        scope.clickLeave(challenge, clickEvent);
-        expect(scope.selectedChal).to.eql(challenge);
-      });
-
-      it('creates popover element', function() {
-        var challenge = specHelper.newChallenge({
-          _id: 'popover-challenge-to-leave'
-        });
-
-        expect(scope.popoverEl).to.not.exist;
-        scope.clickLeave(challenge, clickEvent);
-        expect(scope.popoverEl).to.exist;
-      });
-    });
-
-    describe('leave', function() {
-      var challenge = specHelper.newChallenge({
-        _id: 'challenge-to-leave',
-      });
-
-      var clickEvent = {
-        target: 'button'
-      };
-
-      it('removes selectedChal when cancel is chosen', function() {
-        scope.clickLeave(challenge, clickEvent);
-
-        expect(scope.selectedChal).to.eql(challenge);
-
-        scope.leave('cancel');
-        expect(scope.selectedChal).to.not.exist;
-      });
-
-      it('calls challenge leave when anything but cancel is chosen', function() {
-        var leaveChallengeSpy = sinon.spy(challenges, 'leaveChallenge');
-        scope.clickLeave(challenge, clickEvent);
-
-        scope.leave('not-cancel', challenge);
-        expect(leaveChallengeSpy).to.be.calledOnce;
-      });
-    });
-  });
-
-  context('modal actions', function() {
-    beforeEach(function() {
-      sandbox.stub(members, 'selectMember');
-      sandbox.stub(rootScope, 'openModal');
-      members.selectMember.returns(Promise.resolve());
-    });
-
-    describe('sendMessageToChallengeParticipant', function() {
-      it('opens private-message modal', function(done) {
-        scope.sendMessageToChallengeParticipant(user._id);
-
-        setTimeout(function() {
-          expect(rootScope.openModal).to.be.calledOnce;
-          expect(rootScope.openModal).to.be.calledWith(
-            'private-message',
-            { controller: 'MemberModalCtrl' }
-          );
-          done();
-        }, 1000);
-      });
-    });
-
-    describe('sendGiftToChallengeParticipant', function() {
-      it('opens send-gift modal', function(done) {
-        scope.sendGiftToChallengeParticipant(user._id);
-
-        setTimeout(function() {
-          expect(rootScope.openModal).to.be.calledOnce;
-          expect(rootScope.openModal).to.be.calledWith(
-            'send-gift',
-            { controller: 'MemberModalCtrl' }
-          );
-          done();
-        }, 1000);
-      });
-    });
-  });
-});

test/client-old/spec/controllers/chatCtrlSpec.js

@@ -1,121 +0,0 @@
-'use strict';
-
-describe("Chat Controller", function() {
-  var scope, ctrl, user, $rootScope, $controller, $httpBackend, html;
-
-  beforeEach(function() {
-    module(function($provide) {
-      $provide.value('User', {});
-    });
-
-    inject(function(_$rootScope_, _$controller_, _$compile_, _$httpBackend_){
-      user = specHelper.newUser();
-      user._id = "unique-user-id";
-      $rootScope = _$rootScope_;
-
-      scope = _$rootScope_.$new();
-
-      $controller = _$controller_;
-      $httpBackend = _$httpBackend_;
-
-      // Load RootCtrl to ensure shared behaviors are loaded
-      $controller('RootCtrl',  {$scope: scope, User: {user: user}});
-
-      html = _$compile_('<div><form ng-submit="postChat(group, message.content)"><textarea submit-on-meta-enter ng-model="message.content" ng-model-options="{debounce: 250}"></textarea></form></div>')(scope);
-      document.body.appendChild(html[0]);
-      ctrl = $controller('ChatCtrl', {$scope: scope, $element: html});
-    });
-  });
-  
-  afterEach(function() {
-    html.remove();
-  });
-
-  describe('copyToDo', function() {
-    it('when copying a user message it opens modal with information from message', function() {
-      scope.group = {
-        name: "Princess Bride"
-      };
-
-      var modalSpy = sandbox.spy($rootScope, "openModal");
-      var message = {
-        uuid: 'the-dread-pirate-roberts',
-        user: 'Wesley',
-        text: 'As you wish'
-      };
-
-      scope.copyToDo(message);
-
-      modalSpy.should.have.been.calledOnce;
-
-      modalSpy.should.have.been.calledWith('copyChatToDo', sinon.match(function(callArgToMatch){
-        return callArgToMatch.controller == 'CopyMessageModalCtrl'
-            && callArgToMatch.scope.text == message.text
-      }));
-    });
-
-    it('when copying a system message it opens modal with information from message', function() {
-      scope.group = {
-        name: "Princess Bride"
-      };
-
-      var modalSpy = sandbox.spy($rootScope, "openModal");
-      var message = {
-        uuid: 'system',
-        text: 'Wesley attacked the ROUS in the Fire Swamp'
-      };
-
-      scope.copyToDo(message);
-
-      modalSpy.should.have.been.calledOnce;
-
-      modalSpy.should.have.been.calledWith('copyChatToDo', sinon.match(function(callArgToMatch){
-        return callArgToMatch.controller == 'CopyMessageModalCtrl'
-            && callArgToMatch.scope.text == message.text
-      }));
-    });
-  });
-  
-  it('updates model on enter key press', function() {
-    // Set initial state of the page with some dummy data.
-    scope.group = { name: 'group' };
-    
-    // The main controller is going to try to fetch the template right off. 
-    // No big deal, just return an empty string.
-    $httpBackend.when('GET', 'partials/main.html').respond('');
-
-    // Let the page settle, and the controllers set their initial state.
-    $rootScope.$digest();
-
-    // Watch for calls to postChat & make sure it doesn't do anything.
-    let postChatSpy = sandbox.stub(scope, 'postChat');
-    
-    // Pretend we typed 'aaa' into the textarea.
-    var textarea = html.find('textarea');    
-    textarea[0].value = 'aaa';
-    let inputEvent = new Event('input');
-    textarea[0].dispatchEvent(inputEvent);
-
-    // Give a change for the ng-model watchers to notice that the value in the
-    // textarea has changed.
-    $rootScope.$digest();
-    
-    // Since no time has elapsed and we debounce the model change, we should 
-    // see no model update just yet.
-    expect(scope.message.content).to.equal('');
-    
-    // Now, press the enter key in the textarea. We use jquery here to paper 
-    // over browser differences with initializing the keyboard event.
-    var keyboardEvent = jQuery.Event('keydown', {keyCode: 13, key: 'Enter', metaKey: true});
-    jQuery(textarea).trigger(keyboardEvent);
-
-    // Now, allow the model to update given the changes to the page still
-    // without letting any time elapse...
-    $rootScope.$digest();
-    
-    // ... and nevertheless seeing the desired call to postChat with the right
-    // data. Yay!
-    postChatSpy.should.have.been.calledWith(scope.group, 'aaa');
-  });
-});
-

test/client-old/spec/controllers/copyMessageModalControllerSpec.js

@@ -1,59 +0,0 @@
-'use strict';
-
-describe("CopyMessageModal controller", function() {
-  var scope, ctrl, user, Notification, $rootScope, $controller;
-
-  beforeEach(function() {
-    module(function($provide) {
-      var mockWindow = {href: '', alert: sandbox.spy(), location: {search: '', pathname: '', href: ''}};
-
-      $provide.value('$window', mockWindow);
-    });
-
-    inject(function($rootScope, _$controller_, _Notification_, User){
-      user = specHelper.newUser();
-      user._id = "unique-user-id";
-      user.ops = {
-        addTask: sandbox.spy()
-      };
-
-      scope = $rootScope.$new();
-      scope.$close = sandbox.spy();
-
-      $controller = _$controller_;
-
-      User.setUser(user);
-
-      // Load RootCtrl to ensure shared behaviors are loaded
-      $controller('RootCtrl',  {$scope: scope, User: User});
-
-      ctrl = $controller('CopyMessageModalCtrl', {$scope: scope, User: User});
-
-      Notification = _Notification_;
-      Notification.text = sandbox.spy();
-    });
-  });
-
-  describe("saveTodo", function() {
-    it('saves todo', function() {
-
-      scope.text = "A Tavern msg";
-      scope.notes = "Some notes";
-      var payload = {
-        body: {
-          text: scope.text,
-          type: 'todo',
-          notes: scope.notes
-        }
-      };
-
-      scope.saveTodo();
-
-      user.ops.addTask.should.have.been.calledOnce;
-      user.ops.addTask.should.have.been.calledWith(payload);
-      Notification.text.should.have.been.calledOnce;
-      Notification.text.should.have.been.calledWith(window.env.t('messageAddedAsToDo'));
-      scope.$close.should.have.been.calledOnce;
-    });
-  });
-});

test/client-old/spec/controllers/filtersCtrlSpec.js

@@ -1,51 +0,0 @@
-'use strict';
-
-describe('Filters Controller', function() {
-  var scope, user, userService;
-
-  beforeEach(function () {
-    module(function($provide) {
-      var mockWindow = {href: '', alert: sandbox.spy(), location: {search: '', pathname: '', href: ''}};
-
-      $provide.value('$window', mockWindow);
-    });
-
-    inject(function($rootScope, $controller, Shared, User) {
-      user = specHelper.newUser();
-      Shared.wrap(user);
-      scope = $rootScope.$new();
-      // user.filters = {};
-      User.setUser(user);
-      User.user.filters = {};
-      userService = User;
-      $controller('FiltersCtrl', {$scope: scope, User: User});
-    })
-  });
-
-  describe('tags', function(){
-    it('creates a tag', function(){
-      scope._newTag = {name:'tagName'}
-      scope.createTag();
-      expect(user.tags).to.have.length(1);
-      expect(user.tags[0].name).to.eql('tagName');
-      expect(user.tags[0]).to.have.property('id');
-    });
-
-    it('toggles tag filtering', inject(function(Shared){
-      var tag = {id: Shared.uuid(), name: 'myTag'};
-      scope.toggleFilter(tag);
-      expect(userService.user.filters[tag.id]).to.eql(true);
-      scope.toggleFilter(tag);
-      expect(userService.user.filters[tag.id]).to.not.eql(true);
-    }));
-  });
-
-  describe('updateTaskFilter', function(){
-    it('updatest user\'s filter query with the value of filterQuery', function () {
-      scope.filterQuery = 'task';
-      scope.updateTaskFilter();
-
-      expect(userService.user.filterQuery).to.eql(scope.filterQuery);
-    });
-  });
-});

test/client-old/spec/controllers/footerCtrlSpec.js

@@ -1,86 +0,0 @@
-'use strict';
-
-describe('Footer Controller', function() {
-  var scope, user, User;
-
-  beforeEach(inject(function($rootScope, $controller) {
-    user = specHelper.newUser();
-    User = {
-      log: sandbox.stub(),
-      set: sandbox.stub(),
-      addTenGems: sandbox.stub(),
-      addHourglass: sandbox.stub(),
-      user: user
-    };
-    scope = $rootScope.$new();
-    $controller('FooterCtrl', {$scope: scope, User: User, Social: {}});
-  }));
-
-  context('Debug mode', function() {
-    before(function() {
-      window.env.NODE_ENV = 'test';
-    });
-
-    after(function() {
-      delete window.env.NODE_ENV;
-    });
-
-    describe('#setHealthLow', function(){
-      it('sets user health to 1');
-    });
-
-    describe('#addMissedDay', function(){
-      beforeEach(function() {
-        sandbox.stub(confirm).returns(true);
-      });
-
-      it('Cancels if confirm box is not confirmed');
-
-      it('allows multiple days');
-
-      it('sets users last cron');
-
-      it('notifies uers');
-    });
-
-    describe('#addTenGems', function() {
-      it('posts to /user/addTenGems', inject(function($httpBackend) {
-        scope.addTenGems();
-
-        expect(User.addTenGems).to.have.been.called;
-      }));
-    });
-
-    describe('#addHourglass', function() {
-      it('posts to /user/addHourglass', inject(function($httpBackend) {
-        scope.addHourglass();
-
-        expect(User.addHourglass).to.have.been.called;
-      }));
-    });
-
-    describe('#addGold', function() {
-      it('adds 500 gold to user');
-    });
-
-    describe('#addMana', function() {
-      it('adds 500 mana to user');
-    });
-
-    describe('#addLevelsAndGold', function() {
-      it('adds 10000 experience to user');
-
-      it('adds 10000 gp to user');
-
-      it('adds 10000 mp to user');
-    });
-
-    describe('#addOneLevel', function() {
-      it('adds one level to user');
-    });
-
-    describe('#addBossQuestProgressUp', function() {
-      it('adds 1000 progress to quest.progress.up');
-    });
-  });
-});

test/client-old/spec/controllers/groupCtrlSpec.js

@@ -1,279 +0,0 @@
-'use strict';
-
-describe('Groups Controller', function() {
-  var scope, ctrl, groups, user, guild, $rootScope;
-
-  beforeEach(function() {
-    module(function($provide) {
-      $provide.value('User', {});
-    });
-
-    inject(function($rootScope, $controller, Groups){
-      user = specHelper.newUser();
-      user._id = "unique-user-id";
-
-      scope = $rootScope.$new();
-
-      // Load RootCtrl to ensure shared behaviors are loaded
-      $controller('RootCtrl',  {$scope: scope, User: {user: user}});
-
-      ctrl = $controller('GroupsCtrl', {$scope: scope, User: {user: user}});
-
-      groups = Groups;
-    });
-  });
-
-  describe("isMemberOfPendingQuest", function() {
-    var party;
-    var partyStub;
-
-    beforeEach(function () {
-      party = specHelper.newGroup({
-        _id: "unique-party-id",
-        type: 'party',
-        members: ['leader-id'] // Ensure we wouldn't pass automatically.
-      });
-
-      partyStub = sandbox.stub(groups, "party", function() {
-        return party;
-      });
-    });
-
-    it("returns false if group is does not have a quest", function() {
-      expect(scope.isMemberOfPendingQuest(user._id, party)).to.not.be.ok;
-    });
-
-    it("returns false if group quest has not members", function() {
-      party.quest = {
-        'key': 'random-key',
-      };
-      expect(scope.isMemberOfPendingQuest(user._id, party)).to.not.be.ok;
-    });
-
-    it("returns false if group quest is active", function() {
-      party.quest = {
-        'key': 'random-key',
-        'members': {},
-        'active': true,
-      };
-      party.quest.members[user._id] = true;
-      expect(scope.isMemberOfPendingQuest(user._id, party)).to.not.be.ok;
-    });
-
-    it("returns true if user is a member of a pending quest", function() {
-      party.quest = {
-        'key': 'random-key',
-        'members': {},
-      };
-      party.quest.members[user._id] = true;
-      expect(scope.isMemberOfPendingQuest(user._id, party)).to.be.ok;
-    });
-  });
-
-  describe("isMemberOfGroup", function() {
-    it("returns true if group is the user's party retrieved from groups service", function() {
-      var party = specHelper.newGroup({
-        _id: "unique-party-id",
-        type: 'party',
-        members: ['leader-id'] // Ensure we wouldn't pass automatically.
-      });
-
-      var partyStub = sandbox.stub(groups, "party", function() {
-        return party;
-      });
-
-      expect(scope.isMemberOfGroup(user._id, party)).to.be.ok;
-    });
-
-    it('returns true if guild is included in myGuilds call', function(){
-
-      var guild = specHelper.newGroup({
-        _id: "unique-guild-id",
-        type: 'guild',
-        members: [user._id]
-      });
-
-      user.guilds = [guild._id];
-
-      expect(scope.isMemberOfGroup(user._id, guild)).to.be.ok;
-    });
-
-    it('does not return true if guild is not included in myGuilds call', function(){
-
-      var guild = specHelper.newGroup({
-        _id: "unique-guild-id",
-        type: 'guild',
-        members: ['not-user-id']
-      });
-
-      user.guilds = [];
-
-      expect(scope.isMemberOfGroup(user._id, guild)).to.not.be.ok;
-    });
-  });
-
-  describe('isAbleToEditGroup', () => {
-    var guild;
-
-    beforeEach(() => {
-      user.contributor = {};
-      guild = specHelper.newGroup({
-        _id: 'unique-guild-id',
-        type: 'guild',
-        members: ['not-user-id'],
-        $save: sandbox.spy(),
-      });
-    });
-
-    it('returns true if user is an admin', () => {
-      guild.leader = 'not-user-id';
-      user.contributor.admin = true;
-      expect(scope.isAbleToEditGroup(guild)).to.be.ok;
-    });
-
-    it('returns true if user is group leader', () => {
-      guild.leader = {_id: user._id}
-      expect(scope.isAbleToEditGroup(guild)).to.be.ok;
-    });
-
-    it('returns false is user is not a leader or admin', () => {
-      expect(scope.isAbleToEditGroup(guild)).to.not.be.ok;
-    });
-
-    it('returns false is user is an admin but group is a party', () => {
-      guild.type = 'party';
-      user.contributor.admin = true;
-      expect(scope.isAbleToEditGroup(guild)).to.not.be.ok;
-    });
-  });
-
-  describe('editGroup', () => {
-    var guild;
-
-    beforeEach(() => {
-      guild = specHelper.newGroup({
-        _id: 'unique-guild-id',
-        leader: 'old leader',
-        type: 'guild',
-        members: ['not-user-id'],
-        $save: sandbox.spy(),
-      });
-    });
-
-    it('marks group as being in edit mode', () => {
-      scope.editGroup(guild);
-
-      expect(guild._editing).to.eql(true);
-    });
-
-    it('copies group to groupCopy', () => {
-      scope.editGroup(guild);
-
-      for (var key in scope.groupCopy) {
-        expect(scope.groupCopy[key]).to.eql(guild[key]);
-      }
-    });
-
-    it('does not change original group when groupCopy is changed', () => {
-      scope.editGroup(guild);
-
-      scope.groupCopy.leader = 'new leader';
-      expect(scope.groupCopy.leader).to.not.eql(guild.leader);
-    });
-  });
-
-  describe('saveEdit', () => {
-    let guild;
-
-    beforeEach(() => {
-      guild = specHelper.newGroup({
-        _id: 'unique-guild-id',
-        name: 'old name',
-        leader: 'old leader',
-        type: 'guild',
-        members: ['not-user-id'],
-        $save: () => {},
-      });
-
-      scope.editGroup(guild);
-    });
-
-    it('calls group update', () => {
-      let guildUpdate = sandbox.spy(groups.Group, 'update');
-
-      scope.saveEdit(guild);
-
-      expect(guildUpdate).to.be.calledOnce;
-    });
-
-    it('calls cancelEdit', () => {
-      sandbox.stub(scope, 'cancelEdit');
-
-      scope.saveEdit(guild);
-
-      expect(scope.cancelEdit).to.be.calledOnce;
-    });
-
-    it('applies changes to groupCopy to original group', () => {
-      scope.groupCopy.name = 'new name';
-
-      scope.saveEdit(guild);
-
-      expect(guild.name).to.eql('new name');
-    });
-
-    it('assigns leader id to group if leader has changed', () => {
-      scope.groupCopy._newLeader = { _id: 'some leader id' };
-
-      scope.saveEdit(guild);
-
-      expect(guild.leader).to.eql('some leader id');
-    });
-
-    it('does not assign new leader id if leader object is not passed in', () => {
-      scope.groupCopy._newLeader = 'not an object';
-
-      scope.saveEdit(guild);
-
-      expect(guild.leader).to.eql('old leader');
-    });
-  });
-
-  describe('cancelEdit', () => {
-    beforeEach(() => {
-      guild = specHelper.newGroup({
-        _id: 'unique-guild-id',
-        name: 'old name',
-        leader: 'old leader',
-        type: 'guild',
-        members: ['not-user-id'],
-        $save: () => {},
-      });
-
-      scope.editGroup(guild);
-    });
-
-    it('sets _editing to false on group', () => {
-      expect(guild._editing).to.eql(true);
-
-      scope.cancelEdit(guild);
-
-      expect(guild._editing).to.eql(false);
-    });
-
-    it('reset groupCopy to an empty object', () => {
-      expect(scope.groupCopy).to.not.eql({});
-
-      scope.cancelEdit(guild);
-
-      expect(scope.groupCopy).to.eql({});
-    });
-  });
-
-  /* TODO: Modal testing */
-  describe.skip("deleteAllMessages", function() { });
-  describe.skip("clickMember", function() { });
-  describe.skip("removeMember", function() { });
-  describe.skip("confirmRemoveMember", function() { });
-  describe.skip("quickReply", function() { });
-});

test/client-old/spec/controllers/groupTaskActionsCtrlSpec.js

@@ -1,63 +0,0 @@
-describe('Group Tasks Meta Actions Controller', () => {
-  let rootScope, scope, user, userSerivce;
-
-  beforeEach(() => {
-    module(function($provide) {
-      $provide.value('User', {});
-    });
-
-    inject(($rootScope, $controller) => {
-      rootScope = $rootScope;
-
-      user = specHelper.newUser();
-      user._id = "unique-user-id";
-      userSerivce = {user: user};
-
-      scope = $rootScope.$new();
-
-      scope.task = {
-        group: {
-          assignedUsers: [],
-          approval: {
-            required: false,
-          }
-        },
-      };
-      scope.task._edit = angular.copy(scope.task);
-
-      $controller('GroupTaskActionsCtrl', {$scope: scope, User: userSerivce});
-    });
-  });
-
-  describe('toggleTaskRequiresApproval', function () {
-    it('toggles task approval required field from false to true', function () {
-      scope.toggleTaskRequiresApproval();
-      expect(scope.task._edit.group.approval.required).to.be.true;
-    });
-
-    it('toggles task approval required field from true to false', function () {
-      scope.task._edit.group.approval.required = true;
-      scope.toggleTaskRequiresApproval();
-      expect(scope.task._edit.group.approval.required).to.be.false;
-    });
-  });
-
-
-  describe('assign events', function () {
-    it('adds a group member to assigned users on "addedGroupMember" event ', () => {
-      var testId = 'test-id';
-      rootScope.$broadcast('addedGroupMember', testId);
-      expect(scope.task.group.assignedUsers).to.contain(testId);
-      expect(scope.task._edit.group.assignedUsers).to.contain(testId);
-    });
-
-    it('removes a group member to assigned users on "addedGroupMember" event ', () => {
-      var testId = 'test-id';
-      scope.task.group.assignedUsers.push(testId);
-      scope.task._edit.group.assignedUsers.push(testId);
-      rootScope.$broadcast('removedGroupMember', testId);
-      expect(scope.task.group.assignedUsers).to.not.contain(testId);
-      expect(scope.task._edit.group.assignedUsers).to.not.contain(testId);
-    });
-  });
-});