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

Simplify editTask

Browse Source
This commit is contained in:
Blade Barringer
2015-06-17 07:51:07 -05:00
parent e422ea065f
commit 4da3018ad9
4 changed files with 6 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/spec/controllers/challengesCtrlSpec.js
View File

@@ -176,17 +176,9 @@ describe('Challenges Controller', function() {
}); });
describe('editTask', function() { describe('editTask', function() {
it('calls Tasks.editTask', function() { it('is Tasks.editTask', function() {
inject(function(Tasks) { inject(function(Tasks) {
sinon.stub(Tasks, 'editTask'); expect(scope.editTask).to.eql(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);
}); });
}); });
}); });

12
test/spec/controllers/tasksCtrlSpec.js
View File

@@ -22,17 +22,9 @@ describe('Tasks Controller', function() {
}); });
describe('editTask', function() { describe('editTask', function() {
it('calls Tasks.editTask', function() { it('is Tasks.editTask', function() {
inject(function(Tasks) { inject(function(Tasks) {
sinon.stub(Tasks, 'editTask'); expect(scope.editTask).to.eql(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);
}); });
}); });
}); });

4
website/public/js/controllers/challengesCtrl.js
View File

@@ -49,9 +49,7 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User',
}); });
}; };
$scope.editTask = function(task) { $scope.editTask = Tasks.editTask;
Tasks.editTask(task);
};
/** /**
* Create * Create

4
website/public/js/controllers/tasksCtrl.js
View File

@@ -65,9 +65,7 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','N
list.focus = true; list.focus = true;
}; };
$scope.editTask = function(task) { $scope.editTask = Tasks.editTask;
Tasks.editTask(task);
};
/** /**
* Add the new task to the actions log * Add the new task to the actions log