openstack/horizon
Code Issues Proposed changes

Merge "Fix spec file variable/ improve code coverage"

Browse Source
This commit is contained in:
Jenkins
2017-01-30 16:36:03 +00:00
committed by Gerrit Code Review
parent 3d24c0cef4 d4083d18ad
commit 5ecc28189d
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openstack_dashboard/static/app/core/images/details/overview.controller.js
View File

@@ -44,7 +44,7 @@
ctrl.image.properties = Object.keys(ctrl.image.properties).map(function mapProps(prop) { ctrl.image.properties = Object.keys(ctrl.image.properties).map(function mapProps(prop) {
var propValue = ctrl.image.properties[prop]; var propValue = ctrl.image.properties[prop];
if ($.isArray(propValue) && propValue.length === 0) { if (angular.isArray(propValue) && propValue.length === 0) {
propValue = ''; propValue = '';
} }
return {name: prop, value: propValue}; return {name: prop, value: propValue};

30
openstack_dashboard/static/app/core/images/details/overview.controller.spec.js
View File

@@ -19,6 +19,7 @@
describe('image overview controller', function() { describe('image overview controller', function() {
var ctrl; var ctrl;
var sessionObj = {project_id: '12'};
var glance = { var glance = {
getNamespaces: angular.noop getNamespaces: angular.noop
}; };
@@ -29,8 +30,8 @@
var session = $injector.get('horizon.app.core.openstack-service-api.userSession'); var session = $injector.get('horizon.app.core.openstack-service-api.userSession');
var deferred = $q.defer(); var deferred = $q.defer();
var sessionDeferred = $q.defer(); var sessionDeferred = $q.defer();
deferred.resolve({data: {properties: {'a': 'apple'}}}); deferred.resolve({data: {properties: [{'a': 'apple'}, [], {}]}});
deferred.resolve({project_id: '12'}); sessionDeferred.resolve(sessionObj);
spyOn(glance, 'getNamespaces').and.returnValue(deferred.promise); spyOn(glance, 'getNamespaces').and.returnValue(deferred.promise);
spyOn(session, 'get').and.returnValue(sessionDeferred.promise); spyOn(session, 'get').and.returnValue(sessionDeferred.promise);
ctrl = $controller('ImageOverviewController', ctrl = $controller('ImageOverviewController',
@@ -44,10 +45,33 @@
expect(ctrl.resourceType).toBeDefined(); expect(ctrl.resourceType).toBeDefined();
}); });
it('sets ctrl.metadata', inject(function($timeout) { it('sets ctrl.images.properties (metadata)', inject(function($timeout) {
$timeout.flush(); $timeout.flush();
expect(ctrl.image).toBeDefined(); expect(ctrl.image).toBeDefined();
expect(ctrl.image.properties).toBeDefined(); expect(ctrl.image.properties).toBeDefined();
expect(ctrl.image.properties[0].name).toEqual('0');
expect(ctrl.image.properties[0].value).toEqual({'a': 'apple'});
}));
it('sets ctrl.images.properties propValue if empty array', inject(function($timeout) {
$timeout.flush();
expect(ctrl.image).toBeDefined();
expect(ctrl.image.properties).toBeDefined();
expect(ctrl.image.properties[1].name).toEqual('1');
expect(ctrl.image.properties[1].value).toEqual('');
}));
it('sets ctrl.images.properties propValue if empty object', inject(function($timeout) {
$timeout.flush();
expect(ctrl.image).toBeDefined();
expect(ctrl.image.properties).toBeDefined();
expect(ctrl.image.properties[2].name).toEqual('2');
expect(ctrl.image.properties[2].value).toEqual({});
}));
it('sets ctrl.projectId', inject(function($timeout) {
$timeout.flush();
expect(ctrl.projectId).toBe(sessionObj.project_id);
})); }));
}); });