From c60f6f1c23915d34bc2f63181e1350452b00822e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Jureti=C4=87?= Date: Mon, 23 Sep 2013 22:59:46 -0300 Subject: [PATCH 1/2] corrected rounding of gold & silver calculations --- script/helpers.coffee | 4 ++-- tests/algos.mocha.coffee | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/script/helpers.coffee b/script/helpers.coffee index c39aae9a3e..e4fdc2b65d 100644 --- a/script/helpers.coffee +++ b/script/helpers.coffee @@ -260,7 +260,7 @@ module.exports = ### gold: (num) -> if num - return (num).toFixed(1).split('.')[0] + return Math.floor num else return "0" @@ -269,7 +269,7 @@ module.exports = ### silver: (num) -> if num - (num).toFixed(2).split('.')[1] + Math.floor (num - Math.floor(num))*100 else return "00" diff --git a/tests/algos.mocha.coffee b/tests/algos.mocha.coffee index 2692b6e5ea..915c1f40bc 100644 --- a/tests/algos.mocha.coffee +++ b/tests/algos.mocha.coffee @@ -241,3 +241,14 @@ describe 'Cron', -> now = moment().startOf('day').add('h', dayStart).add('m', 1) console.log {yesterday,now} expect(helpers.daysSince(yesterday, {now, dayStart})).to.eql 1 + +describe 'Helper', -> + it 'calculates gold coins', -> + expect(helpers.gold(10)).to.eql 10 + expect(helpers.gold(1.957)).to.eql 1 + expect(helpers.gold()).to.eql 0 + + it 'calculates silver coins', -> + expect(helpers.silver(10)).to.eql 0 + expect(helpers.silver(1.957)).to.eql 95 + expect(helpers.silver()).to.eql 0 From 939bca1eb9dfbbb93ede709cbb51acdcef11ac42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Jureti=C4=87?= Date: Mon, 23 Sep 2013 23:30:13 -0300 Subject: [PATCH 2/2] add silver leading zero --- script/helpers.coffee | 2 +- tests/algos.mocha.coffee | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/script/helpers.coffee b/script/helpers.coffee index e4fdc2b65d..b5fbdf330f 100644 --- a/script/helpers.coffee +++ b/script/helpers.coffee @@ -269,7 +269,7 @@ module.exports = ### silver: (num) -> if num - Math.floor (num - Math.floor(num))*100 + ("0" + Math.floor (num - Math.floor(num))*100).slice -2 else return "00" diff --git a/tests/algos.mocha.coffee b/tests/algos.mocha.coffee index 915c1f40bc..779ac9ac78 100644 --- a/tests/algos.mocha.coffee +++ b/tests/algos.mocha.coffee @@ -251,4 +251,5 @@ describe 'Helper', -> it 'calculates silver coins', -> expect(helpers.silver(10)).to.eql 0 expect(helpers.silver(1.957)).to.eql 95 - expect(helpers.silver()).to.eql 0 + expect(helpers.silver(0.01)).to.eql "01" + expect(helpers.silver()).to.eql "00"