Merge branch 'mct588comm' of https://github.com/BogdanAlexandru/openmct into BogdanAlexandru-mct588comm

2016-09-22 17:33:42 -07:00
parent 43c32c2c7b 0c27a5f361
commit 275dda820b
17 changed files with 395 additions and 98 deletions
--- a/platform/commonUI/edit/test/actions/EditActionSpec.js
+++ b/platform/commonUI/edit/test/actions/EditActionSpec.js
@@ -58,7 +58,7 @@ define(
                );
                mockEditor = jasmine.createSpyObj(
                    "editorCapability",
-                    ["edit", "isEditContextRoot", "cancel"]
+                    ["edit", "isEditContextRoot"]
                );

                capabilities = {