From 4da3018ad972be4dbd5d80abe86dd9d4f47f5554 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Wed, 17 Jun 2015 07:51:07 -0500 Subject: [PATCH] Simplify editTask --- test/spec/controllers/challengesCtrlSpec.js | 12 ++---------- test/spec/controllers/tasksCtrlSpec.js | 12 ++---------- website/public/js/controllers/challengesCtrl.js | 4 +--- website/public/js/controllers/tasksCtrl.js | 4 +--- 4 files changed, 6 insertions(+), 26 deletions(-) diff --git a/test/spec/controllers/challengesCtrlSpec.js b/test/spec/controllers/challengesCtrlSpec.js index 05d921ff7e..1982786609 100644 --- a/test/spec/controllers/challengesCtrlSpec.js +++ b/test/spec/controllers/challengesCtrlSpec.js @@ -176,17 +176,9 @@ describe('Challenges Controller', function() { }); describe('editTask', function() { - it('calls Tasks.editTask', function() { + it('is Tasks.editTask', function() { inject(function(Tasks) { - sinon.stub(Tasks, 'editTask'); - var task = { - id: 'task-id', - type: 'todo' - }; - - scope.editTask(task); - expect(Tasks.editTask).to.be.calledOnce; - expect(Tasks.editTask).to.be.calledWith(task); + expect(scope.editTask).to.eql(Tasks.editTask); }); }); }); diff --git a/test/spec/controllers/tasksCtrlSpec.js b/test/spec/controllers/tasksCtrlSpec.js index c535b232e7..0b5ebd2cc2 100644 --- a/test/spec/controllers/tasksCtrlSpec.js +++ b/test/spec/controllers/tasksCtrlSpec.js @@ -22,17 +22,9 @@ describe('Tasks Controller', function() { }); describe('editTask', function() { - it('calls Tasks.editTask', function() { + it('is Tasks.editTask', function() { inject(function(Tasks) { - sinon.stub(Tasks, 'editTask'); - var task = { - id: 'task-id', - type: 'todo' - }; - - scope.editTask(task); - expect(Tasks.editTask).to.be.calledOnce; - expect(Tasks.editTask).to.be.calledWith(task); + expect(scope.editTask).to.eql(Tasks.editTask); }); }); }); diff --git a/website/public/js/controllers/challengesCtrl.js b/website/public/js/controllers/challengesCtrl.js index 2f9bc84c0e..a9d30bc506 100644 --- a/website/public/js/controllers/challengesCtrl.js +++ b/website/public/js/controllers/challengesCtrl.js @@ -49,9 +49,7 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User', }); }; - $scope.editTask = function(task) { - Tasks.editTask(task); - }; + $scope.editTask = Tasks.editTask; /** * Create diff --git a/website/public/js/controllers/tasksCtrl.js b/website/public/js/controllers/tasksCtrl.js index 58e109507d..9f0b031e01 100644 --- a/website/public/js/controllers/tasksCtrl.js +++ b/website/public/js/controllers/tasksCtrl.js @@ -65,9 +65,7 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','N list.focus = true; }; - $scope.editTask = function(task) { - Tasks.editTask(task); - }; + $scope.editTask = Tasks.editTask; /** * Add the new task to the actions log