diff --git a/test/spec/controllers/challengesCtrlSpec.js b/test/spec/controllers/challengesCtrlSpec.js index 836ebbd3f2..49561238d9 100644 --- a/test/spec/controllers/challengesCtrlSpec.js +++ b/test/spec/controllers/challengesCtrlSpec.js @@ -183,31 +183,61 @@ describe('Challenges Controller', function() { }); }); - it('Clones a challenge', function() { - var copyChallenge = new challenges.Challenge({ - name: 'copyChallenge', - description: 'copyChallenge', - habits: [], - dailys: [], - todos: [], - rewards: [], - leader: user._id, - group: "copyGroup", - timestamp: +(new Date), - members: [user], - official: false, - _isMember: true - }); - scope.clone(copyChallenge) + describe('clone', function() { + it('Clones a challenge', function() { - expect( scope.obj.name ).to.eql(copyChallenge.name ); - expect( scope.obj.description ).to.eql(copyChallenge.description ); - expect( scope.obj.habits ).to.eql(copyChallenge.habits ); - expect( scope.obj.dailys ).to.eql(copyChallenge.dailys ); - expect( scope.obj.todos ).to.eql(copyChallenge.todos ); - expect( scope.obj.rewards ).to.eql(copyChallenge.rewards ); - expect( scope.obj.leader ).to.eql(copyChallenge.leader ); - expect( scope.obj.official ).to.eql(copyChallenge.official ); + var copyChallenge = new challenges.Challenge({ + name: 'copyChallenge', + description: 'copyChallenge', + habits: [], + dailys: [], + todos: [], + rewards: [], + leader: user._id, + group: "copyGroup", + timestamp: +(new Date), + members: [user], + official: true, + _isMember: true, + prize: 1 + }); + + copyChallenge.habits = [ + { + _id: "ae2aa6fd-fae4-44bc-940f-11976ee202f3", + id: "ae2aa6fd-fae4-44bc-940f-11976ee202f3", + dateCreated: "2015-06-15T00:18:59.440Z", + down: true, + notes: "", + priority: 1, + text: "test", + type: "habit", + up: true, + value: 0, + } + ]; + scope.clone(copyChallenge) + + expect( scope.newChallenge.name ).to.eql( copyChallenge.name ); + expect( scope.newChallenge.description ).to.eql( copyChallenge.description ); + + for( var property in copyChallenge.habits[0] ) { + if ( property == "_id" || property == "id" ) { + expect( scope.newChallenge.habits[0][property] ).to.not.eql( copyChallenge.habits[0][property] ); + } else { + expect( scope.newChallenge.habits[0][property] ).to.eql( copyChallenge.habits[0][property] ); + } + } + expect( scope.newChallenge.dailys ).to.eql( copyChallenge.dailys ); + expect( scope.newChallenge.todos ).to.eql( copyChallenge.todos ); + expect( scope.newChallenge.rewards ).to.eql( copyChallenge.rewards ); + expect( scope.newChallenge.leader ).to.eql( copyChallenge.leader ); + expect( scope.newChallenge.timestamp ).to.not.eql( copyChallenge.timestamp ); + expect( scope.newChallenge.members ).to.eql( [] ); + expect( scope.newChallenge.official ).to.eql( copyChallenge.official ); + expect( scope.newChallenge.prize ).to.eql( copyChallenge.prize ); + + }); }); diff --git a/website/public/js/controllers/challengesCtrl.js b/website/public/js/controllers/challengesCtrl.js index b81b8b8340..ba284a6146 100644 --- a/website/public/js/controllers/challengesCtrl.js +++ b/website/public/js/controllers/challengesCtrl.js @@ -101,9 +101,15 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User', reward: [] }; - function cloneTask(element, index, array) { - var task = Shared.taskDefaults(element); - clonedTasks[element.type].push(task); + function cloneTask(taskToClone, index, array) { + var tmpTask = {}; + for( var property in taskToClone ) { + if ( property !== "_id" && property !== "id" ) { + tmpTask[property] = taskToClone[property]; + } + } + var task = Shared.taskDefaults(tmpTask); + clonedTasks[taskToClone.type].push(task); } challenge.habits.forEach(cloneTask); @@ -111,8 +117,6 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User', challenge.todos.forEach(cloneTask); challenge.rewards.forEach(cloneTask); - //Use values from inc challenge. The reasons we don't use the whole challenge object is because - //Values like timestamp and memebers shouldn't be copied. $scope.obj = $scope.newChallenge = new Challenges.Challenge({ name: challenge.name, shortName: challenge.shortName, @@ -125,7 +129,7 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User', group: challenge.group._id, timestamp: +(new Date), members: [], - official: false, + official: challenge.official, prize: challenge.prize }); }; diff --git a/website/views/options/social/challenges.jade b/website/views/options/social/challenges.jade index 997c9c25d7..df5bc66f52 100644 --- a/website/views/options/social/challenges.jade +++ b/website/views/options/social/challenges.jade @@ -25,7 +25,7 @@ script(type='text/ng-template', id='partials/options.social.challenges.detail.ht div(bindonce='challenge', ng-if='challenge.leader._id==user._id') div(ng-hide='challenge._locked==false') button.btn.btn-sm.btn-default(ng-click='edit(challenge)')=env.t('edit') - button.btn.btn-sm.btn-default(ng-click='clone(challenge)')=env.t('clone') + button.btn.btn-sm.btn-success(ng-click='clone(challenge)')=env.t('clone') button.btn.btn-sm.btn-warning(ng-click='close(challenge, $event)', tooltip=env.t('deleteOrSelect'))=env.t('endChallenge') form(ng-show='challenge._locked==false')