Merge branch 'open1071' into open-master

Merge changes for WTD-1071

platform/commonUI/edit/src/objects/EditableDomainObjectCache.js

@@ -51,6 +51,11 @@ define(
                     // some special behavior for its context capability.
                     root = root || domainObject;
 
+                    // Avoid double-wrapping (WTD-1017)
+                    if (domainObject.hasCapability('editor')) {
+                        return domainObject;
+                    }
+
                     // Provide an editable form of the object
                     return new EditableDomainObject(
                         domainObject,

platform/commonUI/edit/test/controllers/EditControllerSpec.js

@@ -25,7 +25,7 @@ define(
                 );
                 mockObject = jasmine.createSpyObj(
                     "domainObject",
-                    [ "getId", "getModel", "getCapability" ]
+                    [ "getId", "getModel", "getCapability", "hasCapability" ]
                 );
                 mockCapability = jasmine.createSpyObj(
                     "capability",

platform/commonUI/edit/test/objects/EditableDomainObjectCacheSpec.js

@@ -21,6 +21,9 @@ define(
                     getModel: function () { return {}; },
                     getCapability: function (name) {
                         return completionCapability;
+                    },
+                    hasCapability: function (name) {
+                        return false;
                     }
                 };
             }
@@ -29,6 +32,9 @@ define(
                 var result = Object.create(domainObject);
                 result.wrapped = true;
                 result.wrappedModel = model;
+                result.hasCapability = function (name) {
+                    return name === 'editor';
+                };
                 captured.wraps = (captured.wraps || 0) + 1;
                 return result;
             }
@@ -112,6 +118,19 @@ define(
                 expect(cache.isRoot(domainObjects[2])).toBeFalsy();
             });
 
+            it("does not double-wrap objects", function () {
+                var domainObject = new TestObject('test-id'),
+                    wrappedObject = cache.getEditableObject(domainObject);
+
+                // Same instance should be returned if you try to wrap
+                // twice. This is necessary, since it's possible to (e.g.)
+                // use a context capability on an object retrieved via
+                // composition, in which case a result will already be
+                // wrapped.
+                expect(cache.getEditableObject(wrappedObject))
+                    .toBe(wrappedObject);
+            });
+
 
         });
     }