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

Merge branch 'open-master' into open1272

Browse Source 
Merge in latest from master branch into topic branch
for WTD-1272

Conflicts:
	platform/forms/test/controllers/DateTimeControllerSpec.js
This commit is contained in:
Victor Woeltjen
2015-06-19 13:15:36 -07:00
parent 6aff6d8d2b dbd7a65a7a
commit 67d1201214
62 changed files with 3108 additions and 1576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
platform/forms/test/controllers/DateTimeControllerSpec.js
View File

@ -85,10 +85,26 @@ define(
expect(mockScope.ngModel.test).toBeUndefined();
});
it("exposes date-time format for placeholder", function () {
expect(mockScope.format).toEqual(jasmine.any(String));
expect(mockScope.format.length).toBeGreaterThan(0);
});
it("initializes form fields with values from ng-model", function () {
mockScope.ngModel = { test: 1417215313000 };
mockScope.field = "test";
mockScope.$watch.calls.forEach(function (call) {
if (call.args[0] === 'ngModel[field]') {
call.args[1](mockScope.ngModel.test);
}
});
expect(mockScope.datetime).toEqual({
date: "2014-11-28",
hour: "22",
min: "55",
sec: "13"
});
});
});
}
);