From 9be08ad1433458f1c59fcf793e2d1b03df86d3ac Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Mon, 12 Jan 2015 21:08:15 -0600 Subject: [PATCH 1/7] Added additional tests for chat functions in api --- test/api.mocha.coffee | 86 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee index 453f20440c..7d99d13139 100644 --- a/test/api.mocha.coffee +++ b/test/api.mocha.coffee @@ -185,6 +185,92 @@ describe "API", -> expect(group.leader).to.be user._id done() + describe "Party", -> + it "can be found by querying for party", (done) -> + request.get(baseURL + "/groups/").send( + type: "party" + ).end (res) -> + expectCode res, 200 + + party = res.body[0] + expect(party._id).to.be group._id + expect(party.leader).to.be user._id + expect(party.name).to.be group.name + expect(party.quest).to.be.eql { progress: {} } + expect(party.memberCount).to.be.eql group.memberCount + done() + + describe "Chat", -> + chat = undefined + it "Posts a message to party chat", (done) -> + request.post(baseURL + "/groups/" + group._id + "/chat").send( + message: "Test MSG" + ).end (res) -> + expectCode res, 200 + chat = res.body.message + expect(chat.id).to.be.ok + expect(chat.timestamp).to.be.ok + expect(chat.likes).to.be.empty + expect(chat.flags).to.be.empty + expect(chat.flagCount).to.be 0 + expect(chat.uuid).to.be.ok + expect(chat.contributor).to.be.empty + expect(chat.backer).to.be.empty + expect(chat.user).to.be.ok + done() + + it "can not like own chat message", (done) -> + request.post(baseURL + "/groups/" + group._id + "/chat/" + chat.id + "/like").send( + ).end (res) -> + expectCode res, 401 + + body = res.body + expect(body.err).to.be "Can't like your own message. Don't be that person." + done() + + it "can not flag own message", (done) -> + request.post(baseURL + "/groups/" + group._id + "/chat/" + chat.id + "/flag").send( + ).end (res) -> + expectCode res, 401 + + body = res.body + expect(body.err).to.be "Can't report your own message." + done() + + it "Gets chat messages from party chat", (done) -> + request.get(baseURL + "/groups/" + group._id + "/chat").send( + ).end (res) -> + expectCode res, 200 + + message = res.body[0] + expect(message.id).to.be chat.id + expect(message.timestamp).to.be chat.timestamp + expect(message.likes).to.be.eql chat.likes + expect(message.flags).to.be.eql chat.flags + expect(message.flagCount).to.be chat.flagCount + expect(message.uuid).to.be chat.uuid + expect(message.contributor).to.be.eql chat.contributor + expect(message.backer).to.be.eql chat.backer + expect(message.user).to.be chat.user + done() + + it "Deletes a chat messages from party chat", (done) -> + request.del(baseURL + "/groups/" + group._id + "/chat/" + chat.id).send( + ).end (res) -> + expectCode res, 204 + + expect(res.body).to.be.empty + done() + + it "Can not delete already deleted message", (done) -> + request.del(baseURL + "/groups/" + group._id + "/chat/" + chat.id).send( + ).end (res) -> + expectCode res, 404 + + body = res.body + expect(body.err).to.be "Message not found!" + done() + describe "Challenges", -> challenge = undefined updateTodo = undefined From 3c741f431af4d72511ad68b2d31a03c67a6cd044 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Mon, 12 Jan 2015 21:09:58 -0600 Subject: [PATCH 2/7] Deleted extraneous line breaks --- test/api.mocha.coffee | 5 ----- 1 file changed, 5 deletions(-) diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee index 7d99d13139..39b7439a79 100644 --- a/test/api.mocha.coffee +++ b/test/api.mocha.coffee @@ -223,7 +223,6 @@ describe "API", -> request.post(baseURL + "/groups/" + group._id + "/chat/" + chat.id + "/like").send( ).end (res) -> expectCode res, 401 - body = res.body expect(body.err).to.be "Can't like your own message. Don't be that person." done() @@ -232,7 +231,6 @@ describe "API", -> request.post(baseURL + "/groups/" + group._id + "/chat/" + chat.id + "/flag").send( ).end (res) -> expectCode res, 401 - body = res.body expect(body.err).to.be "Can't report your own message." done() @@ -241,7 +239,6 @@ describe "API", -> request.get(baseURL + "/groups/" + group._id + "/chat").send( ).end (res) -> expectCode res, 200 - message = res.body[0] expect(message.id).to.be chat.id expect(message.timestamp).to.be chat.timestamp @@ -258,7 +255,6 @@ describe "API", -> request.del(baseURL + "/groups/" + group._id + "/chat/" + chat.id).send( ).end (res) -> expectCode res, 204 - expect(res.body).to.be.empty done() @@ -266,7 +262,6 @@ describe "API", -> request.del(baseURL + "/groups/" + group._id + "/chat/" + chat.id).send( ).end (res) -> expectCode res, 404 - body = res.body expect(body.err).to.be "Message not found!" done() From c5de07d33ed771141203598bd9f866797704fff9 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Mon, 12 Jan 2015 21:13:41 -0600 Subject: [PATCH 3/7] Removed deeply eql check for number comparison --- 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 39b7439a79..434aadc881 100644 --- a/test/api.mocha.coffee +++ b/test/api.mocha.coffee @@ -197,7 +197,7 @@ describe "API", -> expect(party.leader).to.be user._id expect(party.name).to.be group.name expect(party.quest).to.be.eql { progress: {} } - expect(party.memberCount).to.be.eql group.memberCount + expect(party.memberCount).to.be group.memberCount done() describe "Chat", -> From a9232156ef9ae721b3ed0e8dfe9b4f5a157c4fe0 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Fri, 16 Jan 2015 20:17:03 -0600 Subject: [PATCH 4/7] Checks to see if user id and username match chat --- test/api.mocha.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee index 434aadc881..38e7726b77 100644 --- a/test/api.mocha.coffee +++ b/test/api.mocha.coffee @@ -216,7 +216,8 @@ describe "API", -> expect(chat.uuid).to.be.ok expect(chat.contributor).to.be.empty expect(chat.backer).to.be.empty - expect(chat.user).to.be.ok + expect(chat.uuid).to.be user._id + expect(chat.user).to.be user.profile.name done() it "can not like own chat message", (done) -> From 4707ba793edf27959671222ea57814e7b410ba9b Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Tue, 13 Jan 2015 21:07:31 -0600 Subject: [PATCH 5/7] Added some basic tests for todo creating, updating and deleting --- test/api.mocha.coffee | 69 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee index 453f20440c..1964ba009f 100644 --- a/test/api.mocha.coffee +++ b/test/api.mocha.coffee @@ -169,6 +169,75 @@ describe "API", -> expect(_.size(res.body.todos)).to.be numTasks - 2 done() + describe "Creating, Updating, Deleting Todos", -> + todo = undefined + updateTodo = undefined + describe "Creating todos", -> + it "Creates a todo", (done) -> + request.post(baseURL + "/user/tasks").send( + type: "todo" + text: "Sample Todo" + ).end (res) -> + expectCode res, 200 + todo = res.body + expect(todo.text).to.be "Sample Todo" + expect(todo.id).to.be.ok + expect(todo.value).to.be 0 + done() + + describe "Updating todos", -> + it "Does not update id of todo", (done) -> + request.put(baseURL + "/user/tasks/" + todo.id).send( + id: "a-new-id" + ).end (res) -> + expectCode res, 200 + updateTodo = res.body + expect(updateTodo.id).to.be todo.id + done() + + it "Does not update type of todo", (done) -> + request.put(baseURL + "/user/tasks/" + todo.id).send( + type: "habit" + ).end (res) -> + expectCode res, 200 + updateTodo = res.body + expect(updateTodo.type).to.be todo.type + done() + + it "Does update text, attribute, priority, value, notes", (done) -> + request.put(baseURL + "/user/tasks/" + todo.id).send( + text: "Changed Title" + attribute: "int" + priority: 1.5 + value: 5 + notes: "Some notes" + ).end (res) -> + expectCode res, 200 + todo = res.body + expect(todo.text).to.be "Changed Title" + expect(todo.attribute).to.be "int" + expect(todo.priority).to.be 1.5 + expect(todo.value).to.be 5 + expect(todo.notes).to.be "Some notes" + done() + + describe "Deleting todos", -> + it "Does delete todo", (done) -> + request.del(baseURL + "/user/tasks/" + todo.id).send( + ).end (res) -> + expectCode res, 200 + body = res.body + expect(body).to.be.empty + done() + + it "Does not delete already deleted todo", (done) -> + request.del(baseURL + "/user/tasks/" + todo.id).send( + ).end (res) -> + expectCode res, 404 + body = res.body + expect(body.err).to.be "Task not found." + done() + ###* GROUPS ### From 80778cbd7c05455caf88fc4472dde20527f13eae Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Tue, 13 Jan 2015 21:16:05 -0600 Subject: [PATCH 6/7] Added additional deletion test --- test/api.mocha.coffee | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee index 1964ba009f..d2abe41002 100644 --- a/test/api.mocha.coffee +++ b/test/api.mocha.coffee @@ -238,6 +238,19 @@ describe "API", -> expect(body.err).to.be "Task not found." done() + it "Does not update text, attribute, priority, value, notes if task is already deleted", (done) -> + request.put(baseURL + "/user/tasks/" + todo.id).send( + text: "New Title" + attribute: "str" + priority: 1 + value: 4 + notes: "Other notes" + ).end (res) -> + expectCode res, 404 + body = res.body + expect(body.err).to.be "Task not found." + done() + ###* GROUPS ### From 23f7d96fa71606cb0da207beb97e15a25e55904c Mon Sep 17 00:00:00 2001 From: Kevin Gisi Date: Fri, 27 Mar 2015 08:45:00 -0400 Subject: [PATCH 7/7] Updated compiled habitrpg-shared.js --- common/dist/scripts/habitrpg-shared.js | 1 + 1 file changed, 1 insertion(+) diff --git a/common/dist/scripts/habitrpg-shared.js b/common/dist/scripts/habitrpg-shared.js index 692c079949..824ffe251c 100644 --- a/common/dist/scripts/habitrpg-shared.js +++ b/common/dist/scripts/habitrpg-shared.js @@ -7390,6 +7390,7 @@ process.browser = true; process.env = {}; process.argv = []; process.version = ''; // empty string to avoid regexp issues +process.versions = {}; function noop() {}