ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-18 07:08:12 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

[Capabilities] Avoid erroneous logging

Browse Source 
Fix logic error which caused an inaccurate warning to
be logged when capabilities are overridden by priority.
Addresses #49.
This commit is contained in:
Victor Woeltjen
2015-09-11 11:38:22 -07:00
parent 426ab44d93
commit f17410a85b
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
platform/core/src/capabilities/CoreCapabilityProvider.js
View File

@ -67,8 +67,9 @@ define(
function packageCapabilities(capabilities) { function packageCapabilities(capabilities) {
var result = {}; var result = {};
capabilities.forEach(function (capability) { capabilities.forEach(function (capability) {
if (capability.key && !result[capability.key]) { if (capability.key) {
result[capability.key] = capability; result[capability.key] =
result[capability.key] || capability;
} else { } else {
$log.warn("No key defined for capability; skipping."); $log.warn("No key defined for capability; skipping.");
} }

14
platform/core/test/capabilities/CoreCapabilityProviderSpec.js
View File

@ -86,7 +86,19 @@ define(
expect(mockLog.warn).not.toHaveBeenCalled(); expect(mockLog.warn).not.toHaveBeenCalled();
}); });
it("prefers higher-priority capability", function () {
KeylessCapability.key = BasicCapability.key;
expect(provider.getCapabilities({}).basic)
.toEqual(BasicCapability);
});
// https://github.com/nasa/openmctweb/issues/49
it("does not log a warning for multiple capabilities with the same key", function () {
KeylessCapability.key = BasicCapability.key;
provider.getCapabilities({});
expect(mockLog.warn).not.toHaveBeenCalled();
});
}); });
} }
); );