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

[Time Conductor] Update spec

Browse Source 
...for TimeRangeController to reflect separation of date-time
inputs into a separate control.

Additionally, removed unused function.
This commit is contained in:
Victor Woeltjen
2015-10-27 14:05:55 -07:00
parent cc8a7e513f
commit 920c83771d
2 changed files with 14 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
platform/commonUI/general/src/controllers/TimeRangeController.js
View File

@ -45,14 +45,6 @@ define(
return formatter.format(ts); return formatter.format(ts);
} }
function parseTimestamp(text) {
if (formatter.validate(text)) {
return formatter.parse(text);
} else {
throw new Error("Could not parse " + text);
}
}
// From 0.0-1.0 to "0%"-"100%" // From 0.0-1.0 to "0%"-"100%"
function toPercent(p) { function toPercent(p) {
return (100 * p) + "%"; return (100 * p) + "%";

86
platform/commonUI/general/test/controllers/TimeRangeControllerSpec.js
View File

@ -33,8 +33,9 @@ define(
describe("The TimeRangeController", function () { describe("The TimeRangeController", function () {
var mockScope, var mockScope,
mockDateService, mockFormatService,
mockNow, mockNow,
mockFormat,
controller; controller;
function fireWatch(expr, value) { function fireWatch(expr, value) {
@ -58,24 +59,26 @@ define(
"$scope", "$scope",
[ "$apply", "$watch", "$watchCollection" ] [ "$apply", "$watch", "$watchCollection" ]
); );
mockDateService = jasmine.createSpyObj( mockFormatService = jasmine.createSpyObj(
"dateService", "formatService",
[ "getFormat" ]
);
mockFormat = jasmine.createSpyObj(
"format",
[ "validate", "format", "parse" ] [ "validate", "format", "parse" ]
); );
mockDateService.validate.andCallFake(function (text) {
return moment.utc(text).isValid(); mockFormatService.getFormat.andReturn(mockFormat);
});
mockDateService.parse.andCallFake(function (text) { mockFormat.format.andCallFake(function (value) {
return moment.utc(text).valueOf();
});
mockDateService.format.andCallFake(function (value) {
return moment.utc(value).format("YYYY-MM-DD HH:mm:ss"); return moment.utc(value).format("YYYY-MM-DD HH:mm:ss");
}); });
mockNow = jasmine.createSpy('now'); mockNow = jasmine.createSpy('now');
controller = new TimeRangeController( controller = new TimeRangeController(
mockScope, mockScope,
mockDateService, mockFormatService,
mockNow mockNow
); );
}); });
@ -186,67 +189,6 @@ define(
.toBeGreaterThan(mockScope.ngModel.inner.start); .toBeGreaterThan(mockScope.ngModel.inner.start);
}); });
describe("by typing", function () {
it("updates models", function () {
var newStart = "1977-05-25 17:30:00",
newEnd = "2015-12-18 03:30:00";
mockScope.boundsModel.start = newStart;
fireWatch("boundsModel.start", newStart);
expect(mockScope.ngModel.outer.start)
.toEqual(moment.utc(newStart).valueOf());
expect(mockScope.boundsModel.startValid)
.toBeTruthy();
mockScope.boundsModel.end = newEnd;
fireWatch("boundsModel.end", newEnd);
expect(mockScope.ngModel.outer.end)
.toEqual(moment.utc(newEnd).valueOf());
expect(mockScope.boundsModel.endValid)
.toBeTruthy();
});
it("displays error state", function () {
var newStart = "Not a date",
newEnd = "Definitely not a date",
oldStart = mockScope.ngModel.outer.start,
oldEnd = mockScope.ngModel.outer.end;
mockScope.boundsModel.start = newStart;
fireWatch("boundsModel.start", newStart);
expect(mockScope.ngModel.outer.start)
.toEqual(oldStart);
expect(mockScope.boundsModel.startValid)
.toBeFalsy();
mockScope.boundsModel.end = newEnd;
fireWatch("boundsModel.end", newEnd);
expect(mockScope.ngModel.outer.end)
.toEqual(oldEnd);
expect(mockScope.boundsModel.endValid)
.toBeFalsy();
});
it("does not modify user input", function () {
// Don't want the controller "fixing" bad or
// irregularly-formatted input out from under
// the user's fingertips.
var newStart = "Not a date",
newEnd = "2015-3-3 01:02:04",
oldStart = mockScope.ngModel.outer.start,
oldEnd = mockScope.ngModel.outer.end;
mockScope.boundsModel.start = newStart;
fireWatch("boundsModel.start", newStart);
expect(mockScope.boundsModel.start)
.toEqual(newStart);
mockScope.boundsModel.end = newEnd;
fireWatch("boundsModel.end", newEnd);
expect(mockScope.boundsModel.end)
.toEqual(newEnd);
});
});
}); });