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

Merge remote-tracking branch 'github/master' into open116

Browse Source 
Merge in latest from master into topic branch for
https://github.com/nasa/openmctweb/issues/116

Conflicts:
	platform/features/layout/test/FixedControllerSpec.js
	platform/features/plot/test/PlotControllerSpec.js
This commit is contained in:
Victor Woeltjen
2015-12-30 10:15:05 -08:00
parent 2358541d91 9b63a63efc
commit a49deb5ab1
41 changed files with 1779 additions and 774 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
platform/features/plot/test/PlotControllerSpec.js
View File

@ -286,6 +286,7 @@ define(
expect(mockHandle.request.calls.length).toEqual(2);
});
it("maintains externally-provided domain axis bounds after data is received", function () {
mockSeries.getPointCount.andReturn(3);
mockSeries.getRangeValue.andReturn(42);
@ -296,7 +297,7 @@ define(
mockScope.$watch.mostRecentCall.args[1](mockDomainObject);
fireEvent("telemetry:display:bounds", [
{},
{ start: 0, end: 10000 }
{start: 0, end: 10000}
]);
mockHandle.request.mostRecentCall.args[1](
mockDomainObject,
@ -312,6 +313,33 @@ define(
controller.getSubPlots()[0].panZoomStack.getDimensions()[0]
).toEqual(10000);
});
it("provides classes for legends based on limit state", function () {
var mockTelemetryObjects = mockHandle.getTelemetryObjects();
mockHandle.getDatum.andReturn({});
mockTelemetryObjects.forEach(function (mockObject, i) {
var id = 'object-' + i,
mockLimitCapability =
jasmine.createSpyObj('limit-' + id, ['evaluate']);
mockObject.getId.andReturn(id);
mockObject.getCapability.andCallFake(function (key) {
return (key === 'limit') && mockLimitCapability;
});
mockLimitCapability.evaluate
.andReturn({ cssClass: 'alarm-' + id });
});
mockScope.$watch.mostRecentCall.args[1](mockDomainObject);
mockHandler.handle.mostRecentCall.args[1]();
mockTelemetryObjects.forEach(function (mockTelemetryObject) {
expect(controller.getLegendClass(mockTelemetryObject))
.toEqual('alarm-' + mockTelemetryObject.getId());
});
});
});
}
);