From 19c2ae415fd1ee2c8e3040a75c361e4898685df8 Mon Sep 17 00:00:00 2001 From: NotGonnaGitUs Date: Mon, 4 May 2015 15:35:45 +0530 Subject: [PATCH 01/15] Trying out new test to check user balance after creating a challenge with prize. --- test/api.mocha.coffee | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee index 5b54e6052c..e88bd347ca 100644 --- a/test/api.mocha.coffee +++ b/test/api.mocha.coffee @@ -479,6 +479,32 @@ describe "API", -> cb() ], done + it "Creates a challenge with prize", (done) -> + (cb) -> + User.findByIdAndUpdate _id, + $set: + "balance": 8 + , cb + request.post(baseURL + "/challenges").send( + group: group._id + prize: 10 + official: true + ).end (res) -> + expectCode res, 200 + async.parallel [ + (cb) -> + User.findById _id, cb + (cb) -> + Challenge.findById res.body._id, cb + ], (err, results) -> + _user = results[0] + challenge = results[1] + expect(_user.balance).to.be 5.5 + done() + + ###* + QUESTS + ### describe "Quests", -> party = undefined participating = [] From 8fae71d7ef3a2af2bc1a42fadc1410799bddaa36 Mon Sep 17 00:00:00 2001 From: NotGonnaGitUs Date: Mon, 4 May 2015 16:07:16 +0530 Subject: [PATCH 02/15] Updated test to see if it works --- test/api.mocha.coffee | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee index e88bd347ca..d2b32522e3 100644 --- a/test/api.mocha.coffee +++ b/test/api.mocha.coffee @@ -480,24 +480,26 @@ describe "API", -> ], done it "Creates a challenge with prize", (done) -> - (cb) -> - User.findByIdAndUpdate _id, - $set: - "balance": 8 - , cb - request.post(baseURL + "/challenges").send( - group: group._id - prize: 10 - official: true - ).end (res) -> - expectCode res, 200 + User.findByIdAndUpdate _id, + $set: + "balance": 8 + , (err, _user) -> + expect(err).to.not.be.ok() async.parallel [ (cb) -> - User.findById _id, cb + request.post(baseURL + "/challenges").send( + group: group._id + dailys: [] + todos: [] + rewards: [] + habits: [] + prize: 10 + ).end (res) -> + expect(res.body.prize).to.be 10 + cb() (cb) -> - Challenge.findById res.body._id, cb - ], (err, results) -> - _user = results[0] + Challenge.findById group._id, cb + ], (err, result) -> challenge = results[1] expect(_user.balance).to.be 5.5 done() From bb121df88165199d361fa58830074383256babf9 Mon Sep 17 00:00:00 2001 From: NotGonnaGitUs Date: Mon, 4 May 2015 16:17:56 +0530 Subject: [PATCH 03/15] Fixed indentation error. --- test/api.mocha.coffee | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee index d2b32522e3..f624776a49 100644 --- a/test/api.mocha.coffee +++ b/test/api.mocha.coffee @@ -504,9 +504,9 @@ describe "API", -> expect(_user.balance).to.be 5.5 done() - ###* - QUESTS - ### + ###* + QUESTS + ### describe "Quests", -> party = undefined participating = [] From d69f217d2497a7e3f841f8b5a7210ac840d71658 Mon Sep 17 00:00:00 2001 From: NotGonnaGitUs Date: Mon, 4 May 2015 16:25:23 +0530 Subject: [PATCH 04/15] Fixed typo. --- test/api.mocha.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee index f624776a49..751cf5c22c 100644 --- a/test/api.mocha.coffee +++ b/test/api.mocha.coffee @@ -500,7 +500,7 @@ describe "API", -> (cb) -> Challenge.findById group._id, cb ], (err, result) -> - challenge = results[1] + challenge = result expect(_user.balance).to.be 5.5 done() From fafb102530ac0bf2bce7be77675fe248cc465335 Mon Sep 17 00:00:00 2001 From: NotGonnaGitUs Date: Mon, 4 May 2015 16:36:20 +0530 Subject: [PATCH 05/15] Is it async causing test to fail? Trying to make waterfall work. --- test/api.mocha.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee index 751cf5c22c..c638517a27 100644 --- a/test/api.mocha.coffee +++ b/test/api.mocha.coffee @@ -479,13 +479,13 @@ describe "API", -> cb() ], done - it "Creates a challenge with prize", (done) -> + it "User creates a challenge with prize", (done) -> User.findByIdAndUpdate _id, $set: "balance": 8 , (err, _user) -> expect(err).to.not.be.ok() - async.parallel [ + async.waterfall [ (cb) -> request.post(baseURL + "/challenges").send( group: group._id From 13415ecf03de334d27e28c0f852c87a546be8ded Mon Sep 17 00:00:00 2001 From: NotGonnaGitUs Date: Mon, 4 May 2015 16:49:04 +0530 Subject: [PATCH 06/15] Modified test to exclude finding challenge later and find user again. --- test/api.mocha.coffee | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee index c638517a27..98148ad491 100644 --- a/test/api.mocha.coffee +++ b/test/api.mocha.coffee @@ -498,10 +498,9 @@ describe "API", -> expect(res.body.prize).to.be 10 cb() (cb) -> - Challenge.findById group._id, cb + User.findById _id, cb ], (err, result) -> - challenge = result - expect(_user.balance).to.be 5.5 + expect(result.balance).to.be 5.5 done() ###* From 8c562e8e18a56827971e69af7453a0ae33b88634 Mon Sep 17 00:00:00 2001 From: NotGonnaGitUs Date: Mon, 4 May 2015 17:06:34 +0530 Subject: [PATCH 07/15] Added test for challenge deletion. --- test/api.mocha.coffee | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee index 98148ad491..900b1c2f8f 100644 --- a/test/api.mocha.coffee +++ b/test/api.mocha.coffee @@ -499,8 +499,14 @@ describe "API", -> cb() (cb) -> User.findById _id, cb - ], (err, result) -> - expect(result.balance).to.be 5.5 + ], (err, user) -> + expect(user.balance).to.be 5.5 + done() + + it "User deletes a challenge with prize and gets refund", (done) -> + request.del(baseURL + "/challenges/" + body._id).end (res) -> + User.findById user._id, (err, user) -> + expect(user.balance).to.be 8 done() ###* From f46a7eb1ba8f5a92e2485b2c55f193a76896a77a Mon Sep 17 00:00:00 2001 From: NotGonnaGitUs Date: Mon, 4 May 2015 17:19:54 +0530 Subject: [PATCH 08/15] Changed creation test to use variables so that deletion test can run. --- test/api.mocha.coffee | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee index 900b1c2f8f..59d2d40934 100644 --- a/test/api.mocha.coffee +++ b/test/api.mocha.coffee @@ -497,15 +497,21 @@ describe "API", -> ).end (res) -> expect(res.body.prize).to.be 10 cb() - (cb) -> - User.findById _id, cb - ], (err, user) -> - expect(user.balance).to.be 5.5 + async.parallel [ + (cb) -> + User.findById _id, cb + (cb) -> + Challenge.findById res.body._id, cb + ], (err, results) -> + _user = results[0] + challenge = results[1] + ], (err, result) -> + expect(_user.balance).to.be 5.5 done() it "User deletes a challenge with prize and gets refund", (done) -> - request.del(baseURL + "/challenges/" + body._id).end (res) -> - User.findById user._id, (err, user) -> + request.del(baseURL + "/challenges/" + challenge._id).end (res) -> + User.findById _user._id, (err, user) -> expect(user.balance).to.be 8 done() From b360acd0728aaa8243c640fcb4d10d79799f2057 Mon Sep 17 00:00:00 2001 From: NotGonnaGitUs Date: Mon, 4 May 2015 17:49:07 +0530 Subject: [PATCH 09/15] Fixed callback error in challenge creation test. --- test/api.mocha.coffee | 46 +++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee index 59d2d40934..44438c7b4f 100644 --- a/test/api.mocha.coffee +++ b/test/api.mocha.coffee @@ -483,31 +483,29 @@ describe "API", -> User.findByIdAndUpdate _id, $set: "balance": 8 - , (err, _user) -> + , (err, user) -> expect(err).to.not.be.ok() - async.waterfall [ - (cb) -> - request.post(baseURL + "/challenges").send( - group: group._id - dailys: [] - todos: [] - rewards: [] - habits: [] - prize: 10 - ).end (res) -> - expect(res.body.prize).to.be 10 - cb() - async.parallel [ - (cb) -> - User.findById _id, cb - (cb) -> - Challenge.findById res.body._id, cb - ], (err, results) -> - _user = results[0] - challenge = results[1] - ], (err, result) -> - expect(_user.balance).to.be 5.5 - done() + (cb) -> + request.post(baseURL + "/challenges").send( + group: group._id + dailys: [] + todos: [] + rewards: [] + habits: [] + prize: 10 + ).end (res) -> + expect(res.body.prize).to.be 10 + async.parallel [ + (cb) -> + User.findById _id, cb + (cb) -> + Challenge.findById res.body._id, cb + ], (err, results) -> + _user = results[0] + challenge = results[1] + cb() + expect(_user.balance).to.be 5.5 + done() it "User deletes a challenge with prize and gets refund", (done) -> request.del(baseURL + "/challenges/" + challenge._id).end (res) -> From 079df668ceac9738f27bc2e1b87d94054e244581 Mon Sep 17 00:00:00 2001 From: NotGonnaGitUs Date: Mon, 4 May 2015 17:59:12 +0530 Subject: [PATCH 10/15] Changed test to fix reference errors. --- test/api.mocha.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee index 44438c7b4f..27cb8212d0 100644 --- a/test/api.mocha.coffee +++ b/test/api.mocha.coffee @@ -503,13 +503,13 @@ describe "API", -> ], (err, results) -> _user = results[0] challenge = results[1] + expect(_user.balance).to.be 5.5 cb() - expect(_user.balance).to.be 5.5 done() it "User deletes a challenge with prize and gets refund", (done) -> request.del(baseURL + "/challenges/" + challenge._id).end (res) -> - User.findById _user._id, (err, user) -> + User.findById _id, (err, user) -> expect(user.balance).to.be 8 done() From 168d72fb0a2541c40de88efc3e9a74e925c5e1dc Mon Sep 17 00:00:00 2001 From: NotGonnaGitUs Date: Mon, 4 May 2015 18:16:02 +0530 Subject: [PATCH 11/15] Removed a function call in hopes of correct updation of challenge variable --- test/api.mocha.coffee | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee index 27cb8212d0..969435d15a 100644 --- a/test/api.mocha.coffee +++ b/test/api.mocha.coffee @@ -485,26 +485,24 @@ describe "API", -> "balance": 8 , (err, user) -> expect(err).to.not.be.ok() - (cb) -> - request.post(baseURL + "/challenges").send( - group: group._id - dailys: [] - todos: [] - rewards: [] - habits: [] - prize: 10 - ).end (res) -> - expect(res.body.prize).to.be 10 - async.parallel [ - (cb) -> - User.findById _id, cb - (cb) -> - Challenge.findById res.body._id, cb - ], (err, results) -> - _user = results[0] - challenge = results[1] - expect(_user.balance).to.be 5.5 - cb() + request.post(baseURL + "/challenges").send( + group: group._id + dailys: [] + todos: [] + rewards: [] + habits: [] + prize: 10 + ).end (res) -> + expect(res.body.prize).to.be 10 + async.parallel [ + (cb) -> + User.findById _id, cb + (cb) -> + Challenge.findById res.body._id, cb + ], (err, results) -> + _user = results[0] + challenge = results[1] + expect(_user.balance).to.be 5.5 done() it "User deletes a challenge with prize and gets refund", (done) -> From fef2c834c93d7a986d36b7989a9eec32d96b8fec Mon Sep 17 00:00:00 2001 From: NotGonnaGitUs Date: Mon, 4 May 2015 18:27:43 +0530 Subject: [PATCH 12/15] Used this of parent in hopes of getting correct challenge id --- test/api.mocha.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee index 969435d15a..c7e64ff025 100644 --- a/test/api.mocha.coffee +++ b/test/api.mocha.coffee @@ -506,6 +506,7 @@ describe "API", -> done() it "User deletes a challenge with prize and gets refund", (done) -> + itThis = this request.del(baseURL + "/challenges/" + challenge._id).end (res) -> User.findById _id, (err, user) -> expect(user.balance).to.be 8 From 32bcec013fa71666d3ed4a4db9323d4b19b5fcc4 Mon Sep 17 00:00:00 2001 From: NotGonnaGitUs Date: Mon, 4 May 2015 18:52:14 +0530 Subject: [PATCH 13/15] Combined both tests because I can't figure out how to pass challenge._id to next test --- test/api.mocha.coffee | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee index c7e64ff025..a8c0237d0a 100644 --- a/test/api.mocha.coffee +++ b/test/api.mocha.coffee @@ -479,7 +479,7 @@ describe "API", -> cb() ], done - it "User creates a challenge with prize", (done) -> + it "User creates a challenge with prize, deletes it, gets refund", (done) -> User.findByIdAndUpdate _id, $set: "balance": 8 @@ -503,15 +503,11 @@ describe "API", -> _user = results[0] challenge = results[1] expect(_user.balance).to.be 5.5 + request.del(baseURL + "/challenges/" + challenge._id).end (res) -> + User.findById _id, (err, user) -> + expect(user.balance).to.be 8 done() - it "User deletes a challenge with prize and gets refund", (done) -> - itThis = this - request.del(baseURL + "/challenges/" + challenge._id).end (res) -> - User.findById _id, (err, user) -> - expect(user.balance).to.be 8 - done() - ###* QUESTS ### From fc61a9c39f9bf0d88bd96b0661db3a5140e774a7 Mon Sep 17 00:00:00 2001 From: NotGonnaGitUs Date: Mon, 4 May 2015 19:00:07 +0530 Subject: [PATCH 14/15] Fixed whitespace error --- test/api.mocha.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee index a8c0237d0a..16cac8d2da 100644 --- a/test/api.mocha.coffee +++ b/test/api.mocha.coffee @@ -506,7 +506,7 @@ describe "API", -> request.del(baseURL + "/challenges/" + challenge._id).end (res) -> User.findById _id, (err, user) -> expect(user.balance).to.be 8 - done() + done() ###* QUESTS From 9a3c383bc7a208cebec95172dff84ebc76fd8c14 Mon Sep 17 00:00:00 2001 From: NotGonnaGitUs Date: Mon, 4 May 2015 19:08:45 +0530 Subject: [PATCH 15/15] Changed Quests comment and did done() inside the last function --- test/api.mocha.coffee | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee index 16cac8d2da..47e7c23aa6 100644 --- a/test/api.mocha.coffee +++ b/test/api.mocha.coffee @@ -506,11 +506,8 @@ describe "API", -> request.del(baseURL + "/challenges/" + challenge._id).end (res) -> User.findById _id, (err, user) -> expect(user.balance).to.be 8 - done() + done() - ###* - QUESTS - ### describe "Quests", -> party = undefined participating = []