Merge "Update devDependencies in package.json"
This commit is contained in:
commit
4d1ec9b3a4
@ -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
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
@ -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() {
|
||||||
|
@ -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);
|
||||||
|
@ -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
10
package.json
@ -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"
|
||||||
},
|
},
|
||||||
|
Loading…
x
Reference in New Issue
Block a user