krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 23:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adjust test

Browse Source
This commit is contained in:
Blade Barringer
2015-07-10 23:21:23 -05:00
parent acb82f99ce
commit cdcc085530
2 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
test/api/chat.coffee
View File

@@ -105,28 +105,23 @@ describe "Chat", ->
(cb) -> (cb) ->
registerManyUsers 1, cb registerManyUsers 1, cb
(_members, cb) -> (members, cb) ->
userToRemove = _members[0] userToRemove = members[0]
members = _members request.post(baseURL + "/groups/" + group._id + "/invite").send(
inviteURL = baseURL + "/groups/" + group._id + "/invite"
request.post(inviteURL).send(
uuids: [userToRemove._id] uuids: [userToRemove._id]
) )
.end -> .end -> cb()
cb()
(cb) -> (cb) ->
request.post(baseURL + "/groups/" + group._id + "/join") request.post(baseURL + "/groups/" + group._id + "/join")
.set("X-API-User", userToRemove._id) .set("X-API-User", userToRemove._id)
.set("X-API-Key", userToRemove.apiToken) .set("X-API-Key", userToRemove.apiToken)
.end (res) -> .end (res) -> cb()
cb()
(cb) -> (cb) ->
msg = "TestMsg" msg = "TestMsg"
request.post(baseURL + "/groups/" + group._id + "/chat?message=" + msg).end (res) -> request.post(baseURL + "/groups/" + group._id + "/chat?message=" + msg)
expectCode res, 200 .end (res) -> cb()
cb()
(cb) -> (cb) ->
request.get(baseURL + "/user") request.get(baseURL + "/user")
@@ -138,18 +133,7 @@ describe "Chat", ->
(cb) -> (cb) ->
request.post(baseURL + "/groups/" + group._id + "/removeMember?uuid=" + userToRemove._id) request.post(baseURL + "/groups/" + group._id + "/removeMember?uuid=" + userToRemove._id)
.send().end (res) -> .end (res) -> cb()
expectCode res, 204
cb()
(cb) ->
request.get(baseURL + "/groups/" + group._id)
.send()
.end (res) ->
g = res.body
userInGroup = _.find g.members, (member) -> return member._id == userToRemove._id
expect(userInGroup).to.not.exist
cb()
(cb) -> (cb) ->
request.get(baseURL + "/user") request.get(baseURL + "/user")

4
website/src/controllers/groups.js
View File

@@ -756,8 +756,8 @@ api.removeMember = function(req, res, next){
//Mark removed users messages as seen //Mark removed users messages as seen
var update = {$unset:{}}; var update = {$unset:{}};
update['$unset']['newMessages.'+group._id] = ''; update.$unset['newMessages.' + group._id] = '';
User.update({_id:removedUser._id, apiToken:removedUser.apiToken},update).exec(); User.update({_id: removedUser._id, apiToken: removedUser.apiToken}, update).exec();
// Sending an empty 204 because Group.update doesn't return the group // Sending an empty 204 because Group.update doesn't return the group
// see http://mongoosejs.com/docs/api.html#model_Model.update // see http://mongoosejs.com/docs/api.html#model_Model.update