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/actions/SaveActionSpec.js
+++ b/platform/commonUI/edit/test/actions/SaveActionSpec.js
@@ -52,7 +52,7 @@ define(
                );
                mockEditorCapability = jasmine.createSpyObj(
                    "editor",
-                    [ "save", "cancel" ]
+                    [ "save", "cancel", "isEditContextRoot" ]
                );
                mockActionCapability = jasmine.createSpyObj(
                    "actionCapability",
@@ -71,7 +71,7 @@ define(
                });
                mockDomainObject.getModel.andReturn({persisted: 0});
                mockEditorCapability.save.andReturn(mockPromise(true));
-                mockDomainObject.getOriginalObject.andReturn(mockDomainObject);
+                mockEditorCapability.isEditContextRoot.andReturn(true);

                action = new SaveAction(actionContext);

@@ -97,6 +97,13 @@ define(
                    action.perform();
                    expect(mockEditorCapability.save).toHaveBeenCalled();
                });
+
+            it("navigates to the object after saving",
+                function () {
+                    action.perform();
+                    expect(mockActionCapability.perform).toHaveBeenCalledWith("navigate");
+                });
+
        });
    }
 );