Resolved merge conflicts

2016-05-12 16:14:31 -07:00
parent 5bf750c90c
commit 44f4a82fa1
37 changed files with 741 additions and 332 deletions
--- a/platform/commonUI/edit/test/policies/EditableViewPolicySpec.js
+++ b/platform/commonUI/edit/test/policies/EditableViewPolicySpec.js
@@ -33,8 +33,13 @@ define(
                testMode = true; // Act as if we're in Edit mode by default
                mockDomainObject = jasmine.createSpyObj(
                    'domainObject',
-                    ['hasCapability']
+                    ['hasCapability', 'getCapability']
                );
+                mockDomainObject.getCapability.andReturn({
+                   inEditContext: function () {
+                       return true;
+                   }
+                });
                mockDomainObject.hasCapability.andCallFake(function (c) {
                    return (c === 'editor') && testMode;
                });