From 25e7114e9864cebf9fbcf6ecd88f89ecda28fa6d Mon Sep 17 00:00:00 2001 From: Emmanuel QUENTIN Date: Mon, 18 May 2015 14:45:08 +0200 Subject: [PATCH] Fix tests --- .../ng-admin/Crud/list/DatagridController.js | 2 +- .../ng-admin/Crud/misc/PromisesResolver.js | 12 ++++++++++++ .../test/unit/Crud/list/DatagridControllerSpec.js | 3 ++- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 src/javascripts/ng-admin/Crud/misc/PromisesResolver.js diff --git a/src/javascripts/ng-admin/Crud/list/DatagridController.js b/src/javascripts/ng-admin/Crud/list/DatagridController.js index e3ef6948..4d978619 100644 --- a/src/javascripts/ng-admin/Crud/list/DatagridController.js +++ b/src/javascripts/ng-admin/Crud/list/DatagridController.js @@ -17,7 +17,7 @@ define(function () { this.$location = $location; this.$anchorScroll = $anchorScroll; this.filters = {}; - this.shouldDisplayActions = this.$scope.listActions().length > 0; + this.shouldDisplayActions = this.$scope.listActions() && this.$scope.listActions().length > 0; $scope.toggleSelect = this.toggleSelect.bind(this); $scope.toggleSelectAll = this.toggleSelectAll.bind(this); diff --git a/src/javascripts/ng-admin/Crud/misc/PromisesResolver.js b/src/javascripts/ng-admin/Crud/misc/PromisesResolver.js new file mode 100644 index 00000000..96095d3f --- /dev/null +++ b/src/javascripts/ng-admin/Crud/misc/PromisesResolver.js @@ -0,0 +1,12 @@ +/*global define*/ +define(function () { + 'use strict'; + + function PromisesResolver(AdminDescription) { + return AdminDescription.getPromisesResolver(); + } + + PromisesResolver.$inject = ['AdminDescription']; + + return PromisesResolver; +}); diff --git a/src/javascripts/test/unit/Crud/list/DatagridControllerSpec.js b/src/javascripts/test/unit/Crud/list/DatagridControllerSpec.js index 93859154..e96a7b91 100644 --- a/src/javascripts/test/unit/Crud/list/DatagridControllerSpec.js +++ b/src/javascripts/test/unit/Crud/list/DatagridControllerSpec.js @@ -13,10 +13,11 @@ define(function (require) { entries = [ new Entry('my_entity', {value: 1}, 1), new Entry('my_entity', {value: 2}, 2), - new Entry('my_entity', {value: 3}, 3), + new Entry('my_entity', {value: 3}, 3) ]; dataGridController = new DataGridController({ + listActions: function() {}, entity: function () { return new Entity('my_entity'); },