diff --git a/test/spec/controllers/challengesCtrlSpec.js b/test/spec/controllers/challengesCtrlSpec.js index 495f1b020b..75d9759850 100644 --- a/test/spec/controllers/challengesCtrlSpec.js +++ b/test/spec/controllers/challengesCtrlSpec.js @@ -41,30 +41,36 @@ describe('Challenges Controller', function() { description: 'You are the owner and member', leader: user._id, members: [user], - _isMember: true + _isMember: true, + _id: 'ownMem-id', }); ownNotMem = specHelper.newChallenge({ description: 'You are the owner, but not a member', leader: user._id, members: [], - _isMember: false + _isMember: false, + _id: 'ownNotMem-id', }); notOwnMem = specHelper.newChallenge({ description: 'Not owner but a member', leader: {_id:"test"}, members: [user], - _isMember: true + _isMember: true, + _id: 'notOwnMem-id', }); notOwnNotMem = specHelper.newChallenge({ description: 'Not owner or member', leader: {_id:"test"}, members: [], - _isMember: false + _isMember: false, + _id: 'notOwnNotMem-id', }); + user.challenges = [ownMem._id, notOwnMem._id]; + scope.search = { group: _.transform(groups, function(m,g){m[g._id]=true;}) }; diff --git a/test/spec/services/challengeServicesSpec.js b/test/spec/services/challengeServicesSpec.js index abfe7c520a..9bed72db31 100644 --- a/test/spec/services/challengeServicesSpec.js +++ b/test/spec/services/challengeServicesSpec.js @@ -81,7 +81,7 @@ describe('challengeServices', function() { it('calls select challenge winner endpoint', function() { var challengeId = 1; var winnerId = 2; - $httpBackend.expectPOST(apiV3Prefix + '/challenges/' + challengeId + 'selectWinner/' + winnerId).respond({}); + $httpBackend.expectPOST(apiV3Prefix + '/challenges/' + challengeId + '/selectWinner/' + winnerId).respond({}); challenges.selectChallengeWinner(challengeId, winnerId); $httpBackend.flush(); }); diff --git a/website/client/js/controllers/challengesCtrl.js b/website/client/js/controllers/challengesCtrl.js index e5c6ae2a09..5a689ae7ca 100644 --- a/website/client/js/controllers/challengesCtrl.js +++ b/website/client/js/controllers/challengesCtrl.js @@ -53,7 +53,7 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User', defaultGroup = groupsWithChallenges[i]; } - if (filterCount > 1 && defaultGroup) { + if (filterCount >= 1 && defaultGroup) { break; } }