From d7a203ccc266878b0a933a7dbc2da32291c50c90 Mon Sep 17 00:00:00 2001 From: Alys Date: Sat, 27 Jun 2015 19:14:52 +1000 Subject: [PATCH] set all daily repeat code and tests to use true/false instead of 1/0 for consistency with DailySchema; comment-out unused default Daily repeat code --- common/script/content.coffee | 2 +- common/script/index.coffee | 2 +- test/common/algos.mocha.coffee | 12 ++++++------ test/common/dailies.coffee | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/common/script/content.coffee b/common/script/content.coffee index 9d2333f68d..69c7b67eaf 100644 --- a/common/script/content.coffee +++ b/common/script/content.coffee @@ -1919,7 +1919,7 @@ api.subscriptionBlocks = basic_12mo: months:12, price:48 _.each api.subscriptionBlocks, (b,k)->b.key = k -repeat = {m:true,t:true,w:true,th:true,f:true,s:true,su:true} +# repeat = {m:true,t:true,w:true,th:true,f:true,s:true,su:true} api.userDefaults = habits: [ {type: 'habit', text: t('defaultHabit1Text'), value: 0, up: true, down: false, attribute: 'per' } diff --git a/common/script/index.coffee b/common/script/index.coffee index e0cb9dcb98..065971ceb4 100644 --- a/common/script/index.coffee +++ b/common/script/index.coffee @@ -238,7 +238,7 @@ api.taskDefaults = (task={}) -> _.defaults(task, {up:true,down:true}) if task.type is 'habit' _.defaults(task, {history: []}) if task.type in ['habit', 'daily'] _.defaults(task, {completed:false}) if task.type in ['daily', 'todo'] - _.defaults(task, {streak:0, repeat: {su:1,m:1,t:1,w:1,th:1,f:1,s:1}}, startDate: new Date(), everyX: 1, frequency: 'weekly') if task.type is 'daily' + _.defaults(task, {streak:0, repeat: {su:true,m:true,t:true,w:true,th:true,f:true,s:true}}, startDate: new Date(), everyX: 1, frequency: 'weekly') if task.type is 'daily' task._id = task.id # may need this for TaskSchema if we go back to using it, see http://goo.gl/a5irq4 task.value ?= if task.type is 'reward' then 10 else 0 task.priority = 1 unless _.isNumber(task.priority) # hotfix for apiv1. once we're off apiv1, we can remove this diff --git a/test/common/algos.mocha.coffee b/test/common/algos.mocha.coffee index 9c0422cad9..64bda3ccf4 100644 --- a/test/common/algos.mocha.coffee +++ b/test/common/algos.mocha.coffee @@ -127,7 +127,7 @@ cycle = (array)-> return array[n % array.length] repeatWithoutLastWeekday = ()-> - repeat = {su:1,m:1,t:1,w:1,th:1,f:1,s:1} + repeat = {su:true,m:true,t:true,w:true,th:true,f:true,s:true} if shared.startOfWeek(moment().zone(0)).isoWeekday() == 1 # Monday repeat.su = false else @@ -178,7 +178,7 @@ describe 'User', -> # Handle greyed-out dailys yesterday = moment().subtract(1,'days') - user.dailys[0].repeat[shared.dayMapping[yesterday.day()]] = 0 + user.dailys[0].repeat[shared.dayMapping[yesterday.day()]] = false _.each user.dailys[1..], (d)->d.completed = true cron() expect(user.stats.buffs.str).to.be 1 @@ -251,7 +251,7 @@ describe 'User', -> it 'does not reset checklist on grey incomplete dailies', -> yesterday = moment().subtract(1,'days') - user.dailys[0].repeat[shared.dayMapping[yesterday.day()]] = 0 + user.dailys[0].repeat[shared.dayMapping[yesterday.day()]] = false user.dailys[0].checklist = [ { "text" : "1", @@ -276,7 +276,7 @@ describe 'User', -> it 'resets checklist on complete grey complete dailies', -> yesterday = moment().subtract(1,'days') - user.dailys[0].repeat[shared.dayMapping[yesterday.day()]] = 0 + user.dailys[0].repeat[shared.dayMapping[yesterday.day()]] = false user.dailys[0].checklist = [ { "text" : "1", @@ -905,7 +905,7 @@ describe 'Cron', -> 'due today': # NOTE: a strange thing here, moment().startOf('week') is Sunday, but moment.zone(myTimeZone).startOf('week') is Monday. - defaults: {repeat:{su:1,m:true,t:1,w:1,th:1,f:1,s:1}} + defaults: {repeat:{su:true,m:true,t:true,w:true,th:true,f:true,s:true}} steps: 'pre-dayStart': defaults: {currentHour:3, dayStart:4, shouldDo:true} @@ -919,7 +919,7 @@ describe 'Cron', -> 'unchecked': {checked:false, expect: 'losePoints'} 'NOT due today': - defaults: {repeat:{su:1,m:false,t:1,w:1,th:1,f:1,s:1}} + defaults: {repeat:{su:true,m:false,t:true,w:true,th:true,f:true,s:true}} steps: 'pre-dayStart': defaults: {currentHour:3, dayStart:4, shouldDo:true} diff --git a/test/common/dailies.coffee b/test/common/dailies.coffee index d26c8d012e..fc88adfbf3 100644 --- a/test/common/dailies.coffee +++ b/test/common/dailies.coffee @@ -6,7 +6,7 @@ shared = require '../../common/script/index.coffee' shared.i18n.translations = require('../../website/src/i18n.js').translations repeatWithoutLastWeekday = ()-> - repeat = {su:1,m:1,t:1,w:1,th:1,f:1,s:1} + repeat = {su:true,m:true,t:true,w:true,th:true,f:true,s:true} if shared.startOfWeek(moment().zone(0)).isoWeekday() == 1 # Monday repeat.su = false else @@ -64,7 +64,7 @@ describe 'daily/weekly that repeats everyday (default)', -> user = newUser() user.dailys = [ shared.taskDefaults({type:'daily', startDate: moment().add(7, 'days'), frequency: 'daily'}) - shared.taskDefaults({type:'daily', startDate: moment().add(7, 'days'), frequency: 'weekly', repeat: {su:1,m:1,t:1,w:1,th:1,f:1,s:1}}) + shared.taskDefaults({type:'daily', startDate: moment().add(7, 'days'), frequency: 'weekly', repeat: {su:true,m:true,t:true,w:true,th:true,f:true,s:true}}) ] daily = user.dailys[0] weekly = user.dailys[1]