From b70729190607af95ef76ebc1db619a4a67ad6c9e Mon Sep 17 00:00:00 2001 From: Ryosuke Mizuno Date: Thu, 27 Oct 2016 18:26:53 +0900 Subject: [PATCH] Add javascript tests for clusterOverviewController This patch adds javascript tests for the following modules. - horizon.dashboard.container-infra.clusters.details .overview.controller In addition, it has changed the ".success()" to the ".then()". Change-Id: Ia08a22febef04b8279d658e927789eff2ce8b9cf --- .../clusters/details/overview.controller.js | 2 +- .../details/overview.controller.spec.js | 45 +++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 magnum_ui/static/dashboard/container-infra/clusters/details/overview.controller.spec.js diff --git a/magnum_ui/static/dashboard/container-infra/clusters/details/overview.controller.js b/magnum_ui/static/dashboard/container-infra/clusters/details/overview.controller.js index b225dcfa..352d3a0f 100644 --- a/magnum_ui/static/dashboard/container-infra/clusters/details/overview.controller.js +++ b/magnum_ui/static/dashboard/container-infra/clusters/details/overview.controller.js @@ -35,7 +35,7 @@ function onGetCluster(cluster) { ctrl.cluster = cluster.data; - magnum.getClusterTemplate(ctrl.cluster.cluster_template_id).success(onGetClusterTemplate); + magnum.getClusterTemplate(ctrl.cluster.cluster_template_id).then(onGetClusterTemplate); } function onGetClusterTemplate(clusterTemplate) { diff --git a/magnum_ui/static/dashboard/container-infra/clusters/details/overview.controller.spec.js b/magnum_ui/static/dashboard/container-infra/clusters/details/overview.controller.spec.js new file mode 100644 index 00000000..2abe556b --- /dev/null +++ b/magnum_ui/static/dashboard/container-infra/clusters/details/overview.controller.spec.js @@ -0,0 +1,45 @@ +/** + * (c) Copyright 2016 NEC Corporation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. You may obtain + * a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + */ + +(function() { + 'use strict'; + + describe('cluster overview controller', function() { + + var ctrl, magnum, deferred; + + beforeEach(module('horizon.dashboard.container-infra.clusters')); + + beforeEach(inject(function($controller, $q, $injector) { + magnum = $injector.get('horizon.app.core.openstack-service-api.magnum'); + deferred = $q.defer(); + deferred.resolve({data: {image_id: 1},items:{1:{name:1,id:1},2:{name:2,id:2}}}); + spyOn(magnum, 'getClusterTemplate').and.returnValue(deferred.promise); + ctrl = $controller('ClusterOverviewController', + { + '$scope' : {context : {loadPromise: deferred.promise}} + } + ); + })); + + it('sets ctrl', inject(function($timeout) { + $timeout.flush(); + expect(ctrl.cluster_template).toBeDefined(); + expect(ctrl.cluster).toBeDefined(); + })); + + }); +})();