alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into mobile

Browse Source
This commit is contained in:
Shivam Dave
2015-09-01 14:50:45 -07:00
parent 021d105fd0 199be71f8f
commit 8a5c61e2e6
25 changed files with 975 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/core/src/capabilities/MetadataCapability.js
View File

@@ -50,8 +50,8 @@ define(
function formatTimestamp(timestamp) {
return typeof timestamp === 'number' ?
(moment.utc(timestamp).format(TIME_FORMAT) + " UTC") :
undefined;
(moment.utc(timestamp).format(TIME_FORMAT) + " UTC") :
undefined;
}
function getProperties() {

11
platform/core/src/capabilities/PersistenceCapability.js
View File

@@ -72,7 +72,12 @@ define(
*/
PersistenceCapability.prototype.persist = function () {
var domainObject = this.domainObject,
modified = domainObject.getModel().modified;
model = domainObject.getModel(),
modified = model.modified,
persistenceService = this.persistenceService,
persistenceFn = model.persisted !== undefined ?
this.persistenceService.updateObject :
this.persistenceService.createObject;
// Update persistence timestamp...
domainObject.useCapability("mutation", function (model) {
@@ -80,11 +85,11 @@ define(
}, modified);
// ...and persist
return this.persistenceService.updateObject(
return persistenceFn.apply(persistenceService, [
this.getSpace(),
domainObject.getId(),
domainObject.getModel()
);
]);
};
/**

20
platform/core/test/capabilities/PersistenceCapabilitySpec.js
View File

@@ -48,7 +48,7 @@ define(
beforeEach(function () {
mockPersistenceService = jasmine.createSpyObj(
"persistenceService",
[ "updateObject", "readObject" ]
[ "updateObject", "readObject", "createObject", "deleteObject" ]
);
mockDomainObject = {
getId: function () { return id; },
@@ -68,10 +68,24 @@ define(
);
});
it("makes a call to the persistence service when invoked", function () {
it("creates unpersisted objects with the persistence service", function () {
// Verify precondition; no call made during constructor
expect(mockPersistenceService.createObject).not.toHaveBeenCalled();
persistence.persist();
expect(mockPersistenceService.createObject).toHaveBeenCalledWith(
SPACE,
id,
model
);
});
it("updates previously persisted objects with the persistence service", function () {
// Verify precondition; no call made during constructor
expect(mockPersistenceService.updateObject).not.toHaveBeenCalled();
model.persisted = 12321;
persistence.persist();
expect(mockPersistenceService.updateObject).toHaveBeenCalledWith(
@@ -112,4 +126,4 @@ define(
});
}
);
);