3.80.0

* Ensured upgraded groups are charge correctly

* Added names to magic numbers

* Limited group fields query

.eslintignore

@@ -8,16 +8,13 @@ dist/
 dist-client/
 
 # Not linted
-migrations/*
 website/client-old/
-scripts/*
-test/server_side/**/*
 test/client-old/spec/**/*
 
 # Temporarilly disabled. These should be removed when the linting errors are fixed TODO
-website/common/script/content/index.js
+migrations/*
+scripts/*
 website/common/browserify.js
-test/content/**/*
 Gruntfile.js
 gulpfile.js
 gulp

bower.json

@@ -30,7 +30,7 @@
     "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.13.4",
+    "hello": "1.14.1",
     "jquery": "2.1.0",
     "jquery-colorbox": "1.4.36",
     "jquery-ui": "1.10.3",

config.json.example

@@ -73,7 +73,7 @@
     "LOGGLY_ACCOUNT": "account",
     "PUSH_CONFIGS": {
         "GCM_SERVER_API_KEY": "",
-        "APN_ENABLED": "true",
+        "APN_ENABLED": "false",
         "FCM_SERVER_API_KEY": ""
     },
     "PUSHER": {

gulp/gulp-build.js

@@ -25,7 +25,7 @@ gulp.task('build:common', () => {
 
 gulp.task('build:server', ['build:src', 'build:common']);
 
-gulp.task('build:dev', ['browserify', 'prepare:staticNewStuff', 'semantic-ui'], (done) => {
+gulp.task('build:dev', ['browserify', 'prepare:staticNewStuff'], (done) => {
   gulp.start('grunt-build:dev', done);
 });
 
@@ -33,7 +33,7 @@ gulp.task('build:dev:watch', ['build:dev'], () => {
   gulp.watch(['website/client-old/**/*.styl', 'website/common/script/*']);
 });
 
-gulp.task('build:prod', ['browserify', 'build:server', 'prepare:staticNewStuff', 'semantic-ui'], (done) => {
+gulp.task('build:prod', ['browserify', 'build:server', 'prepare:staticNewStuff'], (done) => {
   runSequence(
     'grunt-build:prod',
     'apidoc',

gulp/gulp-semanticui.js

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

gulp/gulp-transifex-test.js

@@ -67,7 +67,7 @@ gulp.task('transifex:malformedStrings', () => {
   let stringsWithIncorrectNumberOfInterpolations = [];
 
   let count = 0;
-  _(ALL_LANGUAGES).each(function (lang) {
+  _.each(ALL_LANGUAGES, function (lang) {
 
     _.each(stringsToLookFor, function (strings, file) {
       let translationFile = fs.readFileSync(LOCALES + lang + '/' + file);
@@ -89,7 +89,7 @@ gulp.task('transifex:malformedStrings', () => {
         }
       });
     });
-  }).value();
+  });
 
   if (!_.isEmpty(stringsWithMalformedInterpolations)) {
     let message = 'The following strings have malformed or missing interpolations';
@@ -114,7 +114,7 @@ function getArrayOfLanguages () {
 function eachTranslationFile (languages, cb) {
   let jsonFiles = stripOutNonJsonFiles(fs.readdirSync(ENGLISH_LOCALE));
 
-  _(languages).each((lang) => {
+  _.each(languages, (lang) => {
     _.each(jsonFiles, (filename) => {
       try {
         var translationFile = fs.readFileSync(LOCALES + lang + '/' + filename);
@@ -128,7 +128,7 @@ function eachTranslationFile (languages, cb) {
 
       cb(null, lang, filename, parsedEnglishFile, parsedTranslationFile);
     });
-  }).value();
+  });
 }
 
 function eachTranslationString (languages, cb) {
@@ -153,7 +153,7 @@ function formatMessageForPosting (msg, items) {
 function getStringsWith (json, interpolationRegex) {
   var strings = {};
 
-  _(json).each(function (file_name) {
+  _.each(json, function (file_name) {
     var raw_file = fs.readFileSync(ENGLISH_LOCALE + file_name);
     var parsed_json = JSON.parse(raw_file);
 
@@ -162,7 +162,7 @@ function getStringsWith (json, interpolationRegex) {
       var match = value.match(interpolationRegex);
       if (match) strings[file_name][key] = match;
     });
-  }).value();
+  });
 
   return strings;
 }

gulpfile.js

@@ -9,7 +9,6 @@
 require('babel-register');
 
 if (process.env.NODE_ENV === 'production') {
-  require('./gulp/gulp-semanticui');
   require('./gulp/gulp-apidoc');
   require('./gulp/gulp-newstuff');
   require('./gulp/gulp-build');

migrations/20130204_count_habits.js

@@ -1,5 +1,12 @@
 // %mongo server:27017/dbname underscore.js my_commands.js
 // %mongo server:27017/dbname underscore.js --shell
+
+// IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+// We've now upgraded to lodash v4 but the code used in this migration has not been
+// adapted to work with it. Before this migration is used again any lodash method should
+// be checked for compatibility against the v4 changelog and changed if necessary.
+// https://github.com/lodash/lodash/wiki/Changelog#v400
+
 var habits = 0,
     dailies = 0,
     todos = 0,

migrations/20130326_migrate_pets.js

@@ -3,6 +3,12 @@
  */
 // mongo habitrpg ./node_modules/underscore/underscore.js ./migrations/20130326_migrate_pets.js
 
+// IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+// We've now upgraded to lodash v4 but the code used in this migration has not been
+// adapted to work with it. Before this migration is used again any lodash method should
+// be checked for compatibility against the v4 changelog and changed if necessary.
+// https://github.com/lodash/lodash/wiki/Changelog#v400
+
 var mapping = {
     bearcub: {name:'BearCub', modifier: 'Base'},
     cactus: {name:'Cactus', modifier:'Base'},

migrations/20130327_apply_tokens.js

@@ -4,6 +4,12 @@
 
 // mongo habitrpg ./node_modules/underscore/underscore.js migrations/20130327_apply_tokens.js
 
+// IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+// We've now upgraded to lodash v4 but the code used in this migration has not been
+// adapted to work with it. Before this migration is used again any lodash method should
+// be checked for compatibility against the v4 changelog and changed if necessary.
+// https://github.com/lodash/lodash/wiki/Changelog#v400
+
 var mapping = [
     {
         tier: 1,

migrations/20130508_fix_duff_party_subscriptions.js

@@ -6,6 +6,11 @@
  * mongo habitrpg ./node_modules/underscore/underscore.js ./migrations/20130508_fix_duff_party_subscriptions.js
  */
 
+// IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+// We've now upgraded to lodash v4 but the code used in this migration has not been
+// adapted to work with it. Before this migration is used again any lodash method should
+// be checked for compatibility against the v4 changelog and changed if necessary.
+// https://github.com/lodash/lodash/wiki/Changelog#v400
 
 // since our primary subscription will first hit parties now, we *definitely* need an index there
 db.parties.ensureIndex( { 'members': 1}, {background: true} );

migrations/20130602_survey_rewards.js

@@ -1,5 +1,11 @@
 //mongo habitrpg ./node_modules/lodash/lodash.js migrations/20130602_survey_rewards.js
 
+// IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+// We've now upgraded to lodash v4 but the code used in this migration has not been
+// adapted to work with it. Before this migration is used again any lodash method should
+// be checked for compatibility against the v4 changelog and changed if necessary.
+// https://github.com/lodash/lodash/wiki/Changelog#v400
+
 var members = []
 members = _.uniq(members);
 

migrations/20130908_cleanup_derby_corruption.js

@@ -3,6 +3,12 @@
 // Racer was notorious for adding duplicates, randomly deleting documents, etc. Once we pull the plug on old.habit,
 // run this migration to cleanup all the corruption
 
+// IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+// We've now upgraded to lodash v4 but the code used in this migration has not been
+// adapted to work with it. Before this migration is used again any lodash method should
+// be checked for compatibility against the v4 changelog and changed if necessary.
+// https://github.com/lodash/lodash/wiki/Changelog#v400
+
 db.users.find().forEach(function(user){
 
   // remove corrupt tasks, which will either be null-value or no id

migrations/20131028_task_subdocs_tags_invites.js

@@ -5,6 +5,12 @@
 // @see http://stackoverflow.com/questions/14867697/mongoose-full-collection-scan
 //Also, what do we think of a Mongoose Migration module? something like https://github.com/madhums/mongoose-migrate
 
+// IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+// We've now upgraded to lodash v4 but the code used in this migration has not been
+// adapted to work with it. Before this migration is used again any lodash method should
+// be checked for compatibility against the v4 changelog and changed if necessary.
+// https://github.com/lodash/lodash/wiki/Changelog#v400
+
 db.users.find().forEach(function(user){
 
   // Add invites to groups

migrations/20131104_restore_lost_task_data.js

@@ -8,6 +8,12 @@
 var mongo = require('mongoskin');
 var _ = require('lodash');
 
+// IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+// We've now upgraded to lodash v4 but the code used in this migration has not been
+// adapted to work with it. Before this migration is used again any lodash method should
+// be checked for compatibility against the v4 changelog and changed if necessary.
+// https://github.com/lodash/lodash/wiki/Changelog#v400
+
 var backupUsers = mongo.db('localhost:27017/habitrpg_old?auto_reconnect').collection('users');
 var liveUsers = mongo.db('localhost:27017/habitrpg_new?auto_reconnect').collection('users');
 

migrations/20131127_restore_dayStart.js

@@ -1,5 +1,11 @@
 // node .migrations/20131127_restore_dayStart.js
 
+// IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+// We've now upgraded to lodash v4 but the code used in this migration has not been
+// adapted to work with it. Before this migration is used again any lodash method should
+// be checked for compatibility against the v4 changelog and changed if necessary.
+// https://github.com/lodash/lodash/wiki/Changelog#v400
+
 var mongo = require('mongoskin');
 var _ = require('lodash');
 

migrations/20131214_classes.coffee

@@ -8,6 +8,12 @@ mongo = require('mongoskin')
 _ = require('lodash')
 async = require('async')
 
+# IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+# We've now upgraded to lodash v4 but the code used in this migration has not been
+# adapted to work with it. Before this migration is used again any lodash method should
+# be checked for compatibility against the v4 changelog and changed if necessary.
+# https://github.com/lodash/lodash/wiki/Changelog#v400
+
 db = mongo.db('localhost:27017/habitrpg?auto_reconnect')
 
 ###

migrations/20131221_restore_NaN_history.js

@@ -1,5 +1,11 @@
 // node .migrations/20131221_restore_NaN_history.js
 
+// IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+// We've now upgraded to lodash v4 but the code used in this migration has not been
+// adapted to work with it. Before this migration is used again any lodash method should
+// be checked for compatibility against the v4 changelog and changed if necessary.
+// https://github.com/lodash/lodash/wiki/Changelog#v400
+
 /**
  * After the classes migration, users lost some history entries
  */

migrations/20131225_restore_streaks.js

@@ -1,5 +1,11 @@
 // node .migrations/20131225_restore_streaks.js
 
+// IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+// We've now upgraded to lodash v4 but the code used in this migration has not been
+// adapted to work with it. Before this migration is used again any lodash method should
+// be checked for compatibility against the v4 changelog and changed if necessary.
+// https://github.com/lodash/lodash/wiki/Changelog#v400
+
 /**
  * After the classes migration, users lost some history entries
  */

migrations/20140823_remove_undefined_and_false_notifications.js

@@ -5,6 +5,12 @@ var migrationName = '20140823_remove_undefined_and_false_notifications';
 var authorName = 'Alys'; // in case script author needs to know when their ...
 var authorUuid = 'd904bd62-da08-416b-a816-ba797c9ee265'; //... own data is done
 
+// IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+// We've now upgraded to lodash v4 but the code used in this migration has not been
+// adapted to work with it. Before this migration is used again any lodash method should
+// be checked for compatibility against the v4 changelog and changed if necessary.
+// https://github.com/lodash/lodash/wiki/Changelog#v400
+
 /**
  * https://github.com/HabitRPG/habitrpg/pull/3907
  */

migrations/20140829_change_headAccessory_to_eyewear.js

@@ -4,6 +4,12 @@ var migrationName = '20140829_change_headAccessory_to_eyewear';
 var authorName = 'Alys'; // in case script author needs to know when their ...
 var authorUuid = 'd904bd62-da08-416b-a816-ba797c9ee265'; //... own data is done
 
+// IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+// We've now upgraded to lodash v4 but the code used in this migration has not been
+// adapted to work with it. Before this migration is used again any lodash method should
+// be checked for compatibility against the v4 changelog and changed if necessary.
+// https://github.com/lodash/lodash/wiki/Changelog#v400
+
 /**
  * https://github.com/HabitRPG/habitrpg/issues/3645
  */

migrations/20140831_increase_gems_for_previous_contributions.js

@@ -4,6 +4,11 @@
 //
 // node 20140831_increase_gems_for_previous_contributions.js  > 20140831_increase_gems_for_previous_contributions_output.txt
 
+// IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+// We've now upgraded to lodash v4 but the code used in this migration has not been
+// adapted to work with it. Before this migration is used again any lodash method should
+// be checked for compatibility against the v4 changelog and changed if necessary.
+// https://github.com/lodash/lodash/wiki/Changelog#v400
 
 var migrationName = '20140831_increase_gems_for_previous_contributions';
 

migrations/20140914_upgrade_admin_contrib_tiers.js

@@ -8,6 +8,12 @@ var authorUuid = 'd904bd62-da08-416b-a816-ba797c9ee265'; //... own data is done
  * Convert Tier 7 contributors with admin flag to Tier 8 (moderators).
  */
 
+// IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+// We've now upgraded to lodash v4 but the code used in this migration has not been
+// adapted to work with it. Before this migration is used again any lodash method should
+// be checked for compatibility against the v4 changelog and changed if necessary.
+// https://github.com/lodash/lodash/wiki/Changelog#v400
+
 var mongo = require('mongoskin');
 var _ = require('lodash');
 

migrations/20141117_consecutive_months.js

@@ -1,3 +1,9 @@
+// IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+// We've now upgraded to lodash v4 but the code used in this migration has not been
+// adapted to work with it. Before this migration is used again any lodash method should
+// be checked for compatibility against the v4 changelog and changed if necessary.
+// https://github.com/lodash/lodash/wiki/Changelog#v400
+
 // require moment, lodash
 db.users.find(
   {'purchased.plan.customerId':{$ne:null}},

migrations/20150124_mountmaster_fix.js

@@ -9,6 +9,12 @@ var authorUuid = 'd904bd62-da08-416b-a816-ba797c9ee265'; //... own data is done
 
 var dbserver = 'localhost:27017' // CHANGE THIS FOR PRODUCTION DATABASE
 
+// IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+// We've now upgraded to lodash v4 but the code used in this migration has not been
+// adapted to work with it. Before this migration is used again any lodash method should
+// be checked for compatibility against the v4 changelog and changed if necessary.
+// https://github.com/lodash/lodash/wiki/Changelog#v400
+
 var mongo = require('mongoskin');
 var _ = require('lodash');
 

migrations/20150131_birthday_goodies_fix_remove_robe.js

@@ -8,6 +8,12 @@ var authorUuid = 'd904bd62-da08-416b-a816-ba797c9ee265'; //... own data is done
 
 var dbserver = 'localhost:27017' // CHANGE THIS FOR PRODUCTION DATABASE
 
+// IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+// We've now upgraded to lodash v4 but the code used in this migration has not been
+// adapted to work with it. Before this migration is used again any lodash method should
+// be checked for compatibility against the v4 changelog and changed if necessary.
+// https://github.com/lodash/lodash/wiki/Changelog#v400
+
 var mongo = require('mongoskin');
 var _ = require('lodash');
 

migrations/20150201_convert_creation_date_from_string_to_object.js

@@ -19,6 +19,12 @@ var authorUuid = 'd904bd62-da08-416b-a816-ba797c9ee265'; //... own data is done
 
 var dbserver = 'localhost:27017' // CHANGE THIS FOR PRODUCTION DATABASE
 
+// IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+// We've now upgraded to lodash v4 but the code used in this migration has not been
+// adapted to work with it. Before this migration is used again any lodash method should
+// be checked for compatibility against the v4 changelog and changed if necessary.
+// https://github.com/lodash/lodash/wiki/Changelog#v400
+
 var mongo = require('mongoskin');
 var _ = require('lodash');
 var moment = require('moment');

migrations/20150224_force_resting_in_inn.js

@@ -6,6 +6,12 @@ var authorUuid = 'd904bd62-da08-416b-a816-ba797c9ee265'; //... own data is done
  * force all active players to rest in the inn due to massive server fail
  */
 
+// IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+// We've now upgraded to lodash v4 but the code used in this migration has not been
+// adapted to work with it. Before this migration is used again any lodash method should
+// be checked for compatibility against the v4 changelog and changed if necessary.
+// https://github.com/lodash/lodash/wiki/Changelog#v400
+
 var dbserver = 'localhost:27017' // CHANGE THIS FOR PRODUCTION DATABASE
 
 var mongo = require('mongoskin');

migrations/20150604_ultimateGearSets.js

@@ -19,6 +19,12 @@ var authorUuid = 'd904bd62-da08-416b-a816-ba797c9ee265'; //... own data is done
  * means minimal new testing.
  */
 
+// IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+// We've now upgraded to lodash v4 but the code used in this migration has not been
+// adapted to work with it. Before this migration is used again any lodash method should
+// be checked for compatibility against the v4 changelog and changed if necessary.
+// https://github.com/lodash/lodash/wiki/Changelog#v400
+
 var dbserver = 'localhost:27017' // FOR TEST DATABASE
 // var dbserver = 'username:password@ds031379-a0.mongolab.com:31379' // FOR PRODUCTION DATABASE
 var dbname = 'habitrpg';

migrations/20160111_challenges_condense_same_day_history_entries.js

@@ -7,6 +7,12 @@ var migrationName = '20160111_challenges_condense_same_day_history_entries.js';
 var dbserver = '';
 var dbname = '';
 
+// IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+// We've now upgraded to lodash v4 but the code used in this migration has not been
+// adapted to work with it. Before this migration is used again any lodash method should
+// be checked for compatibility against the v4 changelog and changed if necessary.
+// https://github.com/lodash/lodash/wiki/Changelog#v400
+
 var mongo = require('mongoskin');
 var _ = require('lodash');
 var moment = require('moment');

migrations/20160129_habit_birthday.js

@@ -11,6 +11,12 @@ var dbserver = 'localhost:27017'; // FOR TEST DATABASE
 // var dbserver = 'username:password@ds031379-a0.mongolab.com:31379'; // FOR PRODUCTION DATABASE
 var dbname = 'habitrpg';
 
+// IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+// We've now upgraded to lodash v4 but the code used in this migration has not been
+// adapted to work with it. Before this migration is used again any lodash method should
+// be checked for compatibility against the v4 changelog and changed if necessary.
+// https://github.com/lodash/lodash/wiki/Changelog#v400
+
 var mongo = require('mongoskin');
 var _ = require('lodash');
 

migrations/20160521_veteran_ladder.js

@@ -14,6 +14,12 @@ var dbname = 'habitrpg';
 var mongo = require('mongoskin');
 var _ = require('lodash');
 
+// IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+// We've now upgraded to lodash v4 but the code used in this migration has not been
+// adapted to work with it. Before this migration is used again any lodash method should
+// be checked for compatibility against the v4 changelog and changed if necessary.
+// https://github.com/lodash/lodash/wiki/Changelog#v400
+
 var dbUsers = mongo.db(dbserver + '/' + dbname + '?auto_reconnect').collection('users');
 
 // specify a query to limit the affected users (empty for all users):

migrations/20160527_fix_empty_checklist_id.js

@@ -2,6 +2,12 @@ var uuid = require('uuid').v4;
 var mongo = require('mongodb').MongoClient;
 var _ = require('lodash');
 
+// IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+// We've now upgraded to lodash v4 but the code used in this migration has not been
+// adapted to work with it. Before this migration is used again any lodash method should
+// be checked for compatibility against the v4 changelog and changed if necessary.
+// https://github.com/lodash/lodash/wiki/Changelog#v400
+
 var taskIds = require('checklists-no-id.json').map(function (obj) {
   return obj._id;
 });

migrations/api_v3/challenges.js

@@ -6,6 +6,12 @@
 
 // Due to some big user profiles it needs more RAM than is allowed by default by v8 (arounf 1.7GB).
 // Run the script with --max-old-space-size=4096 to allow up to 4GB of RAM
+
+// IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+// We've now upgraded to lodash v4 but the code used in this migration has not been
+// adapted to work with it. Before this migration is used again any lodash method should
+// be checked for compatibility against the v4 changelog and changed if necessary.
+// https://github.com/lodash/lodash/wiki/Changelog#v400
 console.log('Starting migrations/api_v3/challenges.js.');
 
 require('babel-register');

migrations/api_v3/challengesMembers.js

@@ -9,6 +9,12 @@
 // Run the script with --max-old-space-size=4096 to allow up to 4GB of RAM
 console.log('Starting migrations/api_v3/challengesMembers.js.');
 
+// IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+// We've now upgraded to lodash v4 but the code used in this migration has not been
+// adapted to work with it. Before this migration is used again any lodash method should
+// be checked for compatibility against the v4 changelog and changed if necessary.
+// https://github.com/lodash/lodash/wiki/Changelog#v400
+
 require('babel-register');
 require('babel-polyfill');
 

migrations/api_v3/coupons.js

@@ -8,6 +8,12 @@
 // Run the script with --max-old-space-size=4096 to allow up to 4GB of RAM
 console.log('Starting migrations/api_v3/coupons.js.');
 
+// IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+// We've now upgraded to lodash v4 but the code used in this migration has not been
+// adapted to work with it. Before this migration is used again any lodash method should
+// be checked for compatibility against the v4 changelog and changed if necessary.
+// https://github.com/lodash/lodash/wiki/Changelog#v400
+
 require('babel-register');
 require('babel-polyfill');
 

migrations/api_v3/emailUnsubscriptions.js

@@ -8,6 +8,12 @@
 // Run the script with --max-old-space-size=4096 to allow up to 4GB of RAM
 console.log('Starting migrations/api_v3/unsubscriptions.js.');
 
+// IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+// We've now upgraded to lodash v4 but the code used in this migration has not been
+// adapted to work with it. Before this migration is used again any lodash method should
+// be checked for compatibility against the v4 changelog and changed if necessary.
+// https://github.com/lodash/lodash/wiki/Changelog#v400
+
 require('babel-register');
 require('babel-polyfill');
 

migrations/api_v3/groups.js

@@ -16,6 +16,12 @@
 // Run the script with --max-old-space-size=4096 to allow up to 4GB of RAM
 console.log('Starting migrations/api_v3/groups.js.');
 
+// IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+// We've now upgraded to lodash v4 but the code used in this migration has not been
+// adapted to work with it. Before this migration is used again any lodash method should
+// be checked for compatibility against the v4 changelog and changed if necessary.
+// https://github.com/lodash/lodash/wiki/Changelog#v400
+
 require('babel-register');
 require('babel-polyfill');
 

migrations/api_v3/users.js

@@ -9,6 +9,12 @@
 // Run the script with --max-old-space-size=4096 to allow up to 4GB of RAM
 console.log('Starting migrations/api_v3/users.js.');
 
+// IMPORTANT NOTE: this migration was written when we were using version 3 of lodash.
+// We've now upgraded to lodash v4 but the code used in this migration has not been
+// adapted to work with it. Before this migration is used again any lodash method should
+// be checked for compatibility against the v4 changelog and changed if necessary.
+// https://github.com/lodash/lodash/wiki/Changelog#v400
+
 require('babel-register');
 require('babel-polyfill');
 

migrations/find_unique_user.js

@@ -7,6 +7,6 @@
 
 db.users.find().forEach(function(user){
   user.tasks = user.habits.concat(user.dailys).concat(user.todos).concat(user.rewards);
-  var found = _.any(user.tasks, {text: ""})
+  var found = _.some(user.tasks, {text: ""})
   if (found) printjson({id:user._id, auth:user.auth});
 })

migrations/groups/add-unlimited-subscription.js

@@ -0,0 +1,33 @@
+var migrationName = 'AddUnlimitedSubscription';
+var authorName = 'TheHollidayInn'; // in case script author needs to know when their ...
+var authorUuid = ''; //... own data is done
+
+/*
+ * This migrations will add a free subscription to a specified group
+ */
+
+import { model as Group } from '../../website/server/models/group';
+
+// @TODO: this should probably be a GroupManager library method
+async function addUnlimitedSubscription (groupId) {
+    let group = await Group.findById(groupId);
+
+    group.purchased.plan.customerId = "group-unlimited";
+    group.purchased.plan.dateCreated = new Date();
+    group.purchased.plan.dateUpdated = new Date();
+    group.purchased.plan.paymentMethod = "Group Unlimited";
+    group.purchased.plan.planId = "group_monthly";
+    group.purchased.plan.dateTerminated = null;
+    // group.purchased.plan.owner = ObjectId();
+    group.purchased.plan.subscriptionId = "";
+
+    return group.save();
+};
+
+module.exports = async function addUnlimitedSubscriptionCreator () {
+    let groupId = process.argv[2];
+
+    if (!groupId) throw Error('Group ID is required');
+
+    let result = await addUnlimitedSubscription(groupId)
+};

migrations/groups/create-group.js

@@ -0,0 +1,32 @@
+import Bluebird from 'bluebird';
+
+import { model as Group } from '../../website/server/models/group';
+import { model as User } from '../../website/server/models/user';
+
+// @TODO: this should probably be a GroupManager library method
+async function createGroup (name, privacy, type, leaderId) {
+    let user = await User.findById(leaderId);
+    
+    let group = new Group({
+        name,
+        privacy,
+        type,
+    });
+
+    group.leader = user._id;
+    user.guilds.push(group._id);
+
+    return Bluebird.all([group.save(), user.save()]);
+};
+
+module.exports = async function groupCreator () {
+    let name = process.argv[2];
+    let privacy = process.argv[3];
+    let type = process.argv[4];
+    let leaderId  = process.argv[5];
+
+    let result = await createGroup(name, privacy, type, leaderId)
+};
+
+
+

migrations/groups/habitrpg-jackalopes.js

@@ -0,0 +1,46 @@
+var migrationName = 'Jackalopes for Unlimited Subscribers';
+
+/*
+ * This migration will find users with unlimited subscriptions who are also eligible for Jackalope mounts, and award them
+ */
+import Bluebird from 'bluebird';
+
+import { model as Group } from '../../website/server/models/group';
+import { model as User } from '../../website/server/models/user';
+import * as payments from '../../website/server/libs/payments';
+
+async function handOutJackalopes () {
+  let promises = [];
+  let cursor = User.find({
+    'purchased.plan.customerId':'habitrpg',
+  }).cursor();
+
+  cursor.on('data', async function(user) {
+    console.log('User: ' + user._id);
+
+    let groupList = [];
+    if (user.party._id) groupList.push(user.party._id);
+    groupList = groupList.concat(user.guilds);
+
+    let subscribedGroup =
+      await Group.findOne({
+        '_id': {$in: groupList},
+        'purchased.plan.planId': 'group_monthly',
+        'purchased.plan.dateTerminated': null,
+      },
+      {'_id':1}
+    );
+
+    if (subscribedGroup) {
+      User.update({'_id':user._id},{$set:{'items.mounts.Jackalope-RoyalPurple':true}}).exec();
+      promises.push(user.save());
+    }
+  });
+
+  cursor.on('close', async function() {
+    console.log('done');
+    return await Bluebird.all(promises);
+  });
+};
+
+module.exports = handOutJackalopes;

migrations/groups/update-groups-with-group-plans.js

@@ -0,0 +1,33 @@
+var migrationName = 'ResyncGroupPlanMembers';
+var authorName = 'TheHollidayInn'; // in case script author needs to know when their ...
+var authorUuid = ''; //... own data is done
+
+/*
+ * This migrations will iterate through all groups with a group plan a subscription and resync the free
+ * subscription to all members
+ */
+
+import Bluebird from 'bluebird';
+
+import { model as Group } from '../../website/server/models/group';
+import * as payments from '../../website/server/libs/payments';
+
+async function updateGroupsWithGroupPlans () {
+  let cursor = Group.find({
+    'purchased.plan.planId': 'group_monthly',
+    'purchased.plan.dateTerminated': null,
+  }).cursor();
+
+  let promises = [];
+
+  cursor.on('data', function(group) {
+    promises.push(payments.addSubscriptionToGroupUsers(group));
+    promises.push(group.save())
+  });
+
+  cursor.on('close', async function() {
+    return await Bluebird.all(promises);
+  });
+};
+
+module.exports = updateGroupsWithGroupPlans;

migrations/manual_password_reset.js

@@ -1,6 +1,9 @@
 // EMAIL="x@y.com" node ./migrations/manual_password_reset.js
 // Be sure to have PRODUCTION_DB in your config.json
 
+// IMPORTANT: this script isn't updated to use the new password encryption that uses bcrypt
+// using it will break accounts and should not be used until upgraded
+
 var nconf = require('nconf'),
   path = require('path');
 nconf.argv().env().file('user', path.join(path.resolve(__dirname, '../config.json')));

migrations/migration-runner.js

@@ -17,5 +17,8 @@ function setUpServer () {
 setUpServer();
 
 // Replace this with your migration
-var processUsers = require('./new_stuff');
-processUsers();
+var processUsers = require('./groups/update-groups-with-group-plans');
+processUsers()
+  .catch(function (err) {
+      console.log(err)
+  })

package.json

@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "3.77.0",
+  "version": "3.80.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@slack/client": "^3.8.1",
@@ -28,6 +28,7 @@
     "bcrypt": "^1.0.2",
     "bluebird": "^3.3.5",
     "body-parser": "^1.15.0",
+    "bootstrap": "^4.0.0-alpha.6",
     "bower": "~1.3.12",
     "browserify": "~12.0.1",
     "compression": "^1.6.1",
@@ -70,20 +71,18 @@
     "jade": "~1.11.0",
     "jquery": "^3.1.1",
     "js2xmlparser": "~1.0.0",
-    "less": "^2.7.1",
-    "less-loader": "^2.2.3",
-    "lodash": "^3.10.1",
-    "lodash.pickby": "^4.2.0",
-    "lodash.setwith": "^4.2.0",
+    "lodash": "^4.17.4",
     "merge-stream": "^1.0.0",
     "method-override": "^2.3.5",
     "moment": "^2.13.0",
-    "mongoose": "^4.7.1",
+    "moment-recur": "habitrpg/moment-recur#v1.0.6",
+    "mongoose": "^4.8.6",
     "mongoose-id-autoinc": "~2013.7.14-4",
     "morgan": "^1.7.0",
     "nconf": "~0.8.2",
     "nib": "^1.1.0",
     "node-gcm": "^0.14.4",
+    "node-sass": "^4.5.0",
     "nodemailer": "^2.3.2",
     "object-path": "^0.9.2",
     "ora": "^1.1.0",
@@ -103,7 +102,7 @@
     "rimraf": "^2.4.3",
     "run-sequence": "^1.1.4",
     "s3-upload-stream": "^1.0.6",
-    "semantic-ui-less": "~2.2.4",
+    "sass-loader": "^6.0.2",
     "serve-favicon": "^2.3.0",
     "shelljs": "^0.7.6",
     "stripe": "^4.2.0",
@@ -117,6 +116,7 @@
     "vinyl-source-stream": "^1.1.0",
     "vue": "^2.1.0",
     "vue-loader": "^11.0.0",
+    "vue-mugen-scroll": "^0.2.1",
     "vue-router": "^2.0.0-rc.5",
     "vue-style-loader": "^2.0.0",
     "vue-template-compiler": "^2.1.10",
@@ -171,7 +171,7 @@
     "csv": "~0.3.6",
     "deep-diff": "~0.1.4",
     "eslint": "^3.0.0",
-    "eslint-config-habitrpg": "^2.0.0",
+    "eslint-config-habitrpg": "^3.0.0",
     "eslint-friendly-formatter": "^2.0.5",
     "eslint-loader": "^1.3.0",
     "eslint-plugin-html": "^2.0.0",
@@ -191,6 +191,7 @@
     "karma-mocha-reporter": "^1.1.1",
     "karma-phantomjs-launcher": "^1.0.0",
     "karma-sinon-chai": "^1.2.0",
+    "karma-sinon-stub-promise": "^1.0.0",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.24",
     "karma-webpack": "^2.0.2",

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

@@ -117,7 +117,6 @@ describe('POST /challenges/:challengeId/leave', () => {
       });
 
       expect(testTask).to.not.be.undefined;
-      expect(testTask.challenge).to.eql({});
     });
   });
 });

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

@@ -7,6 +7,7 @@ import {
 import {
   TAVERN_ID,
 } from '../../../../../website/server/models/group';
+import apiMessages from '../../../../../website/server/libs/apiMessages';
 
 describe('GET /groups', () => {
   let user;
@@ -14,6 +15,7 @@ describe('GET /groups', () => {
   const NUMBER_OF_PUBLIC_GUILDS_USER_IS_MEMBER = 1;
   const NUMBER_OF_USERS_PRIVATE_GUILDS = 1;
   const NUMBER_OF_GROUPS_USER_CAN_VIEW = 5;
+  const GUILD_PER_PAGE = 30;
 
   before(async () => {
     await resetHabiticaDB();
@@ -98,6 +100,60 @@ describe('GET /groups', () => {
       .to.eventually.have.a.lengthOf(NUMBER_OF_PUBLIC_GUILDS);
   });
 
+  describe('public guilds pagination', () => {
+    it('req.query.paginate must be a boolean string', async () => {
+      await expect(user.get('/groups?paginate=aString&type=publicGuilds'))
+        .to.eventually.be.rejected.and.eql({
+          code: 400,
+          error: 'BadRequest',
+          message: 'Invalid request parameters.',
+        });
+    });
+
+    it('req.query.paginate can only be true when req.query.type includes publicGuilds', async () => {
+      await expect(user.get('/groups?paginate=true&type=notPublicGuilds'))
+        .to.eventually.be.rejected.and.eql({
+          code: 400,
+          error: 'BadRequest',
+          message: apiMessages('guildsOnlyPaginate'),
+        });
+    });
+
+    it('req.query.page can\'t be negative', async () => {
+      await expect(user.get('/groups?paginate=true&page=-1&type=publicGuilds'))
+        .to.eventually.be.rejected.and.eql({
+          code: 400,
+          error: 'BadRequest',
+          message: 'Invalid request parameters.',
+        });
+    });
+
+    it('returns 30 guilds per page ordered by number of members', async () => {
+      await user.update({balance: 9000});
+      let groups = await Promise.all(_.times(60, (i) => {
+        return generateGroup(user, {
+          name: `public guild ${i} - is member`,
+          type: 'guild',
+          privacy: 'public',
+        });
+      }));
+
+      // update group number 32 and not the first to make sure sorting works
+      await groups[32].update({name: 'guild with most members', memberCount: 199});
+      await groups[33].update({name: 'guild with less members', memberCount: -100});
+
+      let page0 = await expect(user.get('/groups?type=publicGuilds&paginate=true'))
+        .to.eventually.have.a.lengthOf(GUILD_PER_PAGE);
+      expect(page0[0].name).to.equal('guild with most members');
+
+      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');
+    });
+  });
+
   it('returns all the user\'s guilds when guilds passed in as query', async () => {
     await expect(user.get('/groups?type=guilds'))
       .to.eventually.have.a.lengthOf(NUMBER_OF_PUBLIC_GUILDS_USER_IS_MEMBER + NUMBER_OF_USERS_PRIVATE_GUILDS);

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

@@ -84,7 +84,7 @@ describe('GET /groups/:groupId/members', () => {
     expect(Object.keys(memberRes.auth)).to.eql(['timestamps']);
     expect(Object.keys(memberRes.preferences).sort()).to.eql([
       'size', 'hair', 'skin', 'shirt',
-      'chair', 'costume', 'sleep', 'background',
+      'chair', 'costume', 'sleep', 'background', 'tasks',
     ].sort());
 
     expect(memberRes.stats.maxMP).to.exist;

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

@@ -78,7 +78,7 @@ describe('POST /groups/:groupId/leave', () => {
         expect(leader.newMessages[groupToLeave._id]).to.be.empty;
       });
 
-      context('With challenges', () => {
+      context('with challenges', () => {
         let challenge;
 
         beforeEach(async () => {
@@ -106,10 +106,25 @@ describe('POST /groups/:groupId/leave', () => {
 
           let userWithChallengeTasks = await leader.get('/user');
 
-          expect(userWithChallengeTasks.challenges).to.not.include(challenge._id);
           // @TODO find elegant way to assert against the task existing
           expect(userWithChallengeTasks.tasksOrder.habits).to.not.be.empty;
         });
+
+        it('keeps the user in the challenge when the keepChallenges parameter is set to remain-in-challenges', async () => {
+          await leader.post(`/groups/${groupToLeave._id}/leave`, {keepChallenges: 'remain-in-challenges'});
+
+          let userWithChallengeTasks = await leader.get('/user');
+
+          expect(userWithChallengeTasks.challenges).to.include(challenge._id);
+        });
+
+        it('drops the user in the challenge when the keepChallenges parameter isn\'t set', async () => {
+          await leader.post(`/groups/${groupToLeave._id}/leave`);
+
+          let userWithChallengeTasks = await leader.get('/user');
+
+          expect(userWithChallengeTasks.challenges).to.not.include(challenge._id);
+        });
       });
 
       it('prevents quest leader from leaving a groupToLeave');

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

@@ -1,5 +1,6 @@
 import {
   generateUser,
+  generateGroup,
   translate as t,
 } from '../../../../helpers/api-v3-integration.helper';
 import { v4 as generateUUID } from 'uuid';
@@ -12,7 +13,7 @@ describe('Post /groups/:groupId/invite', () => {
   let groupName = 'Test Public Guild';
 
   beforeEach(async () => {
-    inviter = await generateUser({balance: 1});
+    inviter = await generateUser({balance: 4});
     group = await inviter.post('/groups', {
       name: groupName,
       type: 'guild',
@@ -265,6 +266,25 @@ describe('Post /groups/:groupId/invite', () => {
       expect(invitedUser.invitations.guilds[0].id).to.equal(group._id);
       expect(invite).to.exist;
     });
+
+    it('invites marks invite with cancelled plan', async () => {
+      let cancelledPlanGroup = await generateGroup(inviter, {
+        type: 'guild',
+        name: generateUUID(),
+      });
+      await cancelledPlanGroup.createCancelledSubscription();
+
+      let newUser = await generateUser();
+      let invite = await inviter.post(`/groups/${cancelledPlanGroup._id}/invite`, {
+        uuids: [newUser._id],
+        emails: [{name: 'test', email: 'test@habitica.com'}],
+      });
+      let invitedUser = await newUser.get('/user');
+
+      expect(invitedUser.invitations.guilds[0].id).to.equal(cancelledPlanGroup._id);
+      expect(invitedUser.invitations.guilds[0].cancelledPlan).to.be.true;
+      expect(invite).to.exist;
+    });
   });
 
   describe('guild invites', () => {

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

@@ -43,4 +43,15 @@ describe('PUT /group', () => {
     expect(updatedGroup.leader.profile.name).to.eql(leader.profile.name);
     expect(updatedGroup.name).to.equal(groupUpdatedName);
   });
+
+  it('allows a leader to change leaders', async () => {
+    let updatedGroup = await leader.put(`/groups/${groupToUpdate._id}`, {
+      name: groupUpdatedName,
+      leader: nonLeader._id,
+    });
+
+    expect(updatedGroup.leader._id).to.eql(nonLeader._id);
+    expect(updatedGroup.leader.profile.name).to.eql(nonLeader.profile.name);
+    expect(updatedGroup.name).to.equal(groupUpdatedName);
+  });
 });

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

@@ -37,7 +37,7 @@ describe('GET /members/:memberId', () => {
     expect(Object.keys(memberRes.auth)).to.eql(['timestamps']);
     expect(Object.keys(memberRes.preferences).sort()).to.eql([
       'size', 'hair', 'skin', 'shirt',
-      'chair', 'costume', 'sleep', 'background',
+      'chair', 'costume', 'sleep', 'background', 'tasks',
     ].sort());
 
     expect(memberRes.stats.maxMP).to.exist;

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

@@ -315,6 +315,30 @@ describe('POST /tasks/:id/score/:direction', () => {
 
       expect(updatedUser.stats.gp).to.be.greaterThan(user.stats.gp);
     });
+
+    it('adds score notes to task', async () => {
+      let scoreNotesString = 'test-notes';
+
+      await user.post(`/tasks/${habit._id}/score/up`, {
+        scoreNotes: scoreNotesString,
+      });
+      let updatedTask = await user.get(`/tasks/${habit._id}`);
+
+      expect(updatedTask.history[0].scoreNotes).to.eql(scoreNotesString);
+    });
+
+    it('errors when score notes are too large', async () => {
+      let scoreNotesString = new Array(258).join('a');
+
+      await expect(user.post(`/tasks/${habit._id}/score/up`, {
+        scoreNotes: scoreNotesString,
+      }))
+      .to.eventually.be.rejected.and.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('taskScoreNotesTooLong'),
+      });
+    });
   });
 
   context('reward', () => {

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

@@ -496,6 +496,8 @@ describe('POST /tasks/user', () => {
         frequency: 'daily',
         everyX: 5,
         startDate: now,
+        daysOfMonth: [15],
+        weeksOfMonth: [3],
       });
 
       expect(task.userId).to.equal(user._id);
@@ -504,6 +506,8 @@ describe('POST /tasks/user', () => {
       expect(task.type).to.eql('daily');
       expect(task.frequency).to.eql('daily');
       expect(task.everyX).to.eql(5);
+      expect(task.daysOfMonth).to.eql([15]);
+      expect(task.weeksOfMonth).to.eql([3]);
       expect(new Date(task.startDate)).to.eql(now);
     });
 

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

@@ -3,6 +3,7 @@ import {
   createAndPopulateGroup,
   generateGroup,
   generateUser,
+  generateChallenge,
   translate as t,
 } from '../../../../helpers/api-integration/v3';
 import {
@@ -64,6 +65,30 @@ describe('DELETE /user', () => {
     }));
   });
 
+  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,

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

@@ -5,6 +5,7 @@ import {
   createAndPopulateGroup,
   getProperty,
 } from '../../../../../helpers/api-integration/v3';
+import { ApiUser } from '../../../../../helpers/api-integration/api-classes';
 import { v4 as generateRandomUserName } from 'uuid';
 import { each } from 'lodash';
 import { encrypt } from '../../../../../../website/server/libs/encryption';
@@ -416,5 +417,37 @@ describe('POST /user/auth/local/register', () => {
 
       expect(user.tags).to.not.be.empty;
     });
+
+    it('adds the correct tags to the correct tasks', async () => {
+      let user = await api.post('/user/auth/local/register', {
+        username,
+        email,
+        password,
+        confirmPassword: password,
+      });
+
+      let requests = new ApiUser(user);
+
+      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);
+    });
   });
 });

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

@@ -1,10 +1,12 @@
 import moment from 'moment';
 import cc from 'coupon-code';
+import uuid from 'uuid';
 
 import {
   generateGroup,
 } from '../../../../helpers/api-unit.helper.js';
 import { model as User } from '../../../../../website/server/models/user';
+import { model as Group } from '../../../../../website/server/models/group';
 import { model as Coupon } from '../../../../../website/server/models/coupon';
 import amzLib from '../../../../../website/server/libs/amazonPayments';
 import payments from '../../../../../website/server/libs/payments';
@@ -105,7 +107,7 @@ describe('Amazon Payments', () => {
       expect(paymentBuyGemsStub).to.be.calledOnce;
       expect(paymentBuyGemsStub).to.be.calledWith({
         user,
-        paymentMethod: amzLib.constants.PAYMENT_METHOD_AMAZON,
+        paymentMethod: amzLib.constants.PAYMENT_METHOD,
         headers,
       });
       expectAmazonStubs();
@@ -128,7 +130,7 @@ describe('Amazon Payments', () => {
       expect(paymentBuyGemsStub).to.be.calledOnce;
       expect(paymentBuyGemsStub).to.be.calledWith({
         user,
-        paymentMethod: amzLib.constants.PAYMENT_METHOD_AMAZON_GIFT,
+        paymentMethod: amzLib.constants.PAYMENT_METHOD_GIFT,
         headers,
         gift,
       });
@@ -153,7 +155,7 @@ describe('Amazon Payments', () => {
       expect(paymentCreateSubscritionStub).to.be.calledOnce;
       expect(paymentCreateSubscritionStub).to.be.calledWith({
         user,
-        paymentMethod: amzLib.constants.PAYMENT_METHOD_AMAZON_GIFT,
+        paymentMethod: amzLib.constants.PAYMENT_METHOD_GIFT,
         headers,
         gift,
       });
@@ -316,7 +318,7 @@ describe('Amazon Payments', () => {
       expect(createSubSpy).to.be.calledWith({
         user,
         customerId: billingAgreementId,
-        paymentMethod: amzLib.constants.PAYMENT_METHOD_AMAZON,
+        paymentMethod: amzLib.constants.PAYMENT_METHOD,
         sub,
         headers,
         groupId,
@@ -375,7 +377,73 @@ describe('Amazon Payments', () => {
       expect(createSubSpy).to.be.calledWith({
         user,
         customerId: billingAgreementId,
-        paymentMethod: amzLib.constants.PAYMENT_METHOD_AMAZON,
+        paymentMethod: amzLib.constants.PAYMENT_METHOD,
+        sub,
+        headers,
+        groupId,
+      });
+    });
+
+    it('subscribes with amazon with price to existing users', async () => {
+      user = new User();
+      user.guilds.push(groupId);
+      await user.save();
+      group.memberCount = 2;
+      await group.save();
+      sub.key = 'group_monthly';
+      sub.price = 9;
+      amount = 12;
+
+      await amzLib.subscribe({
+        billingAgreementId,
+        sub,
+        coupon,
+        user,
+        groupId,
+        headers,
+      });
+
+      expect(amazonSetBillingAgreementDetailsSpy).to.be.calledOnce;
+      expect(amazonSetBillingAgreementDetailsSpy).to.be.calledWith({
+        AmazonBillingAgreementId: billingAgreementId,
+        BillingAgreementAttributes: {
+          SellerNote: amzLib.constants.SELLER_NOTE_SUBSCRIPTION,
+          SellerBillingAgreementAttributes: {
+            SellerBillingAgreementId: common.uuid(),
+            StoreName: amzLib.constants.STORE_NAME,
+            CustomInformation: amzLib.constants.SELLER_NOTE_SUBSCRIPTION,
+          },
+        },
+      });
+
+      expect(amazonConfirmBillingAgreementSpy).to.be.calledOnce;
+      expect(amazonConfirmBillingAgreementSpy).to.be.calledWith({
+        AmazonBillingAgreementId: billingAgreementId,
+      });
+
+      expect(amazongAuthorizeOnBillingAgreementSpy).to.be.calledOnce;
+      expect(amazongAuthorizeOnBillingAgreementSpy).to.be.calledWith({
+        AmazonBillingAgreementId: billingAgreementId,
+        AuthorizationReferenceId: common.uuid().substring(0, 32),
+        AuthorizationAmount: {
+          CurrencyCode: amzLib.constants.CURRENCY_CODE,
+          Amount: amount,
+        },
+        SellerAuthorizationNote: amzLib.constants.SELLER_NOTE_ATHORIZATION_SUBSCRIPTION,
+        TransactionTimeout: 0,
+        CaptureNow: true,
+        SellerNote: amzLib.constants.SELLER_NOTE_ATHORIZATION_SUBSCRIPTION,
+        SellerOrderAttributes: {
+          SellerOrderId: common.uuid(),
+          StoreName: amzLib.constants.STORE_NAME,
+        },
+      });
+
+      expect(createSubSpy).to.be.calledOnce;
+      expect(createSubSpy).to.be.calledWith({
+        user,
+        customerId: billingAgreementId,
+        paymentMethod: amzLib.constants.PAYMENT_METHOD,
         sub,
         headers,
         groupId,
@@ -455,7 +523,7 @@ describe('Amazon Payments', () => {
         user,
         groupId: undefined,
         nextBill: moment(user.purchased.plan.lastBillingDate).add({ days: subscriptionLength }),
-        paymentMethod: amzLib.constants.PAYMENT_METHOD_AMAZON,
+        paymentMethod: amzLib.constants.PAYMENT_METHOD,
         headers,
       });
       expectAmazonStubs();
@@ -485,7 +553,7 @@ describe('Amazon Payments', () => {
         user,
         groupId: undefined,
         nextBill: moment(user.purchased.plan.lastBillingDate).add({ days: subscriptionLength }),
-        paymentMethod: amzLib.constants.PAYMENT_METHOD_AMAZON,
+        paymentMethod: amzLib.constants.PAYMENT_METHOD,
         headers,
       });
       amzLib.closeBillingAgreement.restore();
@@ -523,7 +591,7 @@ describe('Amazon Payments', () => {
         user,
         groupId: group._id,
         nextBill: moment(group.purchased.plan.lastBillingDate).add({ days: subscriptionLength }),
-        paymentMethod: amzLib.constants.PAYMENT_METHOD_AMAZON,
+        paymentMethod: amzLib.constants.PAYMENT_METHOD,
         headers,
       });
       expectAmazonStubs();
@@ -553,10 +621,84 @@ describe('Amazon Payments', () => {
         user,
         groupId: group._id,
         nextBill: moment(group.purchased.plan.lastBillingDate).add({ days: subscriptionLength }),
-        paymentMethod: amzLib.constants.PAYMENT_METHOD_AMAZON,
+        paymentMethod: amzLib.constants.PAYMENT_METHOD,
         headers,
       });
       amzLib.closeBillingAgreement.restore();
     });
   });
+
+  describe('#upgradeGroupPlan', () => {
+    let spy, data, user, group, uuidString;
+
+    beforeEach(async function () {
+      user = new User();
+      user.profile.name = 'sender';
+
+      data = {
+        user,
+        sub: {
+          key: 'basic_3mo', // @TODO: Validate that this is group
+        },
+        customerId: 'customer-id',
+        paymentMethod: 'Payment Method',
+        headers: {
+          'x-client': 'habitica-web',
+          'user-agent': '',
+        },
+      };
+
+      group = generateGroup({
+        name: 'test group',
+        type: 'guild',
+        privacy: 'public',
+        leader: user._id,
+      });
+      await group.save();
+
+      spy = sinon.stub(amzLib, 'authorizeOnBillingAgreement');
+      spy.returnsPromise().resolves([]);
+
+      uuidString = 'uuid-v4';
+      sinon.stub(uuid, 'v4').returns(uuidString);
+
+      data.groupId = group._id;
+      data.sub.quantity = 3;
+    });
+
+    afterEach(function () {
+      sinon.restore(amzLib.authorizeOnBillingAgreement);
+      uuid.v4.restore();
+    });
+
+    it('charges for a new member', async () => {
+      data.paymentMethod = amzLib.constants.PAYMENT_METHOD;
+      await payments.createSubscription(data);
+
+      let updatedGroup = await Group.findById(group._id).exec();
+
+      updatedGroup.memberCount += 1;
+      await updatedGroup.save();
+
+      await amzLib.chargeForAdditionalGroupMember(updatedGroup);
+
+      expect(spy.calledOnce).to.be.true;
+      expect(spy).to.be.calledWith({
+        AmazonBillingAgreementId: updatedGroup.purchased.plan.customerId,
+        AuthorizationReferenceId: uuidString.substring(0, 32),
+        AuthorizationAmount: {
+          CurrencyCode: amzLib.constants.CURRENCY_CODE,
+          Amount: 3,
+        },
+        SellerAuthorizationNote: amzLib.constants.SELLER_NOTE_GROUP_NEW_MEMBER,
+        TransactionTimeout: 0,
+        CaptureNow: true,
+        SellerNote: amzLib.constants.SELLER_NOTE_GROUP_NEW_MEMBER,
+        SellerOrderAttributes: {
+          SellerOrderId: uuidString,
+          StoreName: amzLib.constants.STORE_NAME,
+        },
+      });
+    });
+  });
 });

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

@@ -0,0 +1,31 @@
+import apiMessages from '../../../../../website/server/libs/apiMessages';
+
+describe('API Messages', () => {
+  const message = 'Only public guilds support pagination.';
+  it('returns an API message', () => {
+    expect(apiMessages('guildsOnlyPaginate')).to.equal(message);
+  });
+
+  it('throws if the API message does not exist', () => {
+    expect(() => apiMessages('iDoNotExist')).to.throw;
+  });
+
+  it('clones the passed variables', () => {
+    let vars = {a: 1};
+    sandbox.stub(_, 'clone').returns({});
+    apiMessages('guildsOnlyPaginate', vars);
+    expect(_.clone).to.have.been.called.once;
+    expect(_.clone).to.have.been.calledWith(vars);
+  });
+
+  it('pass the message through _.template', () => {
+    let vars = {a: 1};
+    let stub = sinon.stub().returns('string');
+    sandbox.stub(_, 'template').returns(stub);
+    apiMessages('guildsOnlyPaginate', vars);
+    expect(_.template).to.have.been.called.once;
+    expect(_.template).to.have.been.calledWith(message);
+    expect(stub).to.have.been.called.once;
+    expect(stub).to.have.been.calledWith(vars);
+  });
+});

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

@@ -6,7 +6,6 @@ import requireAgain from 'require-again';
 import { recoverCron, cron } from '../../../../../website/server/libs/cron';
 import { model as User } from '../../../../../website/server/models/user';
 import * as Tasks from '../../../../../website/server/models/task';
-import { clone } from 'lodash';
 import common from '../../../../../website/common';
 import analytics from '../../../../../website/server/libs/analyticsService';
 
@@ -135,7 +134,10 @@ describe('cron', () => {
       user.purchased.plan.dateUpdated = moment().subtract(6, 'months').toDate();
       user.purchased.plan.dateTerminated = moment().subtract(3, 'months').toDate();
       user.purchased.plan.consecutive.count = 5;
+      user.purchased.plan.consecutive.trinkets = 1;
+
       cron({user, tasksByType, daysMissed, analytics});
+
       expect(user.purchased.plan.consecutive.trinkets).to.equal(1);
     });
 
@@ -481,6 +483,67 @@ describe('cron', () => {
 
       expect(tasksByType.habits[0].value).to.equal(1);
     });
+
+    describe('counters', () => {
+      let notStartOfWeekOrMonth = new Date(2016, 9, 28).getTime(); // a Friday
+      let clock;
+
+      beforeEach(() => {
+        // Replace system clocks so we can get predictable results
+        clock = sinon.useFakeTimers(notStartOfWeekOrMonth);
+      });
+      afterEach(() => {
+        return clock.restore();
+      });
+
+      it('should reset a daily habit counter each day', () => {
+        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;
+        tasksByType.habits[0].counterDown = 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);
+
+        // should reset
+        daysMissed = 8;
+        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 monthly habit counter the first day of each month', () => {
+        tasksByType.habits[0].frequency = 'monthly';
+        tasksByType.habits[0].counterUp = 1;
+        tasksByType.habits[0].counterDown = 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);
+
+        // should reset
+        daysMissed = 32;
+        cron({user, tasksByType, daysMissed, analytics});
+
+        expect(tasksByType.habits[0].counterUp).to.equal(0);
+        expect(tasksByType.habits[0].counterDown).to.equal(0);
+      });
+    });
   });
 
   describe('perfect day', () => {
@@ -533,7 +596,7 @@ describe('cron', () => {
       tasksByType.dailys[0].completed = true;
       tasksByType.dailys[0].startDate = moment(new Date()).subtract({days: 1});
 
-      let previousBuffs = clone(user.stats.buffs);
+      let previousBuffs = user.stats.buffs.toObject();
 
       cron({user, tasksByType, daysMissed, analytics});
 
@@ -598,7 +661,7 @@ describe('cron', () => {
       tasksByType.dailys[0].completed = false;
       tasksByType.dailys[0].startDate = moment(new Date()).subtract({days: 1});
 
-      let previousBuffs = clone(user.stats.buffs);
+      let previousBuffs = user.stats.buffs.toObject();
 
       cronOverride({user, tasksByType, daysMissed, analytics});
 

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

@@ -1,22 +1,18 @@
+import moment from 'moment';
+
 import * as sender from '../../../../../website/server/libs/email';
 import * as api from '../../../../../website/server/libs/payments';
 import analytics from '../../../../../website/server/libs/analyticsService';
 import notifications from '../../../../../website/server/libs/pushNotifications';
 import { model as User } from '../../../../../website/server/models/user';
-import { model as Group } from '../../../../../website/server/models/group';
-import stripeModule from 'stripe';
-import moment from 'moment';
 import { translate as t } from '../../../../helpers/api-v3-integration.helper';
 import {
   generateGroup,
 } from '../../../../helpers/api-unit.helper.js';
-import i18n from '../../../../../website/common/script/i18n';
 
 describe('payments/index', () => {
   let user, group, data, plan;
 
-  let stripe = stripeModule('test');
-
   beforeEach(async () => {
     user = new User();
     user.profile.name = 'sender';
@@ -319,53 +315,6 @@ describe('payments/index', () => {
       });
     });
 
-    context('Purchasing a subscription for group', () => {
-      it('creates a subscription', async () => {
-        expect(group.purchased.plan.planId).to.not.exist;
-        data.groupId = group._id;
-
-        await api.createSubscription(data);
-
-        let updatedGroup = await Group.findById(group._id).exec();
-
-        expect(updatedGroup.purchased.plan.planId).to.eql('basic_3mo');
-        expect(updatedGroup.purchased.plan.customerId).to.eql('customer-id');
-        expect(updatedGroup.purchased.plan.dateUpdated).to.exist;
-        expect(updatedGroup.purchased.plan.gemsBought).to.eql(0);
-        expect(updatedGroup.purchased.plan.paymentMethod).to.eql('Payment Method');
-        expect(updatedGroup.purchased.plan.extraMonths).to.eql(0);
-        expect(updatedGroup.purchased.plan.dateTerminated).to.eql(null);
-        expect(updatedGroup.purchased.plan.lastBillingDate).to.not.exist;
-        expect(updatedGroup.purchased.plan.dateCreated).to.exist;
-      });
-
-      it('sets extraMonths if plan has dateTerminated date', async () => {
-        group.purchased.plan = plan;
-        group.purchased.plan.dateTerminated = moment(new Date()).add(2, 'months');
-        await group.save();
-        expect(group.purchased.plan.extraMonths).to.eql(0);
-        data.groupId = group._id;
-
-        await api.createSubscription(data);
-
-        let updatedGroup = await Group.findById(group._id).exec();
-        expect(updatedGroup.purchased.plan.extraMonths).to.within(1.9, 2);
-      });
-
-      it('does not set negative extraMonths if plan has past dateTerminated date', async () => {
-        group.purchased.plan = plan;
-        group.purchased.plan.dateTerminated = moment(new Date()).subtract(2, 'months');
-        await group.save();
-        expect(group.purchased.plan.extraMonths).to.eql(0);
-        data.groupId = group._id;
-
-        await api.createSubscription(data);
-
-        let updatedGroup = await Group.findById(group._id).exec();
-        expect(updatedGroup.purchased.plan.extraMonths).to.eql(0);
-      });
-    });
-
     context('Block subscription perks', () => {
       it('adds block months to plan.consecutive.offset', async () => {
         await api.createSubscription(data);
@@ -485,7 +434,6 @@ describe('payments/index', () => {
         sandbox.spy(user.purchased.plan.mysteryItems, 'push');
 
         data = { paymentMethod: 'PaymentMethod', user, sub: { key: 'basic_3mo' } };
-
         await api.createSubscription(data);
 
         expect(user.purchased.plan.mysteryItems.push).to.be.calledOnce;
@@ -559,112 +507,6 @@ describe('payments/index', () => {
         expect(sender.sendTxn).to.be.calledWith(user, 'cancel-subscription');
       });
     });
-
-    context('Canceling a subscription for group', () => {
-      it('adds a month termination date by default', async () => {
-        data.groupId = group._id;
-        await api.cancelSubscription(data);
-
-        let now = new Date();
-        let updatedGroup = await Group.findById(group._id).exec();
-        let daysTillTermination = moment(updatedGroup.purchased.plan.dateTerminated).diff(now, 'days');
-
-        expect(daysTillTermination).to.be.within(29, 30); // 1 month +/- 1 days
-      });
-
-      it('adds extraMonths to dateTerminated value', async () => {
-        group.purchased.plan.extraMonths = 2;
-        await group.save();
-        data.groupId = group._id;
-
-        await api.cancelSubscription(data);
-
-        let now = new Date();
-        let updatedGroup = await Group.findById(group._id).exec();
-        let daysTillTermination = moment(updatedGroup.purchased.plan.dateTerminated).diff(now, 'days');
-
-        expect(daysTillTermination).to.be.within(89, 90); // 3 months +/- 1 days
-      });
-
-      it('handles extra month fractions', async () => {
-        group.purchased.plan.extraMonths = 0.3;
-        await group.save();
-        data.groupId = group._id;
-
-        await api.cancelSubscription(data);
-
-        let now = new Date();
-        let updatedGroup = await Group.findById(group._id).exec();
-        let daysTillTermination = moment(updatedGroup.purchased.plan.dateTerminated).diff(now, 'days');
-
-        expect(daysTillTermination).to.be.within(38, 39); // should be about 1 month + 1/3 month
-      });
-
-      it('terminates at next billing date if it exists', async () => {
-        data.nextBill = moment().add({ days: 15 });
-        data.groupId = group._id;
-
-        await api.cancelSubscription(data);
-
-        let now = new Date();
-        let updatedGroup = await Group.findById(group._id).exec();
-        let daysTillTermination = moment(updatedGroup.purchased.plan.dateTerminated).diff(now, 'days');
-
-        expect(daysTillTermination).to.be.within(13, 15);
-      });
-
-      it('resets plan.extraMonths', async () => {
-        group.purchased.plan.extraMonths = 5;
-        await group.save();
-        data.groupId = group._id;
-
-        await api.cancelSubscription(data);
-
-        let updatedGroup = await Group.findById(group._id).exec();
-        expect(updatedGroup.purchased.plan.extraMonths).to.eql(0);
-      });
-
-      it('sends an email', async () => {
-        data.groupId = group._id;
-        await api.cancelSubscription(data);
-
-        expect(sender.sendTxn).to.be.calledOnce;
-        expect(sender.sendTxn).to.be.calledWith(user, 'group-cancel-subscription');
-      });
-
-      it('prevents non group leader from manging subscription', async () => {
-        let groupMember = new User();
-        data.user = groupMember;
-        data.groupId = group._id;
-
-        await expect(api.cancelSubscription(data))
-          .eventually.be.rejected.and.to.eql({
-            httpCode: 401,
-            message: i18n.t('onlyGroupLeaderCanManageSubscription'),
-            name: 'NotAuthorized',
-          });
-      });
-
-      it('allows old group leader to cancel if they created the subscription', async () => {
-        data.groupId = group._id;
-        data.sub = {
-          key: 'group_monthly',
-        };
-        data.paymentMethod = 'Payment Method';
-        await api.createSubscription(data);
-
-        let updatedGroup = await Group.findById(group._id).exec();
-        let newLeader = new User();
-        updatedGroup.leader = newLeader._id;
-        await updatedGroup.save();
-
-        await api.cancelSubscription(data);
-
-        updatedGroup = await Group.findById(group._id).exec();
-
-        expect(updatedGroup.purchased.plan.dateTerminated).to.exist;
-      });
-    });
   });
 
   describe('#buyGems', () => {
@@ -772,49 +614,24 @@ describe('payments/index', () => {
     });
   });
 
-  describe('#upgradeGroupPlan', () => {
-    let spy;
-
-    beforeEach(function () {
-      spy = sinon.stub(stripe.subscriptions, 'update');
-      spy.returnsPromise().resolves([]);
+  describe('addSubToGroupUser', () => {
+    it('adds a group subscription to a new user', async () => {
+      expect(group.purchased.plan.planId).to.not.exist;
       data.groupId = group._id;
-      data.sub.quantity = 3;
-    });
 
-    afterEach(function () {
-      sinon.restore(stripe.subscriptions.update);
-    });
+      await api.addSubToGroupUser(user, group);
 
-    it('updates a group plan quantity', async () => {
-      data.paymentMethod = 'Stripe';
-      await api.createSubscription(data);
+      let updatedUser = await User.findById(user._id).exec();
 
-      let updatedGroup = await Group.findById(group._id).exec();
-      expect(updatedGroup.purchased.plan.quantity).to.eql(3);
-
-      updatedGroup.memberCount += 1;
-      await updatedGroup.save();
-
-      await api.updateStripeGroupPlan(updatedGroup, stripe);
-
-      expect(spy.calledOnce).to.be.true;
-      expect(updatedGroup.purchased.plan.quantity).to.eql(4);
-    });
-
-    it('does not update a group plan quantity that has a payment method other than stripe', async () => {
-      await api.createSubscription(data);
-
-      let updatedGroup = await Group.findById(group._id).exec();
-      expect(updatedGroup.purchased.plan.quantity).to.eql(3);
-
-      updatedGroup.memberCount += 1;
-      await updatedGroup.save();
-
-      await api.updateStripeGroupPlan(updatedGroup, stripe);
-
-      expect(spy.calledOnce).to.be.false;
-      expect(updatedGroup.purchased.plan.quantity).to.eql(3);
+      expect(updatedUser.purchased.plan.planId).to.eql('group_plan_auto');
+      expect(updatedUser.purchased.plan.customerId).to.eql('group-plan');
+      expect(updatedUser.purchased.plan.dateUpdated).to.exist;
+      expect(updatedUser.purchased.plan.gemsBought).to.eql(0);
+      expect(updatedUser.purchased.plan.paymentMethod).to.eql('Group Plan');
+      expect(updatedUser.purchased.plan.extraMonths).to.eql(0);
+      expect(updatedUser.purchased.plan.dateTerminated).to.eql(null);
+      expect(updatedUser.purchased.plan.lastBillingDate).to.not.exist;
+      expect(updatedUser.purchased.plan.dateCreated).to.exist;
     });
   });
 });

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

@@ -0,0 +1,326 @@
+import moment from 'moment';
+
+import * as sender from '../../../../../../../website/server/libs/email';
+import * as api from '../../../../../../../website/server/libs/payments';
+import { model as User } from '../../../../../../../website/server/models/user';
+import { model as Group } from '../../../../../../../website/server/models/group';
+import {
+  generateGroup,
+} from '../../../../../../helpers/api-unit.helper.js';
+import i18n from '../../../../../../../website/common/script/i18n';
+
+describe('Canceling a subscription for group', () => {
+  let plan, group, user, data;
+
+  beforeEach(async () => {
+    user = new User();
+    user.profile.name = 'sender';
+    await user.save();
+
+    group = generateGroup({
+      name: 'test group',
+      type: 'guild',
+      privacy: 'public',
+      leader: user._id,
+    });
+    await group.save();
+
+    data = {
+      user,
+      sub: {
+        key: 'basic_3mo',
+      },
+      customerId: 'customer-id',
+      paymentMethod: 'Payment Method',
+      headers: {
+        'x-client': 'habitica-web',
+        'user-agent': '',
+      },
+    };
+
+    plan = {
+      planId: 'basic_3mo',
+      customerId: 'customer-id',
+      dateUpdated: new Date(),
+      gemsBought: 0,
+      paymentMethod: 'paymentMethod',
+      extraMonths: 0,
+      dateTerminated: null,
+      lastBillingDate: new Date(),
+      dateCreated: new Date(),
+      mysteryItems: [],
+      consecutive: {
+        trinkets: 0,
+        offset: 0,
+        gemCapExtra: 0,
+      },
+    };
+
+    sandbox.stub(sender, 'sendTxn');
+  });
+
+  afterEach(() => {
+    sender.sendTxn.restore();
+  });
+
+  it('adds a month termination date by default', async () => {
+    data.groupId = group._id;
+    await api.cancelSubscription(data);
+
+    let now = new Date();
+    let updatedGroup = await Group.findById(group._id).exec();
+    let daysTillTermination = moment(updatedGroup.purchased.plan.dateTerminated).diff(now, 'days');
+
+    expect(daysTillTermination).to.be.within(29, 30); // 1 month +/- 1 days
+  });
+
+  it('adds extraMonths to dateTerminated value', async () => {
+    group.purchased.plan.extraMonths = 2;
+    await group.save();
+    data.groupId = group._id;
+
+    await api.cancelSubscription(data);
+
+    let now = new Date();
+    let updatedGroup = await Group.findById(group._id).exec();
+    let daysTillTermination = moment(updatedGroup.purchased.plan.dateTerminated).diff(now, 'days');
+
+    expect(daysTillTermination).to.be.within(89, 90); // 3 months +/- 1 days
+  });
+
+  it('handles extra month fractions', async () => {
+    group.purchased.plan.extraMonths = 0.3;
+    await group.save();
+    data.groupId = group._id;
+
+    await api.cancelSubscription(data);
+
+    let now = new Date();
+    let updatedGroup = await Group.findById(group._id).exec();
+    let daysTillTermination = moment(updatedGroup.purchased.plan.dateTerminated).diff(now, 'days');
+
+    expect(daysTillTermination).to.be.within(38, 39); // should be about 1 month + 1/3 month
+  });
+
+  it('terminates at next billing date if it exists', async () => {
+    data.nextBill = moment().add({ days: 15 });
+    data.groupId = group._id;
+
+    await api.cancelSubscription(data);
+
+    let now = new Date();
+    let updatedGroup = await Group.findById(group._id).exec();
+    let daysTillTermination = moment(updatedGroup.purchased.plan.dateTerminated).diff(now, 'days');
+
+    expect(daysTillTermination).to.be.within(13, 15);
+  });
+
+  it('resets plan.extraMonths', async () => {
+    group.purchased.plan.extraMonths = 5;
+    await group.save();
+    data.groupId = group._id;
+
+    await api.cancelSubscription(data);
+
+    let updatedGroup = await Group.findById(group._id).exec();
+    expect(updatedGroup.purchased.plan.extraMonths).to.eql(0);
+  });
+
+  it('sends an email', async () => {
+    data.groupId = group._id;
+    await api.cancelSubscription(data);
+
+    expect(sender.sendTxn).to.be.calledOnce;
+    expect(sender.sendTxn.firstCall.args[0]._id).to.equal(user._id);
+    expect(sender.sendTxn.firstCall.args[1]).to.equal('group-cancel-subscription');
+    expect(sender.sendTxn.firstCall.args[2]).to.eql([
+      {name: 'GROUP_NAME', content: group.name},
+    ]);
+  });
+
+  it('prevents non group leader from manging subscription', async () => {
+    let groupMember = new User();
+    data.user = groupMember;
+    data.groupId = group._id;
+
+    await expect(api.cancelSubscription(data))
+      .eventually.be.rejected.and.to.eql({
+        httpCode: 401,
+        message: i18n.t('onlyGroupLeaderCanManageSubscription'),
+        name: 'NotAuthorized',
+      });
+  });
+
+  it('allows old group leader to cancel if they created the subscription', async () => {
+    data.groupId = group._id;
+    data.sub = {
+      key: 'group_monthly',
+    };
+    data.paymentMethod = 'Payment Method';
+    await api.createSubscription(data);
+
+    let updatedGroup = await Group.findById(group._id).exec();
+    let newLeader = new User();
+    updatedGroup.leader = newLeader._id;
+    await updatedGroup.save();
+
+    await api.cancelSubscription(data);
+
+    updatedGroup = await Group.findById(group._id).exec();
+
+    expect(updatedGroup.purchased.plan.dateTerminated).to.exist;
+  });
+
+  it('cancels member subscriptions', async () => {
+    data = {
+      user,
+      sub: {
+        key: 'basic_3mo',
+      },
+      customerId: 'customer-id',
+      paymentMethod: 'Payment Method',
+      headers: {
+        'x-client': 'habitica-web',
+        'user-agent': '',
+      },
+    };
+    user.guilds.push(group._id);
+    await user.save();
+    expect(group.purchased.plan.planId).to.not.exist;
+    data.groupId = group._id;
+    await api.createSubscription(data);
+
+    await api.cancelSubscription(data);
+
+    let now = new Date();
+    now.setHours(0, 0, 0, 0);
+    let updatedLeader = await User.findById(user._id).exec();
+    let daysTillTermination = moment(updatedLeader.purchased.plan.dateTerminated).diff(now, 'days');
+    expect(daysTillTermination).to.be.within(2, 3); // only a few days
+  });
+
+  it('sends an email to members of group', async () => {
+    let recipient = new User();
+    recipient.profile.name = 'recipient';
+    recipient.guilds.push(group._id);
+    await recipient.save();
+
+    data.groupId = group._id;
+
+    await api.createSubscription(data);
+    await api.cancelSubscription(data);
+
+    expect(sender.sendTxn).to.be.have.callCount(4);
+    expect(sender.sendTxn.thirdCall.args[0]._id).to.equal(recipient._id);
+    expect(sender.sendTxn.thirdCall.args[1]).to.equal('group-member-cancel');
+    expect(sender.sendTxn.thirdCall.args[2]).to.eql([
+      {name: 'LEADER', content: user.profile.name},
+      {name: 'GROUP_NAME', content: group.name},
+    ]);
+  });
+
+  it('does not cancel member subscriptions when member does not have a group plan sub (i.e. UNLIMITED_CUSTOMER_ID)', async () => {
+    plan.key = 'basic_earned';
+    plan.customerId = api.constants.UNLIMITED_CUSTOMER_ID;
+
+    let recipient = new User();
+    recipient.profile.name = 'recipient';
+    recipient.purchased.plan = plan;
+    recipient.guilds.push(group._id);
+    await recipient.save();
+
+    data.groupId = group._id;
+
+    await api.cancelSubscription(data);
+
+    let updatedLeader = await User.findById(user._id).exec();
+    expect(updatedLeader.purchased.plan.dateTerminated).to.not.exist;
+  });
+
+  it('does not cancel a user subscription if they are still in another active group plan', async () => {
+    let recipient = new User();
+    recipient.profile.name = 'recipient';
+    plan.key = 'basic_earned';
+    recipient.purchased.plan = plan;
+    recipient.guilds.push(group._id);
+    await recipient.save();
+
+    user.guilds.push(group._id);
+    await user.save();
+    data.groupId = group._id;
+
+    await api.createSubscription(data);
+
+    let updatedUser = await User.findById(recipient._id).exec();
+    let firstDateCreated = updatedUser.purchased.plan.dateCreated;
+    let extraMonthsBeforeSecond = updatedUser.purchased.plan.extraMonths;
+
+    let group2 = generateGroup({
+      name: 'test group2',
+      type: 'guild',
+      privacy: 'public',
+      leader: user._id,
+    });
+    data.groupId = group2._id;
+    await group2.save();
+    recipient.guilds.push(group2._id);
+    await recipient.save();
+
+    await api.createSubscription(data);
+
+    await api.cancelSubscription(data);
+
+    updatedUser = await User.findById(recipient._id).exec();
+
+    expect(updatedUser.purchased.plan.planId).to.eql('group_plan_auto');
+    expect(updatedUser.purchased.plan.customerId).to.eql('group-plan');
+    expect(updatedUser.purchased.plan.dateUpdated).to.exist;
+    expect(updatedUser.purchased.plan.gemsBought).to.eql(0);
+    expect(updatedUser.purchased.plan.paymentMethod).to.eql('Group Plan');
+    expect(updatedUser.purchased.plan.extraMonths).to.eql(extraMonthsBeforeSecond);
+    expect(updatedUser.purchased.plan.dateTerminated).to.eql(null);
+    expect(updatedUser.purchased.plan.lastBillingDate).to.not.exist;
+    expect(updatedUser.purchased.plan.dateCreated).to.eql(firstDateCreated);
+  });
+
+  it('does cancel a leader subscription with two cancelled group plans', async () => {
+    user.guilds.push(group._id);
+    await user.save();
+    data.groupId = group._id;
+
+    await api.createSubscription(data);
+
+    let updatedUser = await User.findById(user._id).exec();
+    let firstDateCreated = updatedUser.purchased.plan.dateCreated;
+    let extraMonthsBeforeSecond = updatedUser.purchased.plan.extraMonths;
+
+    let group2 = generateGroup({
+      name: 'test group2',
+      type: 'guild',
+      privacy: 'public',
+      leader: user._id,
+    });
+    user.guilds.push(group2._id);
+    await user.save();
+    data.groupId = group2._id;
+    await group2.save();
+
+    await api.createSubscription(data);
+    await api.cancelSubscription(data);
+
+    data.groupId = group._id;
+    await api.cancelSubscription(data);
+
+    updatedUser = await User.findById(user._id).exec();
+
+    expect(updatedUser.purchased.plan.planId).to.eql('group_plan_auto');
+    expect(updatedUser.purchased.plan.customerId).to.eql('group-plan');
+    expect(updatedUser.purchased.plan.dateUpdated).to.exist;
+    expect(updatedUser.purchased.plan.gemsBought).to.eql(0);
+    expect(updatedUser.purchased.plan.paymentMethod).to.eql('Group Plan');
+    expect(updatedUser.purchased.plan.extraMonths).to.eql(extraMonthsBeforeSecond);
+    expect(updatedUser.purchased.plan.dateTerminated).to.exist;
+    expect(updatedUser.purchased.plan.lastBillingDate).to.not.exist;
+    expect(updatedUser.purchased.plan.dateCreated).to.eql(firstDateCreated);
+  });
+});

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

@@ -0,0 +1,635 @@
+import moment from 'moment';
+import stripeModule from 'stripe';
+
+import * as sender from '../../../../../../../website/server/libs/email';
+import * as api from '../../../../../../../website/server/libs/payments';
+import amzLib from '../../../../../../../website/server/libs/amazonPayments';
+import stripePayments from '../../../../../../../website/server/libs/stripePayments';
+import paypalPayments from '../../../../../../../website/server/libs/paypalPayments';
+import { model as User } from '../../../../../../../website/server/models/user';
+import { model as Group } from '../../../../../../../website/server/models/group';
+import {
+  generateGroup,
+} from '../../../../../../helpers/api-unit.helper.js';
+
+describe('Purchasing a subscription for group', () => {
+  let plan, group, user, data;
+  let stripe = stripeModule('test');
+
+  beforeEach(async () => {
+    user = new User();
+    user.profile.name = 'sender';
+    await user.save();
+
+    group = generateGroup({
+      name: 'test group',
+      type: 'guild',
+      privacy: 'public',
+      leader: user._id,
+    });
+    await group.save();
+
+    data = {
+      user,
+      sub: {
+        key: 'basic_3mo',
+      },
+      customerId: 'customer-id',
+      paymentMethod: 'Payment Method',
+      headers: {
+        'x-client': 'habitica-web',
+        'user-agent': '',
+      },
+    };
+
+    plan = {
+      planId: 'basic_3mo',
+      customerId: 'customer-id',
+      dateUpdated: new Date(),
+      gemsBought: 0,
+      paymentMethod: 'paymentMethod',
+      extraMonths: 0,
+      dateTerminated: null,
+      lastBillingDate: new Date(),
+      dateCreated: new Date(),
+      mysteryItems: [],
+      consecutive: {
+        trinkets: 0,
+        offset: 0,
+        gemCapExtra: 0,
+      },
+    };
+
+    let subscriptionId = 'subId';
+    sinon.stub(stripe.customers, 'del').returnsPromise().resolves({});
+
+    let currentPeriodEndTimeStamp = moment().add(3, 'months').unix();
+    sinon.stub(stripe.customers, 'retrieve')
+      .returnsPromise().resolves({
+        subscriptions: {
+          data: [{id: subscriptionId, current_period_end: currentPeriodEndTimeStamp}], // eslint-disable-line camelcase
+        },
+      });
+
+    stripePayments.setStripeApi(stripe);
+    sandbox.stub(sender, 'sendTxn');
+  });
+
+  afterEach(() => {
+    stripe.customers.del.restore();
+    stripe.customers.retrieve.restore();
+    sender.sendTxn.restore();
+  });
+
+  it('creates a subscription', async () => {
+    expect(group.purchased.plan.planId).to.not.exist;
+    data.groupId = group._id;
+
+    await api.createSubscription(data);
+
+    let updatedGroup = await Group.findById(group._id).exec();
+
+    expect(updatedGroup.purchased.plan.planId).to.eql('basic_3mo');
+    expect(updatedGroup.purchased.plan.customerId).to.eql('customer-id');
+    expect(updatedGroup.purchased.plan.dateUpdated).to.exist;
+    expect(updatedGroup.purchased.plan.gemsBought).to.eql(0);
+    expect(updatedGroup.purchased.plan.paymentMethod).to.eql('Payment Method');
+    expect(updatedGroup.purchased.plan.extraMonths).to.eql(0);
+    expect(updatedGroup.purchased.plan.dateTerminated).to.eql(null);
+    expect(updatedGroup.purchased.plan.lastBillingDate).to.not.exist;
+    expect(updatedGroup.purchased.plan.dateCreated).to.exist;
+  });
+
+  it('sends an email', async () => {
+    expect(group.purchased.plan.planId).to.not.exist;
+    data.groupId = group._id;
+
+    await api.createSubscription(data);
+
+    expect(sender.sendTxn).to.be.calledWith(user, 'group-subscription-begins');
+  });
+
+  it('sets extraMonths if plan has dateTerminated date', async () => {
+    group.purchased.plan = plan;
+    group.purchased.plan.dateTerminated = moment(new Date()).add(2, 'months');
+    await group.save();
+    expect(group.purchased.plan.extraMonths).to.eql(0);
+    data.groupId = group._id;
+
+    await api.createSubscription(data);
+
+    let updatedGroup = await Group.findById(group._id).exec();
+    expect(updatedGroup.purchased.plan.extraMonths).to.within(1.9, 2);
+  });
+
+  it('does not set negative extraMonths if plan has past dateTerminated date', async () => {
+    group.purchased.plan = plan;
+    group.purchased.plan.dateTerminated = moment(new Date()).subtract(2, 'months');
+    await group.save();
+    expect(group.purchased.plan.extraMonths).to.eql(0);
+    data.groupId = group._id;
+
+    await api.createSubscription(data);
+
+    let updatedGroup = await Group.findById(group._id).exec();
+    expect(updatedGroup.purchased.plan.extraMonths).to.eql(0);
+  });
+
+  it('grants all members of a group a subscription', async () => {
+    user.guilds.push(group._id);
+    await user.save();
+    expect(group.purchased.plan.planId).to.not.exist;
+    data.groupId = group._id;
+
+    await api.createSubscription(data);
+    let updatedLeader = await User.findById(user._id).exec();
+
+    expect(updatedLeader.purchased.plan.planId).to.eql('group_plan_auto');
+    expect(updatedLeader.purchased.plan.customerId).to.eql('group-plan');
+    expect(updatedLeader.purchased.plan.dateUpdated).to.exist;
+    expect(updatedLeader.purchased.plan.gemsBought).to.eql(0);
+    expect(updatedLeader.purchased.plan.paymentMethod).to.eql('Group Plan');
+    expect(updatedLeader.purchased.plan.extraMonths).to.eql(0);
+    expect(updatedLeader.purchased.plan.dateTerminated).to.eql(null);
+    expect(updatedLeader.purchased.plan.lastBillingDate).to.not.exist;
+    expect(updatedLeader.purchased.plan.dateCreated).to.exist;
+
+    expect(updatedLeader.items.mounts['Jackalope-RoyalPurple']).to.be.true;
+  });
+
+  it('sends an email to members of group', async () => {
+    let recipient = new User();
+    recipient.profile.name = 'recipient';
+    recipient.guilds.push(group._id);
+    await recipient.save();
+
+    data.groupId = group._id;
+
+    await api.createSubscription(data);
+
+    expect(sender.sendTxn).to.be.calledTwice;
+    expect(sender.sendTxn.firstCall.args[0]._id).to.equal(recipient._id);
+    expect(sender.sendTxn.firstCall.args[1]).to.equal('group-member-joining');
+    expect(sender.sendTxn.firstCall.args[2]).to.eql([
+      {name: 'LEADER', content: user.profile.name},
+      {name: 'GROUP_NAME', content: group.name},
+    ]);
+  });
+
+  it('adds months to members with existing gift subscription', async () => {
+    let recipient = new User();
+    recipient.profile.name = 'recipient';
+    recipient.purchased.plan = plan;
+    recipient.guilds.push(group._id);
+    plan.planId = 'basic_earned';
+    plan.paymentMethod = 'paymentMethod';
+    data.gift = {
+      member: recipient,
+      subscription: {
+        key: 'basic_earned',
+        months: 1,
+      },
+    };
+    await api.createSubscription(data);
+    await recipient.save();
+
+    data.gift = undefined;
+
+    user.guilds.push(group._id);
+    await user.save();
+    data.groupId = group._id;
+
+    await api.createSubscription(data);
+
+    let updatedUser = await User.findById(recipient._id).exec();
+
+    expect(updatedUser.purchased.plan.planId).to.eql('group_plan_auto');
+    expect(updatedUser.purchased.plan.customerId).to.eql('group-plan');
+    expect(updatedUser.purchased.plan.dateUpdated).to.exist;
+    expect(updatedUser.purchased.plan.gemsBought).to.eql(0);
+    expect(updatedUser.purchased.plan.paymentMethod).to.eql('Group Plan');
+    expect(updatedUser.purchased.plan.extraMonths).to.within(1, 3);
+    expect(updatedUser.purchased.plan.dateTerminated).to.eql(null);
+    expect(updatedUser.purchased.plan.lastBillingDate).to.not.exist;
+    expect(updatedUser.purchased.plan.dateCreated).to.exist;
+  });
+
+  it('adds months to members with existing multi-month gift subscription', async () => {
+    let recipient = new User();
+    recipient.profile.name = 'recipient';
+    recipient.purchased.plan = plan;
+    recipient.guilds.push(group._id);
+    data.gift = {
+      member: recipient,
+      subscription: {
+        key: 'basic_3mo',
+        months: 3,
+      },
+    };
+    await api.createSubscription(data);
+    await recipient.save();
+
+    data.gift = undefined;
+
+    user.guilds.push(group._id);
+    await user.save();
+    data.groupId = group._id;
+
+    await api.createSubscription(data);
+
+    let updatedUser = await User.findById(recipient._id).exec();
+
+    expect(updatedUser.purchased.plan.planId).to.eql('group_plan_auto');
+    expect(updatedUser.purchased.plan.customerId).to.eql('group-plan');
+    expect(updatedUser.purchased.plan.dateUpdated).to.exist;
+    expect(updatedUser.purchased.plan.gemsBought).to.eql(0);
+    expect(updatedUser.purchased.plan.paymentMethod).to.eql('Group Plan');
+    expect(updatedUser.purchased.plan.extraMonths).to.within(3, 5);
+    expect(updatedUser.purchased.plan.dateTerminated).to.eql(null);
+    expect(updatedUser.purchased.plan.lastBillingDate).to.not.exist;
+    expect(updatedUser.purchased.plan.dateCreated).to.exist;
+  });
+
+  it('adds months to members with existing recurring subscription (Stripe)', async () => {
+    let recipient = new User();
+    recipient.profile.name = 'recipient';
+    plan.key = 'basic_earned';
+    plan.paymentMethod = stripePayments.constants.PAYMENT_METHOD;
+    recipient.purchased.plan = plan;
+    recipient.guilds.push(group._id);
+    await recipient.save();
+
+    user.guilds.push(group._id);
+    await user.save();
+    data.groupId = group._id;
+
+    await api.createSubscription(data);
+
+    let updatedUser = await User.findById(recipient._id).exec();
+
+    expect(updatedUser.purchased.plan.extraMonths).to.within(2, 3);
+  });
+
+  it('adds months to members with existing recurring subscription (Amazon)', async () => {
+    sinon.stub(amzLib, 'getBillingAgreementDetails')
+      .returnsPromise()
+      .resolves({
+        BillingAgreementDetails: {
+          BillingAgreementStatus: {State: 'Closed'},
+        },
+      });
+
+    let recipient = new User();
+    recipient.profile.name = 'recipient';
+    plan.planId = 'basic_earned';
+    plan.paymentMethod = amzLib.constants.PAYMENT_METHOD;
+    plan.lastBillingDate = moment().add(3, 'months');
+    recipient.purchased.plan = plan;
+    recipient.guilds.push(group._id);
+
+    await recipient.save();
+
+    user.guilds.push(group._id);
+    await user.save();
+    data.groupId = group._id;
+
+    await api.createSubscription(data);
+
+    let updatedUser = await User.findById(recipient._id).exec();
+
+    expect(updatedUser.purchased.plan.extraMonths).to.within(3, 4);
+  });
+
+  it('adds months to members with existing recurring subscription (Paypal)', async () => {
+    sinon.stub(paypalPayments, 'paypalBillingAgreementCancel').returnsPromise().resolves({});
+    sinon.stub(paypalPayments, 'paypalBillingAgreementGet')
+      .returnsPromise().resolves({
+        agreement_details: { // eslint-disable-line camelcase
+          next_billing_date: moment().add(3, 'months').toDate(), // eslint-disable-line camelcase
+          cycles_completed: 1, // eslint-disable-line camelcase
+        },
+      });
+
+    let recipient = new User();
+    recipient.profile.name = 'recipient';
+    plan.planId = 'basic_earned';
+    plan.paymentMethod = paypalPayments.constants.PAYMENT_METHOD;
+    recipient.purchased.plan = plan;
+    recipient.guilds.push(group._id);
+
+    await recipient.save();
+
+    user.guilds.push(group._id);
+    await user.save();
+    data.groupId = group._id;
+
+    await api.createSubscription(data);
+
+    let updatedUser = await User.findById(recipient._id).exec();
+
+    expect(updatedUser.purchased.plan.extraMonths).to.within(2, 3);
+    paypalPayments.paypalBillingAgreementGet.restore();
+    paypalPayments.paypalBillingAgreementCancel.restore();
+  });
+
+  it('adds months to members with existing recurring subscription (Android)');
+  it('adds months to members with existing recurring subscription (iOs)');
+
+  it('adds months to members who already cancelled but not yet terminated recurring subscription', async () => {
+    let recipient = new User();
+    recipient.profile.name = 'recipient';
+    plan.key = 'basic_earned';
+    plan.paymentMethod = stripePayments.constants.PAYMENT_METHOD;
+    recipient.purchased.plan = plan;
+    recipient.guilds.push(group._id);
+    await recipient.save();
+
+    user.guilds.push(group._id);
+    await user.save();
+    data.groupId = group._id;
+
+    await recipient.cancelSubscription();
+
+    await api.createSubscription(data);
+
+    let updatedUser = await User.findById(recipient._id).exec();
+
+    expect(updatedUser.purchased.plan.extraMonths).to.within(2, 3);
+  });
+
+  it('adds months to members who already cancelled but not yet terminated group plan subscription', async () => {
+    let recipient = new User();
+    recipient.profile.name = 'recipient';
+    plan.key = 'basic_earned';
+    plan.paymentMethod = api.constants.GROUP_PLAN_PAYMENT_METHOD;
+    plan.extraMonths = 2.94;
+    recipient.purchased.plan = plan;
+    recipient.guilds.push(group._id);
+    await recipient.save();
+
+    user.guilds.push(group._id);
+    await user.save();
+    data.groupId = group._id;
+
+    await recipient.cancelSubscription();
+
+    await api.createSubscription(data);
+
+    let updatedUser = await User.findById(recipient._id).exec();
+    expect(updatedUser.purchased.plan.extraMonths).to.within(3, 4);
+  });
+
+  it('resets date terminated if user has old subscription', async () => {
+    let recipient = new User();
+    recipient.profile.name = 'recipient';
+    plan.key = 'basic_earned';
+    plan.paymentMethod = stripePayments.constants.PAYMENT_METHOD;
+    plan.dateTerminated = moment().subtract(1, 'days').toDate();
+    recipient.purchased.plan = plan;
+    recipient.guilds.push(group._id);
+    await recipient.save();
+
+    user.guilds.push(group._id);
+    await user.save();
+    data.groupId = group._id;
+
+    await api.createSubscription(data);
+
+    let updatedUser = await User.findById(recipient._id).exec();
+
+    expect(updatedUser.purchased.plan.dateTerminated).to.not.exist;
+  });
+
+  it('adds months to members with existing recurring subscription and includes existing extraMonths', async () => {
+    let recipient = new User();
+    recipient.profile.name = 'recipient';
+    plan.key = 'basic_earned';
+    plan.paymentMethod = stripePayments.constants.PAYMENT_METHOD;
+    plan.extraMonths = 5;
+    recipient.purchased.plan = plan;
+    recipient.guilds.push(group._id);
+    await recipient.save();
+
+    user.guilds.push(group._id);
+    await user.save();
+    data.groupId = group._id;
+
+    await api.createSubscription(data);
+
+    let updatedUser = await User.findById(recipient._id).exec();
+
+    expect(updatedUser.purchased.plan.extraMonths).to.within(7, 8);
+  });
+
+  it('adds months to members with existing recurring subscription and ignores existing negative extraMonths', async () => {
+    let recipient = new User();
+    recipient.profile.name = 'recipient';
+    plan.key = 'basic_earned';
+    plan.paymentMethod = stripePayments.constants.PAYMENT_METHOD;
+    plan.extraMonths = -5;
+    recipient.purchased.plan = plan;
+    recipient.guilds.push(group._id);
+    await recipient.save();
+
+    user.guilds.push(group._id);
+    await user.save();
+    data.groupId = group._id;
+
+    await api.createSubscription(data);
+
+    let updatedUser = await User.findById(recipient._id).exec();
+
+    expect(updatedUser.purchased.plan.extraMonths).to.within(2, 3);
+  });
+
+  it('does not override gemsBought, mysteryItems, dateCreated, and consective fields', async () => {
+    let planCreatedDate = moment().toDate();
+    let mysteryItem = {title: 'item'};
+    let mysteryItems = [mysteryItem];
+    let consecutive = {
+      trinkets: 3,
+      gemCapExtra: 20,
+      offset: 1,
+      count: 13,
+    };
+
+    let recipient = new User();
+    recipient.profile.name = 'recipient';
+
+    plan.key = 'basic_earned';
+    plan.gemsBought = 3;
+    plan.dateCreated = planCreatedDate;
+    plan.mysteryItems = mysteryItems;
+    plan.consecutive = consecutive;
+
+    recipient.purchased.plan = plan;
+    recipient.guilds.push(group._id);
+    await recipient.save();
+
+    user.guilds.push(group._id);
+    await user.save();
+    data.groupId = group._id;
+
+    await api.createSubscription(data);
+
+    let updatedUser = await User.findById(recipient._id).exec();
+
+    expect(updatedUser.purchased.plan.gemsBought).to.equal(3);
+    expect(updatedUser.purchased.plan.mysteryItems[0]).to.eql(mysteryItem);
+    expect(updatedUser.purchased.plan.consecutive.count).to.equal(consecutive.count);
+    expect(updatedUser.purchased.plan.consecutive.offset).to.equal(consecutive.offset);
+    expect(updatedUser.purchased.plan.consecutive.gemCapExtra).to.equal(consecutive.gemCapExtra);
+    expect(updatedUser.purchased.plan.consecutive.trinkets).to.equal(consecutive.trinkets);
+    expect(updatedUser.purchased.plan.dateCreated).to.eql(planCreatedDate);
+  });
+
+  it('does not modify a user with a group subscription when they join another group', async () => {
+    let recipient = new User();
+    recipient.profile.name = 'recipient';
+    plan.key = 'basic_earned';
+    recipient.purchased.plan = plan;
+    recipient.guilds.push(group._id);
+    await recipient.save();
+
+    user.guilds.push(group._id);
+    await user.save();
+    data.groupId = group._id;
+
+    await api.createSubscription(data);
+
+    let updatedUser = await User.findById(recipient._id).exec();
+    let firstDateCreated = updatedUser.purchased.plan.dateCreated;
+    let extraMonthsBeforeSecond = updatedUser.purchased.plan.extraMonths;
+
+    let group2 = generateGroup({
+      name: 'test group2',
+      type: 'guild',
+      privacy: 'public',
+      leader: user._id,
+    });
+    data.groupId = group2._id;
+    await group2.save();
+    recipient.guilds.push(group2._id);
+    await recipient.save();
+
+    await api.createSubscription(data);
+
+    updatedUser = await User.findById(recipient._id).exec();
+
+    expect(updatedUser.purchased.plan.planId).to.eql('group_plan_auto');
+    expect(updatedUser.purchased.plan.customerId).to.eql('group-plan');
+    expect(updatedUser.purchased.plan.dateUpdated).to.exist;
+    expect(updatedUser.purchased.plan.gemsBought).to.eql(0);
+    expect(updatedUser.purchased.plan.paymentMethod).to.eql('Group Plan');
+    expect(updatedUser.purchased.plan.extraMonths).to.eql(extraMonthsBeforeSecond);
+    expect(updatedUser.purchased.plan.dateTerminated).to.eql(null);
+    expect(updatedUser.purchased.plan.lastBillingDate).to.not.exist;
+    expect(updatedUser.purchased.plan.dateCreated).to.eql(firstDateCreated);
+  });
+
+  it('does not remove a user who is in two groups plans and leaves one', async () => {
+    let recipient = new User();
+    recipient.profile.name = 'recipient';
+    plan.key = 'basic_earned';
+    recipient.purchased.plan = plan;
+    recipient.guilds.push(group._id);
+    await recipient.save();
+
+    user.guilds.push(group._id);
+    await user.save();
+    data.groupId = group._id;
+
+    await api.createSubscription(data);
+
+    let updatedUser = await User.findById(recipient._id).exec();
+    let firstDateCreated = updatedUser.purchased.plan.dateCreated;
+    let extraMonthsBeforeSecond = updatedUser.purchased.plan.extraMonths;
+
+    let group2 = generateGroup({
+      name: 'test group2',
+      type: 'guild',
+      privacy: 'public',
+      leader: user._id,
+    });
+    data.groupId = group2._id;
+    await group2.save();
+    recipient.guilds.push(group2._id);
+    await recipient.save();
+
+    await api.createSubscription(data);
+
+    let updatedGroup = await Group.findById(group._id).exec();
+    await updatedGroup.leave(recipient);
+
+    updatedUser = await User.findById(recipient._id).exec();
+
+    expect(updatedUser.purchased.plan.planId).to.eql('group_plan_auto');
+    expect(updatedUser.purchased.plan.customerId).to.eql('group-plan');
+    expect(updatedUser.purchased.plan.dateUpdated).to.exist;
+    expect(updatedUser.purchased.plan.gemsBought).to.eql(0);
+    expect(updatedUser.purchased.plan.paymentMethod).to.eql('Group Plan');
+    expect(updatedUser.purchased.plan.extraMonths).to.eql(extraMonthsBeforeSecond);
+    expect(updatedUser.purchased.plan.dateTerminated).to.eql(null);
+    expect(updatedUser.purchased.plan.lastBillingDate).to.not.exist;
+    expect(updatedUser.purchased.plan.dateCreated).to.eql(firstDateCreated);
+  });
+
+  it('does not modify a user with an unlimited subscription', async () => {
+    plan.key = 'basic_earned';
+    plan.customerId = api.constants.UNLIMITED_CUSTOMER_ID;
+
+    let recipient = new User();
+    recipient.profile.name = 'recipient';
+    recipient.purchased.plan = plan;
+    recipient.guilds.push(group._id);
+    await recipient.save();
+
+    user.guilds.push(group._id);
+    await user.save();
+    data.groupId = group._id;
+
+    await api.createSubscription(data);
+
+    let updatedUser = await User.findById(recipient._id).exec();
+
+    expect(updatedUser.purchased.plan.planId).to.eql('basic_3mo');
+    expect(updatedUser.purchased.plan.customerId).to.eql(api.constants.UNLIMITED_CUSTOMER_ID);
+    expect(updatedUser.purchased.plan.dateUpdated).to.exist;
+    expect(updatedUser.purchased.plan.gemsBought).to.eql(0);
+    expect(updatedUser.purchased.plan.paymentMethod).to.eql('paymentMethod');
+    expect(updatedUser.purchased.plan.extraMonths).to.eql(0);
+    expect(updatedUser.purchased.plan.dateTerminated).to.eql(null);
+    expect(updatedUser.purchased.plan.lastBillingDate).to.exist;
+    expect(updatedUser.purchased.plan.dateCreated).to.exist;
+  });
+
+  it('updates a user with a cancelled but active group subscription', async () => {
+    plan.key = 'basic_earned';
+    plan.customerId = api.constants.GROUP_PLAN_CUSTOMER_ID;
+    plan.dateTerminated = moment().add(1, 'months');
+
+    let recipient = new User();
+    recipient.profile.name = 'recipient';
+    recipient.purchased.plan = plan;
+    recipient.guilds.push(group._id);
+    await recipient.save();
+
+    user.guilds.push(group._id);
+    await user.save();
+    data.groupId = group._id;
+
+    await api.createSubscription(data);
+
+    let updatedUser = await User.findById(recipient._id).exec();
+
+    expect(updatedUser.purchased.plan.planId).to.eql('group_plan_auto');
+    expect(updatedUser.purchased.plan.customerId).to.eql(api.constants.GROUP_PLAN_CUSTOMER_ID);
+    expect(updatedUser.purchased.plan.dateUpdated).to.exist;
+    expect(updatedUser.purchased.plan.gemsBought).to.eql(0);
+    expect(updatedUser.purchased.plan.paymentMethod).to.eql('Group Plan');
+    expect(updatedUser.purchased.plan.extraMonths).to.within(0, 2);
+    expect(updatedUser.purchased.plan.dateTerminated).to.eql(null);
+    expect(updatedUser.purchased.plan.lastBillingDate).to.not.exist;
+    expect(updatedUser.purchased.plan.dateCreated).to.exist;
+  });
+});

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

@@ -5,6 +5,7 @@ import {
   generateGroup,
 } from '../../../../helpers/api-unit.helper.js';
 import { model as User } from '../../../../../website/server/models/user';
+import { model as Group } from '../../../../../website/server/models/group';
 import { model as Coupon } from '../../../../../website/server/models/coupon';
 import stripePayments from '../../../../../website/server/libs/stripePayments';
 import payments from '../../../../../website/server/libs/payments';
@@ -394,6 +395,50 @@ describe('Stripe Payments', () => {
         subscriptionId,
       });
     });
+
+    it('subscribes a group with the correct number of group members', async () => {
+      token = 'test-token';
+      sub = data.sub;
+      groupId = group._id;
+      email = 'test@test.com';
+      headers = {};
+      user = new User();
+      user.guilds.push(groupId);
+      await user.save();
+      group.memberCount = 2;
+      await group.save();
+
+      await stripePayments.checkout({
+        token,
+        user,
+        gift,
+        sub,
+        groupId,
+        email,
+        headers,
+        coupon,
+      }, stripe);
+
+      expect(stripeCreateCustomerSpy).to.be.calledOnce;
+      expect(stripeCreateCustomerSpy).to.be.calledWith({
+        email,
+        metadata: { uuid: user._id },
+        card: token,
+        plan: sub.key,
+        quantity: 4,
+      });
+
+      expect(stripePaymentsCreateSubSpy).to.be.calledOnce;
+      expect(stripePaymentsCreateSubSpy).to.be.calledWith({
+        user,
+        customerId: customerIdResponse,
+        paymentMethod: 'Stripe',
+        sub,
+        headers,
+        groupId,
+        subscriptionId,
+      });
+    });
   });
 
   describe('edit subscription', () => {
@@ -658,4 +703,60 @@ describe('Stripe Payments', () => {
       });
     });
   });
+
+  describe('#upgradeGroupPlan', () => {
+    let spy, data, user, group;
+
+    beforeEach(async function () {
+      user = new User();
+      user.profile.name = 'sender';
+
+      data = {
+        user,
+        sub: {
+          key: 'basic_3mo', // @TODO: Validate that this is group
+        },
+        customerId: 'customer-id',
+        paymentMethod: 'Payment Method',
+        headers: {
+          'x-client': 'habitica-web',
+          'user-agent': '',
+        },
+      };
+
+      group = generateGroup({
+        name: 'test group',
+        type: 'guild',
+        privacy: 'public',
+        leader: user._id,
+      });
+      await group.save();
+
+      spy = sinon.stub(stripe.subscriptions, 'update');
+      spy.returnsPromise().resolves([]);
+      data.groupId = group._id;
+      data.sub.quantity = 3;
+      stripePayments.setStripeApi(stripe);
+    });
+
+    afterEach(function () {
+      sinon.restore(stripe.subscriptions.update);
+    });
+
+    it('updates a group plan quantity', async () => {
+      data.paymentMethod = 'Stripe';
+      await payments.createSubscription(data);
+
+      let updatedGroup = await Group.findById(group._id).exec();
+      expect(updatedGroup.purchased.plan.quantity).to.eql(3);
+
+      updatedGroup.memberCount += 1;
+      await updatedGroup.save();
+
+      await stripePayments.chargeForAdditionalGroupMember(updatedGroup);
+
+      expect(spy.calledOnce).to.be.true;
+      expect(updatedGroup.purchased.plan.quantity).to.eql(4);
+    });
+  });
 });

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

@@ -4,7 +4,6 @@ import {
   generateTodo,
   generateDaily,
 } from '../../../../helpers/api-unit.helper';
-import { cloneDeep } from 'lodash';
 import cronMiddleware from '../../../../../website/server/middlewares/cron';
 import moment from 'moment';
 import { model as User } from '../../../../../website/server/models/user';
@@ -60,7 +59,7 @@ describe('cron middleware', () => {
     cronMiddleware(req, res, done);
   });
 
-  it('should clear todos older than 30 days for free users', async (done) => {
+  it('should clear todos older than 30 days for free users', async () => {
     user.lastCron = moment(new Date()).subtract({days: 2});
     let task = generateTodo(user);
     task.dateCompleted = moment(new Date()).subtract({days: 31});
@@ -68,16 +67,21 @@ describe('cron middleware', () => {
     await task.save();
     await user.save();
 
+    await new Promise((resolve, reject) => {
       cronMiddleware(req, res, (err) => {
+        if (err) return reject(err);
+
         Tasks.Task.findOne({_id: task}, function (secondErr, taskFound) {
+          if (secondErr) return reject(err);
           expect(secondErr).to.not.exist;
           expect(taskFound).to.not.exist;
-        done(err);
+          resolve();
+        });
       });
     });
   });
 
-  it('should not clear todos older than 30 days for subscribed users', async (done) => {
+  it('should not clear todos older than 30 days for subscribed users', async () => {
     user.purchased.plan.customerId = 'subscribedId';
     user.purchased.plan.dateUpdated = moment('012013', 'MMYYYY');
     user.lastCron = moment(new Date()).subtract({days: 2});
@@ -87,16 +91,20 @@ describe('cron middleware', () => {
     await task.save();
     await user.save();
 
+    await new Promise((resolve, reject) => {
       cronMiddleware(req, res, (err) => {
+        if (err) return reject(err);
         Tasks.Task.findOne({_id: task}, function (secondErr, taskFound) {
+          if (secondErr) return reject(secondErr);
           expect(secondErr).to.not.exist;
           expect(taskFound).to.exist;
-        done(err);
+          resolve();
+        });
       });
     });
   });
 
-  it('should clear todos older than 90 days for subscribed users', async (done) => {
+  it('should clear todos older than 90 days for subscribed users', async () => {
     user.purchased.plan.customerId = 'subscribedId';
     user.purchased.plan.dateUpdated = moment('012013', 'MMYYYY');
     user.lastCron = moment(new Date()).subtract({days: 2});
@@ -107,39 +115,49 @@ describe('cron middleware', () => {
     await task.save();
     await user.save();
 
+    await new Promise((resolve, reject) => {
       cronMiddleware(req, res, (err) => {
+        if (err) return reject(err);
         Tasks.Task.findOne({_id: task}, function (secondErr, taskFound) {
+          if (secondErr) return reject(secondErr);
           expect(secondErr).to.not.exist;
           expect(taskFound).to.not.exist;
-        done(err);
+          resolve();
+        });
       });
     });
   });
 
-  it('should call next if user was not modified after cron', async (done) => {
+  it('should call next if user was not modified after cron', async () => {
     let hpBefore = user.stats.hp;
     user.lastCron = moment(new Date()).subtract({days: 2});
     await user.save();
 
+    await new Promise((resolve, reject) => {
       cronMiddleware(req, res, (err) => {
+        if (err) return reject(err);
         expect(hpBefore).to.equal(user.stats.hp);
-      done(err);
+        resolve();
+      });
     });
   });
 
-  it('updates user.auth.timestamps.loggedin and lastCron', async (done) => {
+  it('updates user.auth.timestamps.loggedin and lastCron', async () => {
     user.lastCron = moment(new Date()).subtract({days: 2});
     let now = new Date();
     await user.save();
 
+    await new Promise((resolve, reject) => {
       cronMiddleware(req, res, (err) => {
+        if (err) return reject(err);
         expect(moment(now).isSame(user.lastCron, 'day'));
         expect(moment(now).isSame(user.auth.timestamps.loggedin, 'day'));
-      done(err);
+        resolve();
+      });
     });
   });
 
-  it('does damage for missing dailies', async (done) => {
+  it('does damage for missing dailies', async () => {
     let hpBefore = user.stats.hp;
     user.lastCron = moment(new Date()).subtract({days: 2});
     let daily = generateDaily(user);
@@ -147,28 +165,34 @@ describe('cron middleware', () => {
     await daily.save();
     await user.save();
 
+    await new Promise((resolve, reject) => {
       cronMiddleware(req, res, (err) => {
+        if (err) return reject(err);
         expect(user.stats.hp).to.be.lessThan(hpBefore);
-      done(err);
+        resolve();
+      });
     });
   });
 
-  it('updates tasks', async (done) => {
+  it('updates tasks', async () => {
     user.lastCron = moment(new Date()).subtract({days: 2});
     let todo = generateTodo(user);
     let todoValueBefore = todo.value;
     await user.save();
 
-    cronMiddleware(req, res, () => {
-      Tasks.Task.findOne({_id: todo._id}, function (err, todoFound) {
-        expect(err).to.not.exist;
+    await new Promise((resolve, reject) => {
+      cronMiddleware(req, res, (err) => {
+        if (err) return reject(err);
+        Tasks.Task.findOne({_id: todo._id}, function (secondErr, todoFound) {
+          if (secondErr) return reject(secondErr);
           expect(todoFound.value).to.be.lessThan(todoValueBefore);
-        done();
+          resolve();
+        });
       });
     });
   });
 
-  it('applies quest progress', async (done) => {
+  it('applies quest progress', async () => {
     let hpBefore = user.stats.hp;
     user.lastCron = moment(new Date()).subtract({days: 2});
     let daily = generateDaily(user);
@@ -192,17 +216,20 @@ describe('cron middleware', () => {
 
     party.startQuest(user);
 
-    cronMiddleware(req, res, () => {
+    await new Promise((resolve, reject) => {
+      cronMiddleware(req, res, (err) => {
+        if (err) return reject(err);
         expect(user.stats.hp).to.be.lessThan(hpBefore);
-      done();
+        resolve();
+      });
     });
   });
 
-  it('recovers from failed cron and does not error when user is already cronning', async (done) => {
+  it('recovers from failed cron and does not error when user is already cronning', async () => {
     user.lastCron = moment(new Date()).subtract({days: 2});
     await user.save();
 
-    let updatedUser = cloneDeep(user);
+    let updatedUser = user.toObject();
     updatedUser.nMatched = 0;
 
     sandbox.spy(cronLib, 'recoverCron');
@@ -215,10 +242,13 @@ describe('cron middleware', () => {
         },
       });
 
-    cronMiddleware(req, res, () => {
+    await new Promise((resolve, reject) => {
+      cronMiddleware(req, res, (err) => {
+        if (err) return reject(err);
         expect(cronLib.recoverCron).to.be.calledOnce;
 
-      done();
+        resolve();
+      });
     });
   });
 });

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

@@ -1,3 +1,6 @@
+import moment from 'moment';
+import { v4 as generateUUID } from 'uuid';
+import validator from 'validator';
 import { sleep } from '../../../../helpers/api-unit.helper';
 import { model as Group, INVITES_LIMIT } from '../../../../../website/server/models/group';
 import { model as User } from '../../../../../website/server/models/user';
@@ -7,9 +10,7 @@ import {
 import { quests as questScrolls } from '../../../../../website/common/script/content';
 import { groupChatReceivedWebhook } from '../../../../../website/server/libs/webhook';
 import * as email from '../../../../../website/server/libs/email';
-import validator from 'validator';
 import { TAVERN_ID } from '../../../../../website/common/script/';
-import { v4 as generateUUID } from 'uuid';
 import shared from '../../../../../website/common';
 
 describe('Group Model', () => {
@@ -667,6 +668,49 @@ describe('Group Model', () => {
         expect(party.memberCount).to.eql(1);
       });
 
+      it('does not allow a leader to leave a group with an active subscription', async () => {
+        party.memberCount = 2;
+        party.purchased.plan.customerId = '110002222333';
+
+        await expect(party.leave(questLeader))
+          .to.eventually.be.rejected.and.to.eql({
+            name: 'NotAuthorized',
+            httpCode: 401,
+            message: shared.i18n.t('leaderCannotLeaveGroupWithActiveGroup'),
+          });
+
+        party = await Group.findOne({_id: party._id});
+        expect(party).to.exist;
+        expect(party.memberCount).to.eql(1);
+      });
+
+      it('deletes a private group when the last member leaves and a subscription is cancelled', async () => {
+        let guild = new Group({
+          name: 'test guild',
+          type: 'guild',
+          memberCount: 1,
+        });
+
+        let leader = new User({
+          guilds: [guild._id],
+        });
+
+        guild.leader = leader._id;
+
+        await Promise.all([
+          guild.save(),
+          leader.save(),
+        ]);
+
+        guild.purchased.plan.customerId = '110002222333';
+        guild.purchased.plan.dateTerminated = new Date();
+
+        await guild.leave(leader);
+
+        party = await Group.findOne({_id: guild._id});
+        expect(party).to.not.exist;
+      });
+
       it('does not delete a public group when the last member leaves', async () => {
         party.privacy = 'public';
 
@@ -1045,7 +1089,7 @@ describe('Group Model', () => {
 
           expect(email.sendTxn).to.be.calledOnce;
 
-          let memberIds = _.pluck(email.sendTxn.args[0][0], '_id');
+          let memberIds = _.map(email.sendTxn.args[0][0], '_id');
           let typeOfEmail = email.sendTxn.args[0][1];
 
           expect(memberIds).to.have.a.lengthOf(2);
@@ -1068,7 +1112,7 @@ describe('Group Model', () => {
 
           expect(email.sendTxn).to.be.calledOnce;
 
-          let memberIds = _.pluck(email.sendTxn.args[0][0], '_id');
+          let memberIds = _.map(email.sendTxn.args[0][0], '_id');
 
           expect(memberIds).to.have.a.lengthOf(1);
           expect(memberIds).to.not.include(participatingMember._id);
@@ -1089,7 +1133,7 @@ describe('Group Model', () => {
 
           expect(email.sendTxn).to.be.calledOnce;
 
-          let memberIds = _.pluck(email.sendTxn.args[0][0], '_id');
+          let memberIds = _.map(email.sendTxn.args[0][0], '_id');
 
           expect(memberIds).to.have.a.lengthOf(1);
           expect(memberIds).to.not.include(participatingMember._id);
@@ -1545,5 +1589,57 @@ describe('Group Model', () => {
         expect(args.find(arg => arg[0][0].id === memberWithWebhook3.webhooks[0].id)).to.be.exist;
       });
     });
+
+    context('isSubscribed', () => {
+      it('returns false if group does not have customer id', () => {
+        expect(party.isSubscribed()).to.be.undefined;
+      });
+
+      it('returns true if group does not have plan.dateTerminated', () => {
+        party.purchased.plan.customerId = 'test-id';
+
+        expect(party.isSubscribed()).to.be.true;
+      });
+
+      it('returns true if group if plan.dateTerminated is after today', () => {
+        party.purchased.plan.customerId = 'test-id';
+        party.purchased.plan.dateTerminated = moment().add(1, 'days').toDate();
+
+        expect(party.isSubscribed()).to.be.true;
+      });
+
+      it('returns false if group if plan.dateTerminated is before today', () => {
+        party.purchased.plan.customerId = 'test-id';
+        party.purchased.plan.dateTerminated = moment().subtract(1, 'days').toDate();
+
+        expect(party.isSubscribed()).to.be.false;
+      });
+    });
+
+    context('hasNotCancelled', () => {
+      it('returns false if group does not have customer id', () => {
+        expect(party.hasNotCancelled()).to.be.undefined;
+      });
+
+      it('returns true if party does not have plan.dateTerminated', () => {
+        party.purchased.plan.customerId = 'test-id';
+
+        expect(party.hasNotCancelled()).to.be.true;
+      });
+
+      it('returns false if party if plan.dateTerminated is after today', () => {
+        party.purchased.plan.customerId = 'test-id';
+        party.purchased.plan.dateTerminated = moment().add(1, 'days').toDate();
+
+        expect(party.hasNotCancelled()).to.be.false;
+      });
+
+      it('returns false if party if plan.dateTerminated is before today', () => {
+        party.purchased.plan.customerId = 'test-id';
+        party.purchased.plan.dateTerminated = moment().subtract(1, 'days').toDate();
+
+        expect(party.hasNotCancelled()).to.be.false;
+      });
+    });
   });
 });

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 common from '../../../../../website/common';
-import Bluebird from 'bluebird';
 
 describe('User Model', () => {
   it('keeps user._tmp when calling .toJSON', () => {
@@ -145,4 +146,111 @@ describe('User Model', () => {
       });
     });
   });
+
+  context('isSubscribed', () => {
+    let user;
+    beforeEach(() => {
+      user = new User();
+    });
+
+
+    it('returns false if user does not have customer id', () => {
+      expect(user.isSubscribed()).to.be.undefined;
+    });
+
+    it('returns true if user does not have plan.dateTerminated', () => {
+      user.purchased.plan.customerId = 'test-id';
+
+      expect(user.isSubscribed()).to.be.true;
+    });
+
+    it('returns true if user if plan.dateTerminated is after today', () => {
+      user.purchased.plan.customerId = 'test-id';
+      user.purchased.plan.dateTerminated = moment().add(1, 'days').toDate();
+
+      expect(user.isSubscribed()).to.be.true;
+    });
+
+    it('returns false if user if plan.dateTerminated is before today', () => {
+      user.purchased.plan.customerId = 'test-id';
+      user.purchased.plan.dateTerminated = moment().subtract(1, 'days').toDate();
+
+      expect(user.isSubscribed()).to.be.false;
+    });
+  });
+
+  context('hasNotCancelled', () => {
+    let user;
+    beforeEach(() => {
+      user = new User();
+    });
+
+
+    it('returns false if user does not have customer id', () => {
+      expect(user.hasNotCancelled()).to.be.undefined;
+    });
+
+    it('returns true if user does not have plan.dateTerminated', () => {
+      user.purchased.plan.customerId = 'test-id';
+
+      expect(user.hasNotCancelled()).to.be.true;
+    });
+
+    it('returns false if user if plan.dateTerminated is after today', () => {
+      user.purchased.plan.customerId = 'test-id';
+      user.purchased.plan.dateTerminated = moment().add(1, 'days').toDate();
+
+      expect(user.hasNotCancelled()).to.be.false;
+    });
+
+    it('returns false if user if plan.dateTerminated is before today', () => {
+      user.purchased.plan.customerId = 'test-id';
+      user.purchased.plan.dateTerminated = moment().subtract(1, 'days').toDate();
+
+      expect(user.hasNotCancelled()).to.be.false;
+    });
+  });
+
+  context('pre-save hook', () => {
+    it('does not try to award achievements when achievements or items not selected in query', async () => {
+      let user = new User();
+      user = await user.save(); // necessary for user.isSelected to work correctly
+
+      // Create conditions for the Beast Master achievement to be awarded
+      user.achievements.beastMasterCount = 3;
+      expect(user.achievements.beastMaster).to.not.equal(true); // verify that it was not awarded initially
+
+      user = await user.save();
+      // verify that it's been awarded
+      expect(user.achievements.beastMaster).to.equal(true);
+
+      // reset the user
+      user.achievements.beastMasterCount = 0;
+      user.achievements.beastMaster = false;
+
+      user = await user.save();
+      // verify it's been removed
+      expect(user.achievements.beastMaster).to.equal(false);
+
+      // fetch the user without selecting the 'items' field
+      user = await User.findById(user._id).select('-items').exec();
+      expect(user.isSelected('items')).to.equal(false);
+
+      // create the conditions for the beast master achievement but this time it should not be awarded
+      user.achievements.beastMasterCount = 3;
+      user = await user.save();
+      expect(user.achievements.beastMaster).to.equal(false);
+
+      // reset
+      user.achievements.beastMasterCount = 0;
+      user = await user.save();
+
+      // this time with achievements not selected
+      user = await User.findById(user._id).select('-achievements').exec();
+      expect(user.isSelected('achievements')).to.equal(false);
+      user.achievements.beastMasterCount = 3;
+      user = await user.save();
+      expect(user.achievements.beastMaster).to.not.equal(true);
+    });
+  });
 });

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

@@ -1,14 +1,14 @@
 'use strict';
 
 describe("Chat Controller", function() {
-  var scope, ctrl, user, $rootScope, $controller;
+  var scope, ctrl, user, $rootScope, $controller, $httpBackend, html;
 
   beforeEach(function() {
     module(function($provide) {
       $provide.value('User', {});
     });
 
-    inject(function(_$rootScope_, _$controller_){
+    inject(function(_$rootScope_, _$controller_, _$compile_, _$httpBackend_){
       user = specHelper.newUser();
       user._id = "unique-user-id";
       $rootScope = _$rootScope_;
@@ -16,14 +16,21 @@ describe("Chat Controller", function() {
       scope = _$rootScope_.$new();
 
       $controller = _$controller_;
+      $httpBackend = _$httpBackend_;
 
       // Load RootCtrl to ensure shared behaviors are loaded
       $controller('RootCtrl',  {$scope: scope, User: {user: user}});
 
-      ctrl = $controller('ChatCtrl', {$scope: scope});
+      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 = {
@@ -68,5 +75,47 @@ describe("Chat Controller", function() {
       }));
     });
   });
+  
+  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/inventoryCtrlSpec.js

@@ -30,7 +30,9 @@ describe('Inventory Controller', function() {
           suppressModals: {}
         },
         purchased: {
-          plan: {}
+          plan: {
+            mysteryItems: [],
+          },
         },
       });
 

test/client/unit/index.js

@@ -2,8 +2,17 @@
 // and babel-runtime doesn't affect external libraries
 require('babel-polyfill');
 
-// require all test files (files that ends with .spec.js)
-let testsContext = require.context('./specs', true, /\.spec$/);
+// Automatically setup SinonJS' sandbox for each test
+beforeEach(() => {
+  global.sandbox = sinon.sandbox.create();
+});
+
+afterEach(() => {
+  global.sandbox.restore();
+});
+
+// require all test files
+let testsContext = require.context('./specs', true, /\.js$/);
 testsContext.keys().forEach(testsContext);
 
 // require all .vue and .js files except main.js for coverage.

test/client/unit/karma.conf.js

@@ -17,7 +17,7 @@ module.exports = function (config) {
     //    http://karma-runner.github.io/0.13/config/browsers.html
     // 2. add it to the `browsers` array below.
     browsers: ['PhantomJS'],
-    frameworks: ['mocha', 'sinon-chai'],
+    frameworks: ['mocha', 'sinon-stub-promise', 'sinon-chai', 'chai-as-promised', 'chai'],
     reporters: ['spec', 'coverage'],
     files: ['./index.js'],
     preprocessors: {

test/client/unit/specs/mixins/groupsUtilities.js

@@ -0,0 +1,61 @@
+import groupsUtilities from 'client/mixins/groupsUtilities';
+import { TAVERN_ID } from 'common/script/constants';
+import Vue from 'vue';
+
+describe('Groups Utilities Mixin', () => {
+  let instance, user;
+
+  before(() => {
+    instance = new Vue({
+      mixins: [groupsUtilities],
+    });
+
+    user = {
+      _id: '123',
+      party: {
+        _id: '456',
+      },
+      guilds: ['789'],
+    };
+  });
+
+  describe('isMemberOfGroup', () => {
+    it('registers as a method', () => {
+      expect(instance.isMemberOfGroup).to.be.a.function;
+    });
+
+    it('returns true when the group is the Tavern', () => {
+      expect(instance.isMemberOfGroup(user, {
+        _id: TAVERN_ID,
+      })).to.equal(true);
+    });
+
+    it('returns true when the group is the user\'s party', () => {
+      expect(instance.isMemberOfGroup(user, {
+        type: 'party',
+        _id: user.party._id,
+      })).to.equal(true);
+    });
+
+    it('returns false when the group is not the user\'s party', () => {
+      expect(instance.isMemberOfGroup(user, {
+        type: 'party',
+        _id: 'not my party',
+      })).to.equal(false);
+    });
+
+    it('returns true when the group is not a guild of which the user is a member', () => {
+      expect(instance.isMemberOfGroup(user, {
+        type: 'guild',
+        _id: user.guilds[0],
+      })).to.equal(true);
+    });
+
+    it('returns false when the group is not a guild of which the user is a member', () => {
+      expect(instance.isMemberOfGroup(user, {
+        type: 'guild',
+        _id: 'not my guild',
+      })).to.equal(false);
+    });
+  });
+});

test/client/unit/specs/store/actions/guilds.js

@@ -0,0 +1,17 @@
+import { fetchAll as fetchAllGuilds } from 'client/store/actions/guilds';
+import axios from 'axios';
+import store from 'client/store';
+
+describe('guilds actions', () => {
+  it('fetchAll', async () => {
+    const guilds = [{_id: 1}];
+    sandbox
+      .stub(axios, 'get')
+      .withArgs('/api/v3/groups?type=publicGuilds')
+      .returns(Promise.resolve({data: {data: guilds}}));
+
+    await fetchAllGuilds(store);
+
+    expect(store.state.guilds).to.equal(guilds);
+  });
+});

test/client/unit/specs/store/actions/tasks.js

@@ -0,0 +1,14 @@
+import { fetchUserTasks } from 'client/store/actions/tasks';
+import axios from 'axios';
+import store from 'client/store';
+
+describe('tasks actions', () => {
+  it('fetchUserTasks', async () => {
+    const tasks = [{_id: 1}];
+    sandbox.stub(axios, 'get').withArgs('/api/v3/tasks/user').returns(Promise.resolve({data: {data: tasks}}));
+
+    await fetchUserTasks(store);
+
+    expect(store.state.tasks).to.equal(tasks);
+  });
+});

test/client/unit/specs/store/actions/user.js

@@ -0,0 +1,14 @@
+import { fetch as fetchUser } from 'client/store/actions/user';
+import axios from 'axios';
+import store from 'client/store';
+
+describe('user actions', () => {
+  it('fetch', async () => {
+    const user = {_id: 1};
+    sandbox.stub(axios, 'get').withArgs('/api/v3/user').returns(Promise.resolve({data: {data: user}}));
+
+    await fetchUser(store);
+
+    expect(store.state.user).to.equal(user);
+  });
+});

test/common/libs/taskDefaults.test.js

@@ -12,6 +12,9 @@ describe('taskDefaults', () => {
     expect(task.up).to.eql(true);
     expect(task.down).to.eql(true);
     expect(task.history).to.eql([]);
+    expect(task.frequency).to.equal('daily');
+    expect(task.counterUp).to.equal(0);
+    expect(task.counterDown).to.equal(0);
   });
 
   it('applies defaults to a daily', () => {

test/common/ops/addTask.js

@@ -33,6 +33,9 @@ describe('shared.ops.addTask', () => {
     expect(habit.down).to.equal(false);
     expect(habit.history).to.eql([]);
     expect(habit.checklist).to.not.exist;
+    expect(habit.frequency).to.equal('daily');
+    expect(habit.counterUp).to.equal(0);
+    expect(habit.counterDown).to.equal(0);
   });
 
   it('adds an habtit when type is invalid', () => {

test/common/ops/buyArmoire.js

@@ -15,13 +15,13 @@ import i18n from '../../../website/common/script/i18n';
 function getFullArmoire () {
   let fullArmoire = {};
 
-  _(content.gearTypes).each((type) => {
-    _(content.gear.tree[type].armoire).each((gearObject) => {
+  _.each(content.gearTypes, (type) => {
+    _.each(content.gear.tree[type].armoire, (gearObject) => {
       let armoireKey = gearObject.key;
 
       fullArmoire[armoireKey] = true;
-    }).value();
-  }).value();
+    });
+  });
 
   return fullArmoire;
 }

test/common/ops/scoreTask.test.js

@@ -138,6 +138,9 @@ describe('shared.ops.scoreTask', () => {
       todo = generateTodo({ userId: ref.afterUser._id, text: 'some todo' });
 
       expect(habit.history.length).to.eql(0);
+      expect(habit.frequency).to.equal('daily');
+      expect(habit.counterUp).to.equal(0);
+      expect(habit.counterDown).to.equal(0);
 
       // before and after are the same user
       expect(ref.beforeUser._id).to.exist;
@@ -202,17 +205,28 @@ describe('shared.ops.scoreTask', () => {
 
         expect(habit.history.length).to.eql(1);
         expect(habit.value).to.be.greaterThan(0);
+        expect(habit.counterUp).to.equal(5);
 
         expect(ref.afterUser.stats.hp).to.eql(50);
         expect(ref.afterUser.stats.exp).to.be.greaterThan(ref.beforeUser.stats.exp);
         expect(ref.afterUser.stats.gp).to.be.greaterThan(ref.beforeUser.stats.gp);
       });
 
+      it('adds score notes', () => {
+        let scoreNotesString = 'scoreNotes';
+        habit.scoreNotes = scoreNotesString;
+        options = { user: ref.afterUser, task: habit, direction: 'up', times: 5, cron: false };
+        scoreTask(options);
+
+        expect(habit.history[0].scoreNotes).to.eql(scoreNotesString);
+      });
+
       it('down', () => {
         scoreTask({user: ref.afterUser, task: habit, direction: 'down', times: 5, cron: false}, {});
 
         expect(habit.history.length).to.eql(1);
         expect(habit.value).to.be.lessThan(0);
+        expect(habit.counterDown).to.equal(5);
 
         expect(ref.afterUser.stats.hp).to.be.lessThan(ref.beforeUser.stats.hp);
         expect(ref.afterUser.stats.exp).to.eql(0);

test/common/shouldDo.test.js

@@ -0,0 +1,310 @@
+// import { shouldDo, DAY_MAPPING } from '../../website/common/script/cron';
+// import moment from 'moment';
+// import 'moment-recur';
+
+// describe('shouldDo', () => {
+//   let day, dailyTask;
+//   let options = {};
+
+//   beforeEach(() => {
+//     day = new Date();
+//     dailyTask = {
+//       completed: 'false',
+//       everyX: 1,
+//       frequency: 'weekly',
+//       type: 'daily',
+//       repeat: {
+//         su: true,
+//         s: true,
+//         f: true,
+//         th: true,
+//         w: true,
+//         t: true,
+//         m: true,
+//       },
+//       startDate: new Date(),
+//     };
+//   });
+
+//   it('leaves Daily inactive before start date', () => {
+//     dailyTask.startDate = moment().add(1, 'days').toDate();
+
+//     expect(shouldDo(day, dailyTask, options)).to.equal(false);
+//   });
+
+//   context('Every X Days', () => {
+//     it('leaves Daily inactive in between X Day intervals', () => {
+//       dailyTask.startDate = moment().subtract(1, 'days').toDate();
+//       dailyTask.frequency = 'daily';
+//       dailyTask.everyX = 2;
+
+//       expect(shouldDo(day, dailyTask, options)).to.equal(false);
+//     });
+
+//     it('activates Daily on multiples of X Days', () => {
+//       dailyTask.startDate = moment().subtract(7, 'days').toDate();
+//       dailyTask.frequency = 'daily';
+//       dailyTask.everyX = 7;
+
+//       expect(shouldDo(day, dailyTask, options)).to.equal(true);
+//     });
+//   });
+
+//   context('Certain Days of the Week', () => {
+//     it('leaves Daily inactive if day of the week does not match', () => {
+//       dailyTask.repeat = {
+//         su: false,
+//         s: false,
+//         f: false,
+//         th: false,
+//         w: false,
+//         t: false,
+//         m: false,
+//       };
+
+//       for (let weekday of [0, 1, 2, 3, 4, 5, 6]) {
+//         day = moment().day(weekday).toDate();
+
+//         expect(shouldDo(day, dailyTask, options)).to.equal(false);
+//       }
+//     });
+
+//     it('leaves Daily inactive if day of the week does not match and active on the day it matches', () => {
+//       dailyTask.repeat = {
+//         su: false,
+//         s: false,
+//         f: false,
+//         th: true,
+//         w: false,
+//         t: false,
+//         m: false,
+//       };
+
+//       for (let weekday of [0, 1, 2, 3, 4, 5, 6]) {
+//         day = moment().add(1, 'weeks').day(weekday).toDate();
+
+//         if (weekday === 4) {
+//           expect(shouldDo(day, dailyTask, options)).to.equal(true);
+//         } else {
+//           expect(shouldDo(day, dailyTask, options)).to.equal(false);
+//         }
+//       }
+//     });
+
+//     it('activates Daily on matching days of the week', () => {
+//       expect(shouldDo(day, dailyTask, options)).to.equal(true);
+//     });
+//   });
+
+//   context('Every X Weeks', () => {
+//     it('leaves daily inactive if it has not been the specified number of weeks', () => {
+//       dailyTask.everyX = 3;
+//       let tomorrow = moment().add(1, 'day').toDate();
+
+//       expect(shouldDo(tomorrow, dailyTask, options)).to.equal(false);
+//     });
+
+//     it('leaves daily inactive if on every (x) week on weekday it is incorrect weekday', () => {
+//       dailyTask.repeat = {
+//         su: false,
+//         s: false,
+//         f: false,
+//         th: false,
+//         w: false,
+//         t: false,
+//         m: false,
+//       };
+
+//       day = moment();
+//       dailyTask.repeat[DAY_MAPPING[day.day()]] = true;
+//       dailyTask.everyX = 3;
+//       let threeWeeksFromTodayPlusOne = day.add(1, 'day').add(3, 'weeks').toDate();
+
+//       expect(shouldDo(threeWeeksFromTodayPlusOne, dailyTask, options)).to.equal(false);
+//     });
+
+//     it('activates Daily on matching week', () => {
+//       dailyTask.everyX = 3;
+//       let threeWeeksFromToday = moment().add(3, 'weeks').toDate();
+
+//       expect(shouldDo(threeWeeksFromToday, dailyTask, options)).to.equal(true);
+//     });
+
+//     it('activates Daily on every (x) week on weekday', () => {
+//       dailyTask.repeat = {
+//         su: false,
+//         s: false,
+//         f: false,
+//         th: false,
+//         w: false,
+//         t: false,
+//         m: false,
+//       };
+
+//       day = moment();
+//       dailyTask.repeat[DAY_MAPPING[day.day()]] = true;
+//       dailyTask.everyX = 3;
+//       let threeWeeksFromToday = day.add(6, 'weeks').day(day.day()).toDate();
+
+//       expect(shouldDo(threeWeeksFromToday, dailyTask, options)).to.equal(true);
+//     });
+//   });
+
+//   context('Monthly - Every X Months on a specified date', () => {
+//     it('leaves daily inactive if not day of the month', () => {
+//       dailyTask.everyX = 1;
+//       dailyTask.frequency = 'monthly';
+//       dailyTask.daysOfMonth = [15];
+//       let tomorrow = moment().add(1, 'day').toDate();// @TODO: make sure this is not the 15
+
+//       expect(shouldDo(tomorrow, dailyTask, options)).to.equal(false);
+//     });
+
+//     it('activates Daily on matching day of month', () => {
+//       day = moment();
+//       dailyTask.everyX = 1;
+//       dailyTask.frequency = 'monthly';
+//       dailyTask.daysOfMonth = [day.date()];
+//       day = day.add(1, 'months').date(day.date()).toDate();
+
+//       expect(shouldDo(day, dailyTask, options)).to.equal(true);
+//     });
+
+//     it('leaves daily inactive if not on date of the x month', () => {
+//       dailyTask.everyX = 2;
+//       dailyTask.frequency = 'monthly';
+//       dailyTask.daysOfMonth = [15];
+//       let tomorrow = moment().add(2, 'months').add(1, 'day').toDate();
+
+//       expect(shouldDo(tomorrow, dailyTask, options)).to.equal(false);
+//     });
+
+//     it('activates Daily if on date of the x month', () => {
+//       dailyTask.everyX = 2;
+//       dailyTask.frequency = 'monthly';
+//       dailyTask.daysOfMonth = [15];
+//       day = moment().add(2, 'months').date(15).toDate();
+//       expect(shouldDo(day, dailyTask, options)).to.equal(true);
+//     });
+//   });
+
+//   context('Monthly - Certain days of the nth Week', () => {
+//     it('leaves daily inactive if not the correct week of the month on the day of the start date', () => {
+//       dailyTask.repeat = {
+//         su: false,
+//         s: false,
+//         f: false,
+//         th: false,
+//         w: false,
+//         t: false,
+//         m: false,
+//       };
+
+//       let today = moment('01/27/2017');
+//       let week = today.monthWeek();
+//       let dayOfWeek = today.day();
+//       dailyTask.startDate = today.toDate();
+//       dailyTask.weeksOfMonth = [week];
+//       dailyTask.repeat[DAY_MAPPING[dayOfWeek]] = true;
+//       dailyTask.everyX = 1;
+//       dailyTask.frequency = 'monthly';
+//       day = moment('02/23/2017');
+
+//       expect(shouldDo(day, dailyTask, options)).to.equal(false);
+//     });
+
+//     it('activates Daily if correct week of the month on the day of the start date', () => {
+//       dailyTask.repeat = {
+//         su: false,
+//         s: false,
+//         f: false,
+//         th: false,
+//         w: false,
+//         t: false,
+//         m: false,
+//       };
+
+//       let today = moment('01/27/2017');
+//       let week = today.monthWeek();
+//       let dayOfWeek = today.day();
+//       dailyTask.startDate = today.toDate();
+//       dailyTask.weeksOfMonth = [week];
+//       dailyTask.repeat[DAY_MAPPING[dayOfWeek]] = true;
+//       dailyTask.everyX = 1;
+//       dailyTask.frequency = 'monthly';
+//       day = moment('02/24/2017');
+
+//       expect(shouldDo(day, dailyTask, options)).to.equal(true);
+//     });
+
+//     it('leaves daily inactive if not day of the month with every x month on weekday', () => {
+//       dailyTask.repeat = {
+//         su: false,
+//         s: false,
+//         f: false,
+//         th: false,
+//         w: false,
+//         t: false,
+//         m: false,
+//       };
+
+//       let today = moment('01/26/2017');
+//       let week = today.monthWeek();
+//       let dayOfWeek = today.day();
+//       dailyTask.startDate = today.toDate();
+//       dailyTask.weeksOfMonth = [week];
+//       dailyTask.repeat[DAY_MAPPING[dayOfWeek]] = true;
+//       dailyTask.everyX = 2;
+//       dailyTask.frequency = 'monthly';
+
+//       day = moment('03/24/2017');
+
+//       expect(shouldDo(day, dailyTask, options)).to.equal(false);
+//     });
+
+//     it('activates Daily if on nth weekday of the x month', () => {
+//       dailyTask.repeat = {
+//         su: false,
+//         s: false,
+//         f: false,
+//         th: false,
+//         w: false,
+//         t: false,
+//         m: false,
+//       };
+
+//       let today = moment('01/27/2017');
+//       let week = today.monthWeek();
+//       let dayOfWeek = today.day();
+//       dailyTask.startDate = today.toDate();
+//       dailyTask.weeksOfMonth = [week];
+//       dailyTask.repeat[DAY_MAPPING[dayOfWeek]] = true;
+//       dailyTask.everyX = 2;
+//       dailyTask.frequency = 'monthly';
+
+//       day = moment('03/24/2017');
+
+//       expect(shouldDo(day, dailyTask, options)).to.equal(true);
+//     });
+//   });
+
+//   context('Every X Years', () => {
+//     it('leaves daily inactive if not the correct year', () => {
+//       day = moment();
+//       dailyTask.everyX = 2;
+//       dailyTask.frequency = 'yearly';
+//       day = day.add(1, 'day').toDate();
+
+//       expect(shouldDo(day, dailyTask, options)).to.equal(false);
+//     });
+
+//     it('activates Daily on matching year', () => {
+//       day = moment();
+//       dailyTask.everyX = 2;
+//       dailyTask.frequency = 'yearly';
+//       day = day.add(2, 'years').toDate();
+
+//       expect(shouldDo(day, dailyTask, options)).to.equal(true);
+//     });
+//   });
+// });

test/content/faq.js

@@ -8,19 +8,19 @@ import {questions, stillNeedHelp} from '../../website/common/script/content/faq'
 describe('FAQ Locales', () => {
   describe('Questions', () => {
     it('has a valid questions', () => {
-      each(questions, (question, key) => {
+      each(questions, (question) => {
         expectValidTranslationString(question.question);
       });
     });
 
     it('has a valid ios answers', () => {
-      each(questions, (question, key) => {
+      each(questions, (question) => {
         expectValidTranslationString(question.ios);
       });
     });
 
     it('has a valid web answers', () => {
-      each(questions, (question, key) => {
+      each(questions, (question) => {
         expectValidTranslationString(question.web);
       });
     });

test/content/gear.js

@@ -1,3 +1,4 @@
+/* eslint-disable camelcase */
 import {
   expectValidTranslationString,
 } from '../helpers/content.helper';
@@ -68,7 +69,7 @@ describe('Gear', () => {
       weapon_special_0: 70,
       weapon_special_2: 300,
       weapon_special_3: 300,
-    }
+    };
 
     each(cases, (tierRequirement, key) => {
       context(key, () => {

test/content/mysterySets.test.js

@@ -1,13 +1,13 @@
 import {each} from 'lodash';
 import {
-  expectValidTranslationString
+  expectValidTranslationString,
 } from '../helpers/content.helper';
 
 import mysterySets from '../../website/common/script/content/mystery-sets';
 
 describe('Mystery Sets', () => {
   it('has a valid text string', () => {
-    each(mysterySets, (set, key) => {
+    each(mysterySets, (set) => {
       expectValidTranslationString(set.text);
     });
   });

test/content/time-travelers.test.js

@@ -1,9 +1,8 @@
-import _ from 'lodash';
 import {
   generateUser,
 } from '../helpers/common.helper';
 
-import timeTravelers from '../../website/common/script/content/time-travelers'
+import timeTravelers from '../../website/common/script/content/time-travelers';
 
 describe('time-travelers store', () => {
   let user;
@@ -12,7 +11,7 @@ describe('time-travelers store', () => {
   });
 
   it('removes owned sets from the time travelers store', () => {
-		user.items.gear.owned['head_mystery_201602'] = true;
+    user.items.gear.owned.head_mystery_201602 = true; // eslint-disable-line camelcase
     expect(timeTravelers.timeTravelerStore(user)['201602']).to.not.exist;
     expect(timeTravelers.timeTravelerStore(user)['201603']).to.exist;
   });

test/content/translaotr.js

@@ -4,7 +4,7 @@ import translator from '../../website/common/script/content/translation';
 describe('Translator', () => {
   it('returns error message if string is not properly formatted', () => {
     let improperlyFormattedString = translator('petName', {attr: 0})();
-    expect(improperlyFormattedString).to.eql(STRING_ERROR_MSG);
+    expect(improperlyFormattedString).to.match(STRING_ERROR_MSG);
   });
 
   it('returns an error message if string does not exist', () => {

test/helpers/api-integration/api-classes.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-use-before-define */
-
+import moment from 'moment';
 import { requester } from './requester';
 import {
   getDocument as getDocumentFromMongo,
@@ -82,6 +82,19 @@ export class ApiGroup extends ApiObject {
 
     return await this.update(update);
   }
+
+  async createCancelledSubscription () {
+    let update = {
+      purchased: {
+        plan: {
+          customerId: 'example-customer',
+          dateTerminated: moment().add(1, 'days').toDate(),
+        },
+      },
+    };
+
+    return await this.update(update);
+  }
 }
 
 export class ApiChallenge extends ApiObject {

test/helpers/api-unit.helper.js

@@ -1,6 +1,6 @@
 import '../../website/server/libs/i18n';
 import mongoose from 'mongoose';
-import { defaultsDeep as defaults } from 'lodash';
+import defaultsDeep from 'lodash/defaultsDeep';
 import { model as User } from '../../website/server/models/user';
 import { model as Group } from '../../website/server/models/group';
 import { model as Challenge } from '../../website/server/models/challenge';
@@ -45,7 +45,7 @@ export function generateRes (options = {}) {
     },
   };
 
-  return defaults(options, defaultRes);
+  return defaultsDeep(options, defaultRes);
 }
 
 export function generateReq (options = {}) {
@@ -56,7 +56,7 @@ export function generateReq (options = {}) {
     header: sandbox.stub().returns(null),
   };
 
-  return defaults(options, defaultReq);
+  return defaultsDeep(options, defaultReq);
 }
 
 export function generateNext (func) {

test/helpers/content.helper.js

@@ -2,7 +2,7 @@ require('./globals.helper');
 import i18n from '../../website/common/script/i18n';
 i18n.translations = require('../../website/server/libs/i18n').translations;
 
-export const STRING_ERROR_MSG = 'Error processing the string. Please see Help > Report a Bug.';
+export const STRING_ERROR_MSG = /^Error processing the string ".*". Please see Help > Report a Bug.$/;
 export const STRING_DOES_NOT_EXIST_MSG = /^String '.*' not found.$/;
 
 export function expectValidTranslationString (attribute) {

test/helpers/mongo.js

@@ -74,6 +74,7 @@ export async function resetHabiticaDB () {
               name: 'HabitRPG',
               type: 'guild',
               privacy: 'public',
+              memberCount: 0,
             }, (insertErr2) => {
               if (insertErr2) return reject(insertErr2);
 

website/assets/sprites/dist/spritesmith-largeSprites-0.css

@@ -1,252 +1,246 @@
 .promo_android {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1623px -148px;
+  background-position: -1651px -180px;
   width: 175px;
   height: 175px;
 }
 .promo_backgrounds_armoire_201602 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -706px -600px;
+  background-position: -565px -600px;
   width: 141px;
   height: 294px;
 }
 .promo_backgrounds_armoire_201603 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -306px -295px;
+  background-position: -707px -600px;
   width: 141px;
   height: 294px;
 }
 .promo_backgrounds_armoire_201604 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1237px -442px;
+  background-position: 0px -1041px;
   width: 140px;
   height: 441px;
 }
 .promo_backgrounds_armoire_201605 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1378px -442px;
+  background-position: -141px -1041px;
   width: 140px;
   height: 441px;
 }
 .promo_backgrounds_armoire_201606 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: 0px -600px;
+  background-position: -699px 0px;
   width: 140px;
   height: 447px;
 }
 .promo_backgrounds_armoire_201607 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -956px 0px;
+  background-position: -559px 0px;
   width: 139px;
   height: 588px;
 }
 .promo_backgrounds_armoire_201608 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -425px -600px;
+  background-position: -142px -600px;
   width: 140px;
   height: 439px;
 }
 .promo_backgrounds_armoire_201609 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -566px -600px;
+  background-position: -283px -600px;
   width: 139px;
   height: 438px;
 }
 .promo_backgrounds_armoire_201610 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: 0px -1048px;
+  background-position: -1124px -442px;
   width: 140px;
   height: 441px;
 }
 .promo_backgrounds_armoire_201611 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1096px -442px;
+  background-position: -1265px 0px;
   width: 140px;
   height: 441px;
 }
 .promo_backgrounds_armoire_201612 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1237px 0px;
+  background-position: -1265px -442px;
   width: 140px;
   height: 441px;
 }
 .promo_backgrounds_armoire_201701 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1096px 0px;
+  background-position: -1406px 0px;
   width: 140px;
   height: 441px;
 }
 .promo_backgrounds_armoire_201702 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -141px -600px;
+  background-position: -840px 0px;
   width: 141px;
   height: 441px;
 }
-.promo_backtoschool {
+.promo_backgrounds_armoire_201703 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1625px -853px;
-  width: 150px;
-  height: 150px;
+  background-position: -982px 0px;
+  width: 141px;
+  height: 441px;
 }
 .promo_burnout {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -559px -220px;
+  background-position: -306px -295px;
   width: 219px;
   height: 240px;
 }
 .promo_chairs_glasses {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -990px -600px;
+  background-position: -1757px -532px;
   width: 51px;
   height: 210px;
 }
 .promo_checkin_incentives {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -848px -600px;
+  background-position: -423px -600px;
   width: 141px;
   height: 294px;
 }
 .promo_classes_fall_2014 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1133px -1048px;
+  background-position: -1207px -1337px;
   width: 321px;
   height: 100px;
 }
 .promo_classes_fall_2015 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -559px -461px;
+  background-position: -423px -895px;
   width: 377px;
   height: 99px;
 }
 .promo_classes_fall_2016 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1519px -148px;
+  background-position: -1547px 0px;
   width: 103px;
   height: 348px;
 }
 .promo_coffee_mug {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1519px -497px;
+  background-position: -1651px 0px;
   width: 200px;
   height: 179px;
 }
 .promo_contrib_spotlight_Keith {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1799px -112px;
+  background-position: -1547px -1118px;
   width: 87px;
   height: 111px;
 }
 .promo_contrib_spotlight_beffymaroo {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1237px -884px;
+  background-position: -1406px -884px;
   width: 114px;
   height: 147px;
 }
 .promo_contrib_spotlight_blade {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1799px 0px;
+  background-position: -1547px -1006px;
   width: 89px;
   height: 111px;
 }
 .promo_contrib_spotlight_cantras {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1799px -224px;
+  background-position: -1547px -1230px;
   width: 87px;
   height: 109px;
 }
 .promo_contrib_spotlight_megan {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1405px -1151px;
+  background-position: -1547px -894px;
   width: 90px;
   height: 111px;
 }
 .promo_contrib_spotlight_shanaqui {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -448px -401px;
+  background-position: -1547px -782px;
   width: 90px;
   height: 111px;
 }
-.promo_cooking {
-  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -559px 0px;
-  width: 396px;
-  height: 219px;
-}
 .promo_cow {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -282px -1048px;
+  background-position: -282px -1041px;
   width: 140px;
   height: 441px;
 }
 .promo_cupid_potions {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -564px -1048px;
+  background-position: -705px -1041px;
   width: 138px;
   height: 441px;
 }
 .promo_dilatoryDistress {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1889px -606px;
+  background-position: -1286px -1644px;
   width: 90px;
   height: 90px;
 }
 .promo_egg_mounts {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -844px -1151px;
+  background-position: -844px -1041px;
   width: 280px;
   height: 147px;
 }
 .promo_enchanted_armoire {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -844px -1299px;
+  background-position: 0px -1483px;
   width: 374px;
   height: 76px;
 }
 .promo_enchanted_armoire_201507 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -578px -1574px;
+  background-position: -507px -1644px;
   width: 217px;
   height: 90px;
 }
 .promo_enchanted_armoire_201508 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -796px -1574px;
+  background-position: -1651px -1342px;
   width: 180px;
   height: 90px;
 }
 .promo_enchanted_armoire_201509 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1889px -1698px;
+  background-position: -614px -1735px;
   width: 90px;
   height: 90px;
 }
 .promo_enchanted_armoire_201511 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -779px -358px;
+  background-position: -982px -442px;
   width: 122px;
   height: 90px;
 }
 .promo_enchanted_armoire_201601 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1889px -1061px;
+  background-position: -887px -1735px;
   width: 90px;
   height: 90px;
 }
 .promo_floral_potions {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1519px -853px;
+  background-position: -1651px -532px;
   width: 105px;
   height: 273px;
 }
 .promo_ghost_potions {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1378px 0px;
+  background-position: -1406px -442px;
   width: 140px;
   height: 441px;
 }
 .promo_habitica {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1519px -677px;
+  background-position: -1651px -356px;
   width: 175px;
   height: 175px;
 }
@@ -258,211 +252,217 @@
 }
 .promo_habitoween_2016 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -141px -1048px;
+  background-position: -423px -1041px;
   width: 140px;
   height: 441px;
 }
 .promo_haunted_hair {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -779px -220px;
+  background-position: -1547px -644px;
   width: 100px;
   height: 137px;
 }
 .promo_holly_potions {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -283px -600px;
+  background-position: 0px -600px;
   width: 141px;
   height: 440px;
 }
 .promo_item_notif {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1519px -1127px;
+  background-position: 0px -1735px;
   width: 249px;
   height: 102px;
 }
+.promo_jackalope {
+  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
+  background-position: -1124px -1189px;
+  width: 276px;
+  height: 147px;
+}
 .promo_mystery_201405 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1889px -1152px;
+  background-position: -1650px -1644px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201406 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1889px -418px;
+  background-position: -1401px -1189px;
   width: 90px;
   height: 96px;
 }
 .promo_mystery_201407 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1799px -777px;
+  background-position: -1809px -669px;
   width: 42px;
   height: 62px;
 }
 .promo_mystery_201408 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1799px -501px;
+  background-position: -1051px -812px;
   width: 60px;
   height: 71px;
 }
 .promo_mystery_201409 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1889px -1516px;
+  background-position: -1195px -1644px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201410 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1889px -1789px;
+  background-position: -982px -533px;
   width: 72px;
   height: 63px;
 }
 .promo_mystery_201411 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1889px -1607px;
+  background-position: -1468px -1644px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201412 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1842px -707px;
+  background-position: -1809px -602px;
   width: 42px;
   height: 66px;
 }
 .promo_mystery_201501 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1799px -643px;
+  background-position: -1792px -806px;
   width: 48px;
   height: 63px;
 }
 .promo_mystery_201502 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1889px -788px;
+  background-position: -341px -1735px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201503 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1889px -879px;
+  background-position: -432px -1735px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201504 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1799px -573px;
+  background-position: -375px -1483px;
   width: 60px;
   height: 69px;
 }
 .promo_mystery_201505 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1889px -1334px;
+  background-position: -796px -1735px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201506 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1799px -707px;
+  background-position: -1809px -532px;
   width: 42px;
   height: 69px;
 }
 .promo_mystery_201507 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1889px -106px;
+  background-position: -990px -600px;
   width: 90px;
   height: 105px;
 }
 .promo_mystery_201508 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1474px -1574px;
+  background-position: -819px -1644px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201509 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1889px -515px;
+  background-position: -1377px -1644px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201510 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1098px -1574px;
+  background-position: -725px -1644px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201511 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1889px -697px;
+  background-position: -1559px -1644px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201512 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1799px -419px;
+  background-position: -990px -812px;
   width: 60px;
   height: 81px;
 }
 .promo_mystery_201601 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -977px -1574px;
+  background-position: -840px -442px;
   width: 120px;
   height: 90px;
 }
 .promo_mystery_201602 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1889px -970px;
+  background-position: -250px -1735px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201603 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1568px -1574px;
+  background-position: -1741px -1644px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201604 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1286px -1574px;
+  background-position: -1101px -1644px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201605 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1889px -1243px;
+  background-position: -523px -1735px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201606 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1889px 0px;
+  background-position: -699px -448px;
   width: 90px;
   height: 105px;
 }
 .promo_mystery_201607 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1889px -1425px;
+  background-position: -705px -1735px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201608 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1192px -1574px;
+  background-position: -913px -1644px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201609 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1380px -1574px;
+  background-position: -1007px -1644px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201610 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1799px -334px;
+  background-position: -1771px -1194px;
   width: 63px;
   height: 84px;
 }
 .promo_mystery_201611 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1889px -318px;
+  background-position: -1405px -1041px;
   width: 90px;
   height: 99px;
 }
@@ -474,157 +474,151 @@
 }
 .promo_mystery_201701 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1889px -212px;
+  background-position: -990px -706px;
   width: 90px;
   height: 105px;
 }
 .promo_mystery_201702 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1519px 0px;
+  background-position: -1125px -1041px;
   width: 279px;
   height: 147px;
 }
 .promo_mystery_3014 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1519px -1378px;
+  background-position: -289px -1644px;
   width: 217px;
   height: 90px;
 }
 .promo_new_hair_fall2016 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -423px -1048px;
+  background-position: -564px -1041px;
   width: 140px;
   height: 441px;
 }
 .promo_orca {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -448px -295px;
+  background-position: -1124px -884px;
   width: 105px;
   height: 105px;
 }
 .promo_partyhats {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1219px -1299px;
+  background-position: -1651px -1433px;
   width: 115px;
   height: 47px;
 }
 .promo_pastel_skin {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -331px -1490px;
+  background-position: 0px -1560px;
   width: 330px;
   height: 83px;
 }
 .customize-option.promo_pastel_skin {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -356px -1505px;
+  background-position: -25px -1575px;
   width: 60px;
   height: 60px;
 }
 .promo_peppermint_flame {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1519px -1230px;
+  background-position: -1651px -954px;
   width: 140px;
   height: 147px;
 }
 .promo_pet_skins {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1378px -884px;
+  background-position: -1651px -806px;
   width: 140px;
   height: 147px;
 }
 .customize-option.promo_pet_skins {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1403px -899px;
+  background-position: -1676px -821px;
   width: 60px;
   height: 60px;
 }
 .promo_pyromancer {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1625px -1004px;
+  background-position: -1265px -884px;
   width: 113px;
   height: 113px;
 }
 .promo_rainbow_armor {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: 0px -1757px;
+  background-position: -1547px -1340px;
   width: 92px;
   height: 103px;
 }
 .promo_seasonal_shop_fall_2016 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1125px -1151px;
+  background-position: -844px -1189px;
   width: 279px;
   height: 147px;
 }
 .promo_shimmer_hair {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: 0px -1490px;
+  background-position: -331px -1560px;
   width: 330px;
   height: 83px;
 }
 .promo_splashyskins {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: 0px -1665px;
+  background-position: -1651px -1102px;
   width: 198px;
   height: 91px;
 }
 .customize-option.promo_splashyskins {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -25px -1680px;
+  background-position: -1676px -1117px;
   width: 60px;
   height: 60px;
 }
 .promo_spooky_sparkles_fall_2016 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -703px -1151px;
+  background-position: -849px -600px;
   width: 140px;
   height: 294px;
 }
 .promo_spring_classes_2016 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -706px -895px;
+  background-position: -844px -1337px;
   width: 362px;
   height: 102px;
 }
 .promo_springclasses2014 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: 0px -1574px;
+  background-position: -801px -895px;
   width: 288px;
   height: 90px;
 }
 .promo_springclasses2015 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -289px -1574px;
+  background-position: 0px -1644px;
   width: 288px;
   height: 90px;
 }
 .promo_staff_spotlight_Lemoness {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1695px -677px;
+  background-position: -1547px -349px;
   width: 102px;
   height: 146px;
 }
 .promo_staff_spotlight_Viirus {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1660px -1230px;
+  background-position: -1651px -1194px;
   width: 119px;
   height: 147px;
 }
 .promo_staff_spotlight_paglias {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1096px -884px;
+  background-position: -1547px -496px;
   width: 99px;
   height: 147px;
 }
-.promo_startingover {
+.promo_steampunk_3017 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1623px -324px;
-  width: 150px;
-  height: 150px;
-}
-.promo_summer_classes_2014 {
-  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -703px -1048px;
-  width: 429px;
-  height: 102px;
+  background-position: -1124px 0px;
+  width: 140px;
+  height: 441px;
 }

website/assets/sprites/dist/spritesmith-largeSprites-1.css

@@ -1,126 +1,120 @@
+.promo_summer_classes_2014 {
+  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+  background-position: -885px -591px;
+  width: 429px;
+  height: 102px;
+}
 .promo_summer_classes_2015 {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -452px -534px;
+  background-position: -553px -615px;
   width: 300px;
   height: 88px;
 }
 .promo_summer_classes_2016 {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -452px 0px;
+  background-position: -452px -145px;
   width: 400px;
   height: 150px;
 }
 .promo_takeThis_gear {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -723px -151px;
+  background-position: -361px -882px;
   width: 114px;
   height: 87px;
 }
 .promo_takethis_armor {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -723px -239px;
+  background-position: -476px -882px;
   width: 114px;
   height: 87px;
 }
 .promo_task_planning {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -853px -96px;
+  background-position: -885px -96px;
   width: 240px;
   height: 195px;
 }
 .promo_turkey_day_2016 {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: 0px -365px;
+  background-position: -141px -440px;
   width: 140px;
   height: 441px;
 }
 .promo_unconventional_armor {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1251px -666px;
+  background-position: -1315px -591px;
   width: 60px;
   height: 60px;
 }
 .promo_unconventional_armor2 {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1251px -591px;
+  background-position: -1283px -694px;
   width: 70px;
   height: 74px;
 }
 .promo_updos {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1163px -292px;
+  background-position: -1195px -292px;
   width: 156px;
   height: 147px;
 }
-.promo_valentines {
-  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -853px -292px;
-  width: 309px;
-  height: 147px;
-}
 .promo_veteran_pets {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -282px -365px;
+  background-position: -706px -704px;
   width: 146px;
   height: 75px;
 }
 .promo_winter_classes_2016 {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -452px -443px;
+  background-position: 0px -882px;
   width: 360px;
   height: 90px;
 }
 .promo_winter_classes_2017 {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: 0px -220px;
+  background-position: -452px 0px;
   width: 432px;
   height: 144px;
 }
 .promo_winter_fireworks {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -452px -623px;
+  background-position: -302px -973px;
   width: 138px;
   height: 147px;
 }
 .promo_winterclasses2015 {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -452px -332px;
+  background-position: -452px -296px;
   width: 325px;
   height: 110px;
 }
 .promo_wintery_skins {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -141px -365px;
+  background-position: 0px -440px;
   width: 140px;
   height: 441px;
 }
 .customize-option.promo_wintery_skins {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -166px -380px;
+  background-position: -25px -455px;
   width: 60px;
   height: 60px;
 }
 .promo_winteryhair {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -591px -623px;
+  background-position: -553px -704px;
   width: 152px;
   height: 75px;
 }
-.promo_working_out {
-  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -853px -440px;
-  width: 300px;
-  height: 150px;
-}
 .avatar_variety {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -853px 0px;
+  background-position: -885px 0px;
   width: 498px;
   height: 95px;
 }
 .npc_viirus {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -282px -441px;
+  background-position: -441px -973px;
   width: 108px;
   height: 90px;
 }
@@ -130,33 +124,75 @@
   width: 451px;
   height: 219px;
 }
-.scene_coding {
+.promo_backtoschool {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1100px -591px;
+  background-position: -1186px -440px;
   width: 150px;
   height: 150px;
 }
+.promo_cooking {
+  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+  background-position: 0px -220px;
+  width: 396px;
+  height: 219px;
+}
+.promo_startingover {
+  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+  background-position: -1132px -694px;
+  width: 150px;
+  height: 150px;
+}
+.promo_valentines {
+  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+  background-position: -885px -292px;
+  width: 309px;
+  height: 147px;
+}
+.promo_working_out {
+  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+  background-position: -885px -440px;
+  width: 300px;
+  height: 150px;
+}
+.scene_coding {
+  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+  background-position: -151px -973px;
+  width: 150px;
+  height: 150px;
+}
+.scene_eco_friendly {
+  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+  background-position: -589px -440px;
+  width: 222px;
+  height: 171px;
+}
+.scene_habits {
+  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+  background-position: -282px -440px;
+  width: 306px;
+  height: 174px;
+}
 .scene_phone_peek {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1154px -440px;
+  background-position: 0px -973px;
   width: 150px;
   height: 150px;
 }
 .welcome_basic_avatars {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1094px -96px;
+  background-position: -885px -694px;
   width: 246px;
   height: 165px;
 }
 .welcome_promo_party {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -452px -151px;
+  background-position: -282px -615px;
   width: 270px;
   height: 180px;
 }
 .welcome_sample_tasks {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -853px -591px;
+  background-position: -1126px -96px;
   width: 246px;
   height: 165px;
 }