diff --git a/platform/commonUI/browse/src/creation/CreationService.js b/platform/commonUI/browse/src/creation/CreationService.js index f89ac0e909..17cc5ce6b3 100644 --- a/platform/commonUI/browse/src/creation/CreationService.js +++ b/platform/commonUI/browse/src/creation/CreationService.js @@ -93,6 +93,12 @@ define( }); } + // Store the location of an object relative to it's parent. + function addLocationToModel(modelId, model, parent) { + model.location = parent.getId(); + return model; + } + // Create a new domain object with the provided model as a // member of the specified parent's composition function createObject(model, parent) { @@ -119,13 +125,6 @@ define( }); } - // Store the location of an object relative to it's parent. - function addLocationToModel(modelId, model, parent) { - model.location = parent.getId(); - - return model; - } - return { /** * Create a new domain object with the provided model, as diff --git a/platform/commonUI/browse/test/creation/CreationServiceSpec.js b/platform/commonUI/browse/test/creation/CreationServiceSpec.js index bb26b1ccd9..7f15afe061 100644 --- a/platform/commonUI/browse/test/creation/CreationServiceSpec.js +++ b/platform/commonUI/browse/test/creation/CreationServiceSpec.js @@ -202,11 +202,12 @@ define( }); it("stores location on new domainObjects", function () { - var model = { name: "my model" }; - var objectPromise = creationService.createObject( - model, - mockParentObject - ); + var model = { name: "my model" }, + objectPromise = creationService.createObject( + model, + mockParentObject + ); + expect(model.location).toBe('parentId'); }); diff --git a/platform/entanglement/src/capabilities/LocationCapability.js b/platform/entanglement/src/capabilities/LocationCapability.js index 66593c7130..3b26c5d58e 100644 --- a/platform/entanglement/src/capabilities/LocationCapability.js +++ b/platform/entanglement/src/capabilities/LocationCapability.js @@ -1,8 +1,8 @@ /*global define */ define( - function () { + "use strict"; function LocationCapability(domainObject) { this.domainObject = domainObject; diff --git a/platform/entanglement/test/capabilities/LocationCapabilitySpec.js b/platform/entanglement/test/capabilities/LocationCapabilitySpec.js index e707a34590..83f166cbec 100644 --- a/platform/entanglement/test/capabilities/LocationCapabilitySpec.js +++ b/platform/entanglement/test/capabilities/LocationCapabilitySpec.js @@ -1,4 +1,4 @@ -/*global define,describe,it,expect,beforeEach */ +/*global define,describe,it,expect,beforeEach,jasmine */ define( [ diff --git a/platform/entanglement/test/services/LinkServiceSpec.js b/platform/entanglement/test/services/LinkServiceSpec.js index 1d4f6670c3..b9bbe62c58 100644 --- a/platform/entanglement/test/services/LinkServiceSpec.js +++ b/platform/entanglement/test/services/LinkServiceSpec.js @@ -200,7 +200,7 @@ define( mutationPromise.resolve(); persistencePromise.resolve(); compositionPromise.resolve([linkedObject]); - expect(whenComplete).toHaveBeenCalledWith(linkedObject) + expect(whenComplete).toHaveBeenCalledWith(linkedObject); }); }); });