krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Send back 204 from questLeave route

Browse Source
This commit is contained in:
Blade Barringer
2015-08-24 12:38:43 -05:00
parent af20986fbc
commit 66d16fefc3
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/server_side/controllers/groups.test.js
View File

@@ -54,7 +54,8 @@ describe('Groups Controller', function() {
group: group, group: group,
user: user user: user
}, },
json: sinon.stub() json: sinon.stub(),
send: sinon.stub()
}; };
req = { }; req = { };
@@ -121,11 +122,11 @@ describe('Groups Controller', function() {
expect(group.quest.members[user._id]).to.not.exist; expect(group.quest.members[user._id]).to.not.exist;
}); });
it('sends back 201 on success', function() { it('sends back 204 on success', function() {
groupsController.questLeave(req, res); groupsController.questLeave(req, res);
expect(res.json).to.be.calledOnce; expect(res.send).to.be.calledOnce;
expect(res.json).to.be.calledWith(201); expect(res.send).to.be.calledWith(204);
}); });
}); });
}); });

6
website/public/js/controllers/partyCtrl.js
View File

@@ -117,10 +117,8 @@ habitrpg.controller("PartyCtrl", ['$rootScope','$scope','Groups','Chat','User','
$scope.questLeave = function(party){ $scope.questLeave = function(party){
if (!confirm(window.env.t('sureLeave'))) return; if (!confirm(window.env.t('sureLeave'))) return;
Groups.questLeave(party) delete $scope.group.quest.members[User.user._id];
.then(function() { Groups.questLeave(party);
$rootScope.hardRedirect('/#/options/groups/party');
});
} }
$scope.questAccept = function(party){ $scope.questAccept = function(party){

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

@@ -1095,6 +1095,6 @@ api.questLeave = function(req, res, next) {
group.save(function(err, result) { group.save(function(err, result) {
if (err) return next(err); if (err) return next(err);
return res.json(201, group); return res.send(204);
}); });
} }

2
website/views/options/social/quests/questActive.jade
View File

@@ -22,5 +22,5 @@ div(ng-if='group.quest.active==true')
unless tavern unless tavern
button.btn.btn-sm.btn-warning(ng-if=':: (group.quest.leader && group.quest.leader==user._id && isMemberOfRunningQuest(group.quest.leader,group))', button.btn.btn-sm.btn-warning(ng-if=':: (group.quest.leader && group.quest.leader==user._id && isMemberOfRunningQuest(group.quest.leader,group))',
ng-click='questAbort(party)')=env.t('abort') ng-click='questAbort(party)')=env.t('abort')
button.btn.btn-sm.btn-warning(ng-if=':: (group.quest.leader && group.quest.leader!=user._id && isMemberOfRunningQuest(user._id,group))', button.btn.btn-sm.btn-warning(ng-if='!(group.quest.leader && group.quest.leader === user._id) && isMemberOfRunningQuest(user._id,group)',
ng-click='questLeave(party)')=env.t('leaveQuest') ng-click='questLeave(party)')=env.t('leaveQuest')