IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-25 18:30:41 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(tests): fix broken unittest due to merge conflict

Browse Source
This commit is contained in:
carl bergquist 2015-12-15 14:03:15 +01:00
parent 12d65bfdfa
commit c48da9b5cf
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/features/dashboard/rowCtrl.js
View File

@ -41,7 +41,6 @@ function (angular, _, config) {
$scope.dashboard.addPanel(panel, $scope.row);
};
$scope.deleteRow = function() {
function delete_row() {
$scope.dashboard.rows = _.without($scope.dashboard.rows, $scope.row);

2
public/test/specs/row-ctrl-specs.js
View File

@ -19,7 +19,7 @@ define([
ctx.scope.row = ctx.scope.dashboard.rows[0];
ctx.scope.appEvent = sinon.spy();
ctx.scope.delete_row();
ctx.scope.deleteRow();
});
it('should NOT ask for confirmation', function () {