openstack
/
horizon
Code Issues Proposed changes

Update devDependencies in package.json 

This patch updates outdated JavaScript dev dependencies.

The latest Jasmine version makes nested beforeEach and unhandled
promise rejection fail, this was fixed.

Also, the latest Jasmine version runs tests in random order by default,
random is set to false for now to prevent tests failures.

Finally, the latest Jasmine version supports a new configuration option
failSpecWithNoExpectations. By default, this option is set to false and
Jasmine reports specs that have no expectations as passed. Setting this
option to true tells Jasmine to report specs without as expectations as
failed. For now, it is set to false for openstack-dashboard tests, this
should be changed in future.

Change-Id: I04d5c3ce7f7e0a9a38251e975b68bfa1998e556f
This commit is contained in:
Tatiana Ovchinnikova 2020-12-08 17:12:50 -06:00
parent 5b554ce49b
commit b532943a31
5 changed files with 44 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
horizon/karma.conf.js
View File

@ -139,12 +139,19 @@ module.exports = function (config) {
dir: '../../cover/horizon' dir: '../../cover/horizon'
}, },
client: {
jasmine: {
random: false,
failSpecWithNoExpectations: true
}
},
// Coverage threshold values. // Coverage threshold values.
thresholdReporter: { thresholdReporter: {
statements: 93, // target 100 statements: 92, // target 100
branches: 84, // target 100 branches: 84, // target 100
functions: 91, // target 100 functions: 91, // target 100
lines: 93 // target 100 lines: 92 // target 100
} }
}); });
}; };

5
horizon/static/framework/conf/resource-type-registry.service.spec.js
View File

@ -194,7 +194,12 @@
}); });
it("default load function returns a promise", function() { it("default load function returns a promise", function() {
function load() {
return 'here be a promise';
}
type.setLoadFunction(load);
expect(type.load()).toBeDefined(); expect(type.load()).toBeDefined();
expect(type.load()).toBe('here be a promise');
}); });
it("allows setting a list function", function() { it("allows setting a list function", function() {

35
openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.spec.js
View File

@ -159,24 +159,23 @@
} }
}); });
beforeEach(function () { settings = {
settings = { LAUNCH_INSTANCE_DEFAULTS: {
LAUNCH_INSTANCE_DEFAULTS: { create_volume: true,
create_volume: true, hide_create_volume: false,
hide_create_volume: false, config_drive: false,
config_drive: false, disable_image: false,
disable_image: false, disable_instance_snapshot: false,
disable_instance_snapshot: false, disable_volume: false,
disable_volume: false, disable_volume_snapshot: false
disable_volume_snapshot: false },
}, DEFAULT_BOOT_SOURCE: 'image'
DEFAULT_BOOT_SOURCE: 'image' };
}; IMAGE = {type: 'image', label: 'Image', selected: true};
IMAGE = {type: 'image', label: 'Image', selected: true}; VOLUME = {type: 'volume', label: 'Volume', selected: false};
VOLUME = {type: 'volume', label: 'Volume', selected: false}; VOLUME_SNAPSHOT = {type: 'volume_snapshot', label: 'Volume Snapshot', selected: false};
VOLUME_SNAPSHOT = {type: 'volume_snapshot', label: 'Volume Snapshot', selected: false}; INSTANCE_SNAPSHOT = {type: 'snapshot', label: 'Instance Snapshot', selected: false};
INSTANCE_SNAPSHOT = {type: 'snapshot', label: 'Instance Snapshot', selected: false};
});
$provide.value('horizon.app.core.openstack-service-api.nova', novaApi); $provide.value('horizon.app.core.openstack-service-api.nova', novaApi);
$provide.value('horizon.app.core.openstack-service-api.security-group', securityGroupApi); $provide.value('horizon.app.core.openstack-service-api.security-group', securityGroupApi);

8
openstack_dashboard/karma.conf.js
View File

@ -180,6 +180,14 @@ module.exports = function (config) {
dir: '../cover/openstack_dashboard' dir: '../cover/openstack_dashboard'
}, },
// TODO(tmazur) set failSpecWithNoExpectations to true after fixing tests
client: {
jasmine: {
random: false,
failSpecWithNoExpectations: false
}
},
// Coverage threshold values. // Coverage threshold values.
thresholdReporter: { thresholdReporter: {
statements: 96, // target 100 statements: 96, // target 100

10
package.json
View File

@ -9,12 +9,12 @@
"eslint": "3.0.0", "eslint": "3.0.0",
"eslint-config-openstack": "4.0.1", "eslint-config-openstack": "4.0.1",
"eslint-plugin-angular": "4.0.1", "eslint-plugin-angular": "4.0.1",
"jasmine-core": "2.4.1", "jasmine-core": "3.6.0",
"karma": "1.1.2", "karma": "5.2.3",
"karma-cli": "1.0.1", "karma-cli": "2.0.0",
"karma-coverage": "1.1.1", "karma-coverage": "2.0.3",
"karma-firefox-launcher": "2.1.0", "karma-firefox-launcher": "2.1.0",
"karma-jasmine": "1.0.2", "karma-jasmine": "4.0.1",
"karma-ng-html2js-preprocessor": "1.0.0", "karma-ng-html2js-preprocessor": "1.0.0",
"karma-threshold-reporter": "0.1.15" "karma-threshold-reporter": "0.1.15"
}, },