Merge branch 'develop' into fallenpanda1-improved_dailies

This commit is contained in:
Blade Barringer
2015-05-23 08:44:56 -05:00
271 changed files with 9493 additions and 8316 deletions
+2 -2
View File
@@ -92,7 +92,7 @@ expectGainedPoints = (before, after, taskType) ->
# daily & todo histories handled on cron
expectNoChange = (before,after) ->
_.each $w('stats items gear dailys todos rewards flags preferences'), (attr)->
_.each $w('stats items gear dailys todos rewards preferences'), (attr)->
expect(after[attr]).to.eql before[attr]
expectClosePoints = (before, after, taskType) ->
@@ -777,7 +777,7 @@ describe 'Cron', ->
describe 'dailies', ->
describe.skip 'new day', ->
describe 'new day', ->
###
This section runs through a "cron matrix" of all permutations (that I can easily account for). It sets