Merge pull request #2097 from nasa/matching-historical-states

use correct duration for historical states

app.js

@@ -19,6 +19,7 @@
 
     // Defaults
     options.port = options.port || options.p || 8080;
+    options.host = options.host || options.h || 'localhost'
     options.directory = options.directory || options.D || '.';
     ['include', 'exclude', 'i', 'x'].forEach(function (opt) {
         options[opt] = options[opt] || [];
@@ -78,7 +79,7 @@
     app.use(express['static'](options.directory));
 
     // Finally, open the HTTP server and log the instance to the console
-    app.listen(options.port, function() {
-        console.log('Open MCT application running at localhost:' + options.port)
+    app.listen(options.port, options.host, function() {
+        console.log('Open MCT application running at %s:%s', options.host, options.port)
     });
 }());

bower.json

@@ -22,7 +22,6 @@
     "eventemitter3": "^1.2.0",
     "lodash": "3.10.1",
     "almond": "~0.3.2",
-    "html2canvas": "^0.4.1",
     "moment-timezone": "^0.5.13"
   }
-}
+}

example/generator/GeneratorMetadataProvider.js

@@ -30,6 +30,7 @@ define([
                 {
                     key: "sin",
                     name: "Sine",
+                    formatString: '%0.2f',
                     hints: {
                         range: 1
                     }
@@ -37,6 +38,7 @@ define([
                 {
                     key: "cos",
                     name: "Cosine",
+                    formatString: '%0.2f',
                     hints: {
                         range: 2
                     }

example/generator/StateGeneratorProvider.js

@@ -72,7 +72,7 @@ define([
         var data = [];
         while (start <= end && data.length < 5000) {
             data.push(pointForTimestamp(start, duration, domainObject.name));
-            start += 5000;
+            start += duration;
         }
         return Promise.resolve(data);
     };

example/styleguide/res/templates/controls.html

@@ -149,12 +149,21 @@
         <h2>Local Controls</h2>
         <div class="cols cols1-1">
             <div class="col">
-                <p>Local controls are typically buttons and selects that provide local control to an individual element. Typically, these controls are hidden in order to not block data display until the user hovers their cursor over an element, when the controls are displayed using a transition fade. Mousing out of the element fades the controls from view.</p>
+                <p>Local controls are typically buttons and selects that provide actions in close proximity to a component.</p>
+                <p>These controls can optionally be hidden to reduce clutter until the user hovers their cursor over an enclosing element. To use this approach, apply the class <code>.has-local-controls</code> to the element that should be aware of the hover and ensure that element encloses <code>.h-local-controls</code>.</p>
             </div>
-            <mct-example><div class="plot-display-area" style="height: 100px; padding: 10px; position: relative;">Hover over me
-    <div class="l-local-controls gl-plot-local-controls t-plot-display-controls">
+            <mct-example><div class="plot-display-area" style="padding: 10px; position: relative;">
+                Some content in here
+    <div class="h-local-controls h-local-controls-overlay-content l-btn-set">
         <a class="s-button icon-arrow-left" title="Restore previous pan/zoom"></a>
-        <a class="s-button icon-arrows-out" title="Reset pan/zoom"></a>
+        <a class="s-button icon-reset" title="Reset pan/zoom"></a>
+    </div>
+</div>
+<div class="plot-display-area has-local-controls" style="padding: 10px; position: relative;">
+    Hover here
+    <div class="h-local-controls h-local-controls-overlay-content local-controls-hidden l-btn-set">
+        <a class="s-button icon-arrow-left" title="Restore previous pan/zoom"></a>
+        <a class="s-button icon-reset" title="Reset pan/zoom"></a>
     </div>
 </div></mct-example>
         </div>

index.html

@@ -69,8 +69,7 @@
                     ]
                 }));
                 openmct.install(openmct.plugins.SummaryWidget());
-                openmct.install(openmct.plugins.BarGraph());
-            
+                openmct.install(openmct.plugins.Notebook());
                 openmct.time.clock('local', {start: -THIRTY_MINUTES, end: 0});
                 openmct.time.timeSystem('utc');
                 openmct.start();
@@ -82,8 +81,6 @@
         <link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-96x96.png" sizes="96x96">
         <link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-16x16.png" sizes="16x16">
         <link rel="shortcut icon" href="platform/commonUI/general/res/images/favicons/favicon.ico">
-
-        <link rel="stylesheet" href="src/plugins/barGraph/res/styles/barGraph.css">
     </head>
     <body>
         <div class="l-splash-holder s-splash-holder">

karma.conf.js

@@ -37,7 +37,10 @@ module.exports = function(config) {
             {pattern: 'bower_components/**/*.js', included: false},
             {pattern: 'node_modules/d3-*/**/*.js', included: false},
             {pattern: 'node_modules/vue/**/*.js', included: false},
+            {pattern: 'node_modules/printj/dist/*.js', included: false},
             {pattern: 'src/**/*', included: false},
+            {pattern: 'node_modules/painterro/build/*.js', included: false},
+            {pattern: 'node_modules/html2canvas/dist/*', included: false},
             {pattern: 'example/**/*.html', included: false},
             {pattern: 'example/**/*.js', included: false},
             {pattern: 'example/**/*.json', included: false},
@@ -62,7 +65,7 @@ module.exports = function(config) {
         // Test results reporter to use
         // Possible values: 'dots', 'progress'
         // Available reporters: https://npmjs.org/browse/keyword/karma-reporter
-        reporters: ['progress', 'coverage', 'html', 'junit'],
+        reporters: ['progress', 'coverage', 'html'],
 
         // Web server port.
         port: 9876,
@@ -78,7 +81,7 @@ module.exports = function(config) {
         // Specify browsers to run tests in.
         // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
         browsers: [
-            'Chrome'
+            'ChromeHeadless'
         ],
 
         // Code coverage reporting.
@@ -101,10 +104,6 @@ module.exports = function(config) {
             foldAll: false
         },
 
-        junitReporter: {
-            outputDir: process.env.CIRCLE_TEST_REPORTS || 'dist/reports/junit'
-        },
-
         // Continuous Integration mode.
         // If true, Karma captures browsers, runs the tests and exits.
         singleRun: true

openmct.js

@@ -29,7 +29,6 @@ requirejs.config({
         "csv": "bower_components/comma-separated-values/csv.min",
         "EventEmitter": "bower_components/eventemitter3/index",
         "es6-promise": "bower_components/es6-promise/es6-promise.min",
-        "html2canvas": "bower_components/html2canvas/build/html2canvas.min",
         "moment": "bower_components/moment/moment",
         "moment-duration-format": "bower_components/moment-duration-format/lib/moment-duration-format",
         "moment-timezone": "bower_components/moment-timezone/builds/moment-timezone-with-data",
@@ -50,7 +49,9 @@ requirejs.config({
         "d3-interpolate": "node_modules/d3-interpolate/build/d3-interpolate.min",
         "d3-time": "node_modules/d3-time/build/d3-time.min",
         "d3-time-format": "node_modules/d3-time-format/build/d3-time-format.min",
-        "worldwind": "node_modules/@nasaworldwind/worldwind/build/dist/worldwind.min"
+        "html2canvas": "node_modules/html2canvas/dist/html2canvas.min",
+        "painterro": "node_modules/painterro/build/painterro.min",
+        "printj": "node_modules/printj/dist/printj.min"
     },
     "shim": {
         "angular": {
@@ -62,12 +63,12 @@ requirejs.config({
         "EventEmitter": {
             "exports": "EventEmitter"
         },
-        "html2canvas": {
-            "exports": "html2canvas"
-        },
         "moment-duration-format": {
             "deps": ["moment"]
         },
+        "painterro": {
+            "exports": "Painterro"
+        },
         "saveAs": {
             "exports": "saveAs"
         },
@@ -89,6 +90,9 @@ requirejs.config({
         },
         "d3-axis": {
             "exports": "d3-axis"
+        },
+        "dom-to-image": {
+            "exports": "domtoimage"
         }
     }
 });

package.json

@@ -3,7 +3,6 @@
   "version": "0.14.0-SNAPSHOT",
   "description": "The Open MCT core platform",
   "dependencies": {
-    "@nasaworldwind/worldwind": "^0.9.0",
     "d3-array": "1.2.x",
     "d3-axis": "1.0.x",
     "d3-collection": "1.0.x",
@@ -15,9 +14,8 @@
     "d3-time": "1.0.x",
     "d3-time-format": "2.1.x",
     "express": "^4.13.1",
-    "install": "^0.12.1",
     "minimist": "^1.1.1",
-    "npm": "^6.1.0",
+    "painterro": "^0.2.65",
     "request": "^2.69.0",
     "vue": "^2.5.6"
   },
@@ -33,18 +31,18 @@
     "gulp-requirejs-optimize": "^0.3.1",
     "gulp-sass": "^3.1.0",
     "gulp-sourcemaps": "^1.6.0",
-    "jasmine-core": "^2.3.0",
+    "html2canvas": "^1.0.0-alpha.12",
+    "jasmine-core": "^3.1.0",
     "jscs-html-reporter": "^0.1.0",
     "jsdoc": "^3.3.2",
     "jshint": "^2.7.0",
-    "karma": "^0.13.3",
-    "karma-chrome-launcher": "^0.1.12",
-    "karma-cli": "0.0.4",
-    "karma-coverage": "^0.5.3",
+    "karma": "^2.0.3",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-cli": "^1.0.1",
+    "karma-coverage": "^1.1.2",
     "karma-html-reporter": "^0.2.7",
-    "karma-jasmine": "^0.1.5",
-    "karma-junit-reporter": "^0.3.8",
-    "karma-requirejs": "^0.2.2",
+    "karma-jasmine": "^1.1.2",
+    "karma-requirejs": "^1.1.0",
     "lodash": "^3.10.1",
     "markdown-toc": "^0.11.7",
     "marked": "^0.3.5",
@@ -52,6 +50,7 @@
     "mkdirp": "^0.5.1",
     "moment": "^2.11.1",
     "node-bourbon": "^4.2.3",
+    "printj": "^1.1.0",
     "requirejs": "2.1.x",
     "split": "^1.0.0",
     "v8-compile-cache": "^1.1.0"

platform/commonUI/browse/res/templates/browse.html

@@ -65,7 +65,7 @@
                         <div class='split-pane-component t-object pane primary-pane left'>
                             <mct-representation mct-object="navigatedObject"
                                                 key="navigatedObject.getCapability('status').get('editing') ? 'edit-object' : 'browse-object'"
-                                                class="abs holder holder-object">
+                                                class="abs holder holder-object t-main-view">
                             </mct-representation>
                             <a class="mini-tab-icon anchor-right mobile-hide toggle-pane toggle-inspect flush-right"
                                title="{{ modelPaneInspect.visible()? 'Hide' : 'Show' }} the Inspection pane"

platform/commonUI/browse/res/templates/browse/object-properties.html

@@ -19,41 +19,46 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<div ng-controller="ObjectInspectorController as controller">
-    <ul class="flex-elem grows l-inspector-part">
-        <li>
-            <em class="t-inspector-part-header">Properties</em>
-            <div class="inspector-properties"
-                 ng-repeat="data in metadata"
-                 ng-class="{ first:$index === 0 }">
-                <div class="label">{{ data.name }}</div>
-                <div class="value">{{ data.value }}</div>
+<div ng-controller="ObjectInspectorController as controller" class="grid-properties">
+    <ul class="l-inspector-part">
+        <h2 class="first">Properties</h2>
+        <li class="t-repeat grid-row"
+             ng-repeat="data in metadata"
+             ng-class="{ first:$index === 0 }">
+            <div class="grid-cell label">{{ data.name }}</div>
+            <div class="grid-cell value">{{ data.value }}</div>
+        </li>
+    </ul>
+
+    <ul class="l-inspector-part" ng-if="contextutalParents.length > 0">
+        <h2 title="The location of this linked object.">Location</h2>
+        <li class="grid-row">
+            <div class="label" ng-if="primaryParents.length > 0">This Link</div>
+            <div class="grid-cell value">
+                <div class="t-repeat inspector-location"
+                     ng-repeat="parent in contextutalParents"
+                     ng-class="{ last:($index + 1) === contextualParents.length }">
+                    <mct-representation key="'label'"
+                                        mct-object="parent"
+                                        ng-click="parent.getCapability('action').perform('navigate')"
+                                        class="location-item">
+                    </mct-representation>
+                </div>
             </div>
         </li>
-        <li ng-if="contextutalParents.length > 0">
-            <em class="t-inspector-part-header" title="The location of this linked object.">Location</em>
-            <div ng-if="primaryParents.length > 0" class="section-header">This Object</div>
-            <span class="inspector-location"
-                  ng-repeat="parent in contextutalParents"
-                  ng-class="{ last:($index + 1) === contextualParents.length }">
-                <mct-representation key="'label'"
-                                    mct-object="parent"
-                                    ng-click="parent.getCapability('action').perform('navigate')"
-                                    class="location-item">
-                </mct-representation>
-            </span>
-        </li>
-        <li ng-if="primaryParents.length > 0">
-            <div class="section-header">Object's Original</div>
-            <span class="inspector-location"
-                  ng-repeat="parent in primaryParents"
-                  ng-class="{ last:($index + 1) === primaryParents.length }">
-                <mct-representation key="'label'"
-                                    mct-object="parent"
-                                    ng-click="parent.getCapability('action').perform('navigate')"
-                                    class="location-item">
-                </mct-representation>
-            </span>
+        <li class="grid-row" ng-if="primaryParents.length > 0">
+            <div class="grid-cell label">Original</div>
+            <div class="grid-cell value">
+                <div class="t-repeat inspector-location value"
+                     ng-repeat="parent in primaryParents"
+                     ng-class="{ last:($index + 1) === primaryParents.length }">
+                    <mct-representation key="'label'"
+                                        mct-object="parent"
+                                        ng-click="parent.getCapability('action').perform('navigate')"
+                                        class="location-item">
+                    </mct-representation>
+                </div>
+            </div>
         </li>
     </ul>
 </div>

platform/commonUI/browse/src/BrowseController.js

@@ -47,8 +47,8 @@ define(
             urlService,
             defaultPath
         ) {
-            var initialPath = ($route.current.params.ids || defaultPath).split("/");
-            var currentIds;
+            var initialPath = ($route.current.params.ids || defaultPath).split("/"),
+                currentIds;
 
             $scope.treeModel = {
                 selectedObject: undefined,
@@ -56,7 +56,24 @@ define(
                     navigationService.setNavigation(object, true);
                 },
                 allowSelection: function (object) {
-                    return navigationService.shouldNavigate();
+                    var domainObjectInView = navigationService.getNavigation(),
+                        isInEditMode = domainObjectInView.getCapability('status').get('editing');
+
+                    if (isInEditMode) {
+
+                        var actions = object.getCapability('action'),
+                            previewAction = actions.getActions({key: 'mct-preview-action'})[0];
+
+                        if (previewAction && previewAction.perform) {
+                            previewAction.perform();
+                            return false;
+                        } else {
+                            return navigationService.shouldNavigate();
+                        }
+
+                    } else {
+                        return true;
+                    }
                 }
             };
 

platform/commonUI/browse/src/navigation/NavigationService.js

@@ -162,7 +162,6 @@ define(
          */
         NavigationService.prototype.shouldWarnBeforeNavigate = function () {
             var reasons = [];
-
             this.checks.forEach(function (checkFn) {
                 var reason = checkFn();
                 if (reason) {

platform/commonUI/browse/test/BrowseControllerSpec.js

@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global console*/
 
 /**
  * MCTRepresentationSpec. Created by vwoeltje on 11/6/14.
@@ -48,9 +49,19 @@ define(
                 controller;
 
             function waitsForNavigation() {
-                var calls = mockNavigationService.setNavigation.calls.length;
-                waitsFor(function () {
-                    return mockNavigationService.setNavigation.calls.length > calls;
+                return new Promise(function (resolve) {
+                    mockNavigationService.setNavigation.and.callFake(function (obj) {
+                        var returnValue;
+                        try {
+                            returnValue = NavigationService.prototype.setNavigation.call(mockNavigationService, obj);
+                        } catch (err) {
+                            console.error(err);
+                            //Not rejecting because 'setNavigation' has been called, which is what's being tested here.
+                            //Rejecting will fail tests.
+                        }
+                        resolve();
+                        return returnValue;
+                    });
                 });
             }
 
@@ -78,7 +89,7 @@ define(
                     "urlService",
                     ["urlForLocation"]
                 );
-                mockUrlService.urlForLocation.andCallFake(function (mode, object) {
+                mockUrlService.urlForLocation.and.callFake(function (mode, object) {
                     if (object === mockDefaultRootObject) {
                         return [mode, testDefaultRoot].join('/');
                     }
@@ -106,7 +117,7 @@ define(
                     "removeListener"
                 ].forEach(function (method) {
                     spyOn(mockNavigationService, method)
-                        .andCallThrough();
+                        .and.callThrough();
                 });
                 mockRootObject = jasmine.createSpyObj(
                     "rootObjectContainer",
@@ -124,60 +135,58 @@ define(
                     "nestedDomainObject",
                     ["getId", "getCapability", "getModel", "useCapability", "hasCapability"]
                 );
-                mockObjectService.getObjects.andReturn(Promise.resolve({
+                mockObjectService.getObjects.and.returnValue(Promise.resolve({
                     ROOT: mockRootObject
                 }));
-                mockRootObject.useCapability.andReturn(Promise.resolve([
+                mockRootObject.useCapability.and.returnValue(Promise.resolve([
                     mockOtherDomainObject,
                     mockDefaultRootObject
                 ]));
-                mockRootObject.hasCapability.andReturn(true);
-                mockDefaultRootObject.useCapability.andReturn(Promise.resolve([
+                mockRootObject.hasCapability.and.returnValue(true);
+                mockDefaultRootObject.useCapability.and.returnValue(Promise.resolve([
                     mockNextObject
                 ]));
-                mockDefaultRootObject.hasCapability.andReturn(true);
-                mockOtherDomainObject.hasCapability.andReturn(false);
-                mockNextObject.useCapability.andReturn(undefined);
-                mockNextObject.hasCapability.andReturn(false);
-                mockNextObject.getId.andReturn("next");
-                mockDefaultRootObject.getId.andReturn(testDefaultRoot);
+                mockDefaultRootObject.hasCapability.and.returnValue(true);
+                mockOtherDomainObject.hasCapability.and.returnValue(false);
+                mockNextObject.useCapability.and.returnValue(undefined);
+                mockNextObject.hasCapability.and.returnValue(false);
+                mockNextObject.getId.and.returnValue("next");
+                mockDefaultRootObject.getId.and.returnValue(testDefaultRoot);
 
                 instantiateController();
-                waitsForNavigation();
+                return waitsForNavigation();
             });
 
             it("uses composition to set the navigated object, if there is none", function () {
                 instantiateController();
-                waitsForNavigation();
-                runs(function () {
+                return waitsForNavigation().then(function () {
                     expect(mockNavigationService.setNavigation)
-                        .toHaveBeenCalledWith(mockDefaultRootObject);
+                    .toHaveBeenCalledWith(mockDefaultRootObject);
                 });
             });
 
             it("navigates to a root-level object, even when default path is not found", function () {
                 mockDefaultRootObject.getId
-                    .andReturn("something-other-than-the-" + testDefaultRoot);
+                    .and.returnValue("something-other-than-the-" + testDefaultRoot);
                 instantiateController();
 
-                waitsForNavigation();
-                runs(function () {
+                return waitsForNavigation().then(function () {
                     expect(mockNavigationService.setNavigation)
-                        .toHaveBeenCalledWith(mockDefaultRootObject);
+                    .toHaveBeenCalledWith(mockDefaultRootObject);
                 });
+            });
 
-            });
-            //
             it("does not try to override navigation", function () {
-                mockNavigationService.getNavigation.andReturn(mockDefaultRootObject);
+                mockNavigationService.getNavigation.and.returnValue(mockDefaultRootObject);
                 instantiateController();
-                waitsForNavigation();
-                expect(mockScope.navigatedObject).toBe(mockDefaultRootObject);
+                return waitsForNavigation().then(function () {
+                    expect(mockScope.navigatedObject).toBe(mockDefaultRootObject);
+                });
             });
-            //
+
             it("updates scope when navigated object changes", function () {
                 // Should have registered a listener - call it
-                mockNavigationService.addListener.mostRecentCall.args[0](
+                mockNavigationService.addListener.calls.mostRecent().args[0](
                     mockOtherDomainObject
                 );
                 expect(mockScope.navigatedObject).toEqual(mockOtherDomainObject);
@@ -189,19 +198,18 @@ define(
                     "$destroy",
                     jasmine.any(Function)
                 );
-                mockScope.$on.mostRecentCall.args[1]();
+                mockScope.$on.calls.mostRecent().args[1]();
 
                 // Should remove the listener it added earlier
                 expect(mockNavigationService.removeListener).toHaveBeenCalledWith(
-                    mockNavigationService.addListener.mostRecentCall.args[0]
+                    mockNavigationService.addListener.calls.mostRecent().args[0]
                 );
             });
 
             it("uses route parameters to choose initially-navigated object", function () {
                 mockRoute.current.params.ids = testDefaultRoot + "/next";
                 instantiateController();
-                waitsForNavigation();
-                runs(function () {
+                return waitsForNavigation().then(function () {
                     expect(mockScope.navigatedObject).toBe(mockNextObject);
                     expect(mockNavigationService.setNavigation)
                         .toHaveBeenCalledWith(mockNextObject);
@@ -214,12 +222,10 @@ define(
                 // it hits an invalid ID.
                 mockRoute.current.params.ids = testDefaultRoot + "/junk";
                 instantiateController();
-                waitsForNavigation();
-                runs(function () {
+                return waitsForNavigation().then(function () {
                     expect(mockScope.navigatedObject).toBe(mockDefaultRootObject);
                     expect(mockNavigationService.setNavigation)
                         .toHaveBeenCalledWith(mockDefaultRootObject);
-
                 });
             });
 
@@ -229,8 +235,7 @@ define(
                 // should stop at it since remaining IDs cannot be loaded.
                 mockRoute.current.params.ids = testDefaultRoot + "/next/junk";
                 instantiateController();
-                waitsForNavigation();
-                runs(function () {
+                return waitsForNavigation().then(function () {
                     expect(mockScope.navigatedObject).toBe(mockNextObject);
                     expect(mockNavigationService.setNavigation)
                         .toHaveBeenCalledWith(mockNextObject);
@@ -244,11 +249,11 @@ define(
                 expect(mockRoute.current.pathParams.ids)
                     .not
                     .toBe(testDefaultRoot + '/next');
-                mockLocation.path.andCallFake(function () {
+                mockLocation.path.and.callFake(function () {
                     expect(mockRoute.current.pathParams.ids)
                         .toBe(testDefaultRoot + '/next');
                 });
-                mockNavigationService.addListener.mostRecentCall.args[0](
+                mockNavigationService.addListener.calls.mostRecent().args[0](
                     mockNextObject
                 );
                 expect(mockLocation.path).toHaveBeenCalledWith(

platform/commonUI/browse/test/BrowseObjectControllerSpec.js

@@ -20,7 +20,6 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-
 define(
     ["../src/BrowseObjectController"],
     function (BrowseObjectController) {
@@ -33,7 +32,7 @@ define(
 
             // Utility function; look for a $watch on scope and fire it
             function fireWatch(expr, value) {
-                mockScope.$watch.calls.forEach(function (call) {
+                mockScope.$watch.calls.all().forEach(function (call) {
                     if (call.args[0] === expr) {
                         call.args[1](value);
                     }
@@ -50,7 +49,7 @@ define(
                     "$location",
                     ["path", "search"]
                 );
-                mockLocation.search.andReturn({});
+                mockLocation.search.and.returnValue({});
 
                 controller = new BrowseObjectController(
                     mockScope,
@@ -65,7 +64,7 @@ define(
 
                 // Allows the path index to be checked
                 // prior to setting $route.current
-                mockLocation.path.andReturn("/browse/");
+                mockLocation.path.and.returnValue("/browse/");
             });
 
             it("sets the active view from query parameters", function () {
@@ -79,10 +78,10 @@ define(
                         { key: 'xyz' }
                     ];
 
-                mockDomainObject.useCapability.andCallFake(function (c) {
+                mockDomainObject.useCapability.and.callFake(function (c) {
                     return (c === 'view') && testViews;
                 });
-                mockLocation.search.andReturn({ view: 'def' });
+                mockLocation.search.and.returnValue({ view: 'def' });
 
                 fireWatch('domainObject', mockDomainObject);
                 expect(mockScope.representation.selected)

platform/commonUI/browse/test/InspectorPaneControllerSpec.js

@@ -50,14 +50,14 @@ define(
                     "navigationService",
                     ["getNavigation", "addListener"]
                 );
-                mockNavigationService.addListener.andReturn(mockNavigationUnlistener);
+                mockNavigationService.addListener.and.returnValue(mockNavigationUnlistener);
 
                 mockStatusUnlistener = jasmine.createSpy("statusUnlistener");
                 mockStatusCapability = jasmine.createSpyObj(
                     "statusCapability",
                     ["listen"]
                 );
-                mockStatusCapability.listen.andReturn(mockStatusUnlistener);
+                mockStatusCapability.listen.and.returnValue(mockStatusUnlistener);
 
                 mockDomainObject = jasmine.createSpyObj(
                     'domainObject',
@@ -68,13 +68,13 @@ define(
                         'hasCapability'
                     ]
                 );
-                mockDomainObject.getId.andReturn("domainObject");
-                mockDomainObject.getModel.andReturn({});
-                mockDomainObject.hasCapability.andReturn(true);
-                mockDomainObject.getCapability.andReturn(mockStatusCapability);
+                mockDomainObject.getId.and.returnValue("domainObject");
+                mockDomainObject.getModel.and.returnValue({});
+                mockDomainObject.hasCapability.and.returnValue(true);
+                mockDomainObject.getCapability.and.returnValue(mockStatusCapability);
 
                 mockLocation = jasmine.createSpyObj('location', ['search']);
-                mockLocation.search.andReturn({});
+                mockLocation.search.and.returnValue({});
 
                 mockAttrs = {};
 
@@ -84,7 +84,7 @@ define(
             it("listens for changes to navigation and attaches a status" +
                 " listener", function () {
                 expect(mockNavigationService.addListener).toHaveBeenCalledWith(jasmine.any(Function));
-                mockNavigationService.addListener.mostRecentCall.args[0](mockDomainObject);
+                mockNavigationService.addListener.calls.mostRecent().args[0](mockDomainObject);
                 expect(mockStatusCapability.listen).toHaveBeenCalledWith(jasmine.any(Function));
             });
 
@@ -93,8 +93,8 @@ define(
                 controller.toggle();
                 // test pre-condition that inspector is hidden
                 expect(controller.visible()).toBe(false);
-                mockNavigationService.addListener.mostRecentCall.args[0](mockDomainObject);
-                mockStatusCapability.listen.mostRecentCall.args[0](["editing"]);
+                mockNavigationService.addListener.calls.mostRecent().args[0](mockDomainObject);
+                mockStatusCapability.listen.calls.mostRecent().args[0](["editing"]);
                 expect(controller.visible()).toBe(true);
             });
 

platform/commonUI/browse/test/MenuArrowControllerSpec.js

@@ -60,8 +60,8 @@ define(
                 mockActionContext.domainObject = mockDomainObject;
                 mockActionContext.event = mockEvent;
                 mockScope.domainObject = mockDomainObject;
-                mockDomainObject.getCapability.andReturn(mockContextMenuAction);
-                mockContextMenuAction.perform.andReturn(jasmine.any(Function));
+                mockDomainObject.getCapability.and.returnValue(mockContextMenuAction);
+                mockContextMenuAction.perform.and.returnValue(jasmine.any(Function));
 
                 controller = new MenuArrowController(mockScope);
             });

platform/commonUI/browse/test/ObjectHeaderControllerSpec.js

@@ -39,7 +39,7 @@ define(
                 mockMutationCapability = jasmine.createSpyObj("mutation", ["mutate"]);
                 mockTypeCapability = jasmine.createSpyObj("type", ["typeDef", "hasFeature"]);
                 mockTypeCapability.typeDef = { name: ""};
-                mockTypeCapability.hasFeature.andCallFake(function (feature) {
+                mockTypeCapability.hasFeature.and.callFake(function (feature) {
                     return feature === 'creation';
                 });
 
@@ -52,8 +52,8 @@ define(
                     name: "Test name"
                 };
                 mockDomainObject = jasmine.createSpyObj("domainObject", ["getCapability", "getModel"]);
-                mockDomainObject.getModel.andReturn(model);
-                mockDomainObject.getCapability.andCallFake(function (key) {
+                mockDomainObject.getModel.and.returnValue(model);
+                mockDomainObject.getCapability.and.callFake(function (key) {
                     return mockCapabilities[key];
                 });
 
@@ -62,7 +62,7 @@ define(
                 };
 
                 mockCurrentTarget = jasmine.createSpyObj("currentTarget", ["blur", "textContent"]);
-                mockCurrentTarget.blur.andReturn(mockCurrentTarget);
+                mockCurrentTarget.blur.and.returnValue(mockCurrentTarget);
 
                 mockEvent = {
                     which: {},
@@ -109,7 +109,7 @@ define(
 
                 expect(mockMutationCapability.mutate).toHaveBeenCalledWith(jasmine.any(Function));
 
-                mockMutationCapability.mutate.mostRecentCall.args[0](model);
+                mockMutationCapability.mutate.calls.mostRecent().args[0](model);
 
                 expect(mockDomainObject.getModel().name).toBe("New name");
             });
@@ -127,7 +127,7 @@ define(
             });
 
             it("disallows editting name when object is non-creatable", function () {
-                mockTypeCapability.hasFeature.andReturn(false);
+                mockTypeCapability.hasFeature.and.returnValue(false);
 
                 expect(controller.allowEdit()).toBe(false);
 

platform/commonUI/browse/test/PaneControllerSpec.js

@@ -53,8 +53,8 @@ define(
                         ['getId', 'getModel', 'getCapability']
                     );
 
-                    mockDomainObject.getId.andReturn(id);
-                    mockDomainObject.getModel.andReturn({});
+                    mockDomainObject.getId.and.returnValue(id);
+                    mockDomainObject.getModel.and.returnValue({});
 
                     return mockDomainObject;
                 });
@@ -65,7 +65,7 @@ define(
                 mockWindow = jasmine.createSpyObj("$window", ["open"]);
 
                 mockLocation = jasmine.createSpyObj('location', ['search']);
-                mockLocation.search.andReturn({});
+                mockLocation.search.and.returnValue({});
 
                 mockAttrs = {};
             });
@@ -83,9 +83,9 @@ define(
             });
 
             it("collapses on navigation changes on portrait-oriented phones", function () {
-                mockAgentService.isMobile.andReturn(true);
-                mockAgentService.isPhone.andReturn(true);
-                mockAgentService.isPortrait.andReturn(true);
+                mockAgentService.isMobile.and.returnValue(true);
+                mockAgentService.isPhone.and.returnValue(true);
+                mockAgentService.isPortrait.and.returnValue(true);
                 controller = instantiateController();
                 expect(controller.visible()).toBeTruthy();
 
@@ -102,13 +102,13 @@ define(
                 });
 
                 it("sets pane state to false when in location.search", function () {
-                    mockLocation.search.andReturn({'hideTree': true});
+                    mockLocation.search.and.returnValue({'hideTree': true});
                     expect(instantiateController().visible()).toBe(false);
                     expect(mockLocation.search).toHaveBeenCalledWith('hideTree', undefined);
                 });
 
                 it("sets state to true when not found in location.search", function () {
-                    mockLocation.search.andReturn({});
+                    mockLocation.search.and.returnValue({});
                     expect(instantiateController().visible()).toBe(true);
                     expect(mockLocation.search).not.toHaveBeenCalledWith('hideTree', undefined);
                 });

platform/commonUI/browse/test/navigation/NavigateActionSpec.js

@@ -34,17 +34,6 @@ define([
             mockDomainObject,
             action;
 
-
-        function waitForCall() {
-            var called = false;
-            waitsFor(function () {
-                return called;
-            });
-            return function () {
-                called = true;
-            };
-        }
-
         beforeEach(function () {
             mockNavigationService = jasmine.createSpyObj(
                 "navigationService",
@@ -63,26 +52,24 @@ define([
         });
 
         it("sets navigation if it is allowed", function () {
-            mockNavigationService.shouldNavigate.andReturn(true);
-            action.perform()
-                .then(waitForCall());
-            runs(function () {
-                expect(mockNavigationService.setNavigation)
+            mockNavigationService.shouldNavigate.and.returnValue(true);
+            return action.perform()
+                .then(function () {
+                    expect(mockNavigationService.setNavigation)
                     .toHaveBeenCalledWith(mockDomainObject, true);
-            });
+                });
         });
 
         it("does not set navigation if it is not allowed", function () {
-            mockNavigationService.shouldNavigate.andReturn(false);
+            mockNavigationService.shouldNavigate.and.returnValue(false);
             var onSuccess = jasmine.createSpy('onSuccess');
-            action.perform()
-                .then(onSuccess, waitForCall());
-            runs(function () {
-                expect(onSuccess).not.toHaveBeenCalled();
-                expect(mockNavigationService.setNavigation)
-                    .not
-                    .toHaveBeenCalledWith(mockDomainObject);
-            });
+            return action.perform()
+                .then(onSuccess, function () {
+                    expect(onSuccess).not.toHaveBeenCalled();
+                    expect(mockNavigationService.setNavigation)
+                        .not
+                        .toHaveBeenCalledWith(mockDomainObject);
+                });
         });
 
         it("is only applicable when a domain object is in context", function () {

platform/commonUI/browse/test/navigation/NavigationServiceSpec.js

@@ -69,7 +69,7 @@ define(
                 navigationService.addListener(callback);
                 navigationService.setNavigation(testObject);
                 navigationService.setNavigation(testObject);
-                expect(callback.calls.length).toEqual(1);
+                expect(callback.calls.count()).toEqual(1);
             });
 
             it("stops notifying listeners after removal", function () {

platform/commonUI/browse/test/navigation/OrphanNavigationHandlerSpec.js

@@ -65,34 +65,35 @@ define([
             mockActionCapability = jasmine.createSpyObj('action', ['perform']);
             mockEditor = jasmine.createSpyObj('editor', ['isEditContextRoot']);
 
-            mockThrottle.andCallFake(function (fn) {
+            mockThrottle.and.callFake(function (fn) {
                 var mockThrottledFn =
                     jasmine.createSpy('throttled-' + mockThrottledFns.length);
-                mockThrottledFn.andCallFake(fn);
+                mockThrottledFn.and.callFake(fn);
                 mockThrottledFns.push(mockThrottledFn);
                 return mockThrottledFn;
             });
-            mockTopic.andReturn(mockMutationTopic);
-            mockDomainObject.getId.andReturn(testId);
-            mockDomainObject.getCapability.andCallFake(function (c) {
+            mockTopic.and.returnValue(mockMutationTopic);
+            mockDomainObject.getId.and.returnValue(testId);
+            mockDomainObject.getCapability.and.callFake(function (c) {
                 return {
                     context: mockContext,
                     editor: mockEditor
                 }[c];
             });
-            mockDomainObject.hasCapability.andCallFake(function (c) {
+            mockDomainObject.hasCapability.and.callFake(function (c) {
                 return !!mockDomainObject.getCapability(c);
             });
-            mockParentObject.getCapability.andCallFake(function (c) {
+            mockParentObject.getCapability.and.callFake(function (c) {
                 return {
                     action: mockActionCapability
                 }[c];
             });
             testParentComposition = [];
-            mockParentObject.useCapability.andReturn(Promise.resolve(testParentComposition));
-            mockContext.getParent.andReturn(mockParentObject);
-            mockNavigationService.getNavigation.andReturn(mockDomainObject);
-            mockEditor.isEditContextRoot.andReturn(false);
+            mockParentObject.useCapability.and.returnValue(Promise.resolve(testParentComposition));
+
+            mockContext.getParent.and.returnValue(mockParentObject);
+            mockNavigationService.getNavigation.and.returnValue(mockDomainObject);
+            mockEditor.isEditContextRoot.and.returnValue(false);
 
             return new OrphanNavigationHandler(
                 mockThrottle,
@@ -106,7 +107,7 @@ define([
             expect(mockMutationTopic.listen)
                 .toHaveBeenCalledWith(jasmine.any(Function));
             expect(mockThrottledFns.indexOf(
-                mockMutationTopic.listen.mostRecentCall.args[0]
+                mockMutationTopic.listen.calls.mostRecent().args[0]
             )).not.toEqual(-1);
         });
 
@@ -114,7 +115,7 @@ define([
             expect(mockNavigationService.addListener)
                 .toHaveBeenCalledWith(jasmine.any(Function));
             expect(mockThrottledFns.indexOf(
-                mockNavigationService.addListener.mostRecentCall.args[0]
+                mockNavigationService.addListener.calls.mostRecent().args[0]
             )).not.toEqual(-1);
         });
 
@@ -134,28 +135,14 @@ define([
                     function itNavigatesAsExpected() {
                         if (isOrphan && !isEditRoot) {
                             it("navigates to the parent", function () {
-                                var done = false;
-                                waitsFor(function () {
-                                    return done;
-                                });
-                                setTimeout(function () {
-                                    done = true;
-                                }, 5);
-                                runs(function () {
+                                return Promise.resolve().then(function () {
                                     expect(mockActionCapability.perform)
                                         .toHaveBeenCalledWith('navigate');
                                 });
                             });
                         } else {
                             it("does nothing", function () {
-                                var done = false;
-                                waitsFor(function () {
-                                    return done;
-                                });
-                                setTimeout(function () {
-                                    done = true;
-                                }, 5);
-                                runs(function () {
+                                return Promise.resolve().then(function () {
                                     expect(mockActionCapability.perform)
                                         .not.toHaveBeenCalled();
                                 });
@@ -165,12 +152,12 @@ define([
 
                     describe(caseName, function () {
                         beforeEach(function () {
-                            mockEditor.isEditContextRoot.andReturn(isEditRoot);
+                            mockEditor.isEditContextRoot.and.returnValue(isEditRoot);
                         });
 
                         describe("when navigation changes", function () {
                             beforeEach(function () {
-                                mockNavigationService.addListener.mostRecentCall
+                                mockNavigationService.addListener.calls.mostRecent()
                                     .args[0](mockDomainObject);
                             });
                             itNavigatesAsExpected();
@@ -178,7 +165,7 @@ define([
 
                         describe("when mutation occurs", function () {
                             beforeEach(function () {
-                                mockMutationTopic.listen.mostRecentCall
+                                mockMutationTopic.listen.calls.mostRecent()
                                     .args[0](mockParentObject);
                             });
 

platform/commonUI/browse/test/windowing/WindowTitlerSpec.js

@@ -49,8 +49,8 @@ define(
                 );
                 mockDocument = [{}];
 
-                mockDomainObject.getModel.andReturn({ name: 'Test name' });
-                mockNavigationService.getNavigation.andReturn(mockDomainObject);
+                mockDomainObject.getModel.and.returnValue({ name: 'Test name' });
+                mockNavigationService.getNavigation.and.returnValue(mockDomainObject);
 
                 titler = new WindowTitler(
                     mockNavigationService,
@@ -64,12 +64,12 @@ define(
                     jasmine.any(Function),
                     jasmine.any(Function)
                 );
-                expect(mockRootScope.$watch.mostRecentCall.args[0]())
+                expect(mockRootScope.$watch.calls.mostRecent().args[0]())
                     .toEqual('Test name');
             });
 
             it("sets the title to the name of the navigated object", function () {
-                mockRootScope.$watch.mostRecentCall.args[1]("Some name");
+                mockRootScope.$watch.calls.mostRecent().args[1]("Some name");
                 expect(mockDocument[0].title).toEqual("Some name");
             });
 

platform/commonUI/dialog/res/templates/message.html

@@ -4,7 +4,10 @@
         <div class="top-bar">
             <div class="title">{{ngModel.title}}</div>
         </div>
-        <div class="hint" ng-hide="ngModel.hint === undefined">{{ngModel.hint}}</div>
+        <div class="hint" ng-hide="ngModel.hint === undefined">
+            {{ngModel.hint}}
+            <span ng-if="ngModel.timestamp !== undefined">[{{ngModel.timestamp}}]</span>
+        </div>
         <div class="message-body">
             <div class="message-action">
                 {{ngModel.actionText}}

platform/commonUI/dialog/test/DialogServiceSpec.js

@@ -63,12 +63,12 @@ define(
                   ["find"]
                 );
                 mockBody = jasmine.createSpyObj('body', ['on', 'off']);
-                mockDocument.find.andReturn(mockBody);
+                mockDocument.find.and.returnValue(mockBody);
 
                 mockDeferred.promise = "mock promise";
 
-                mockQ.defer.andReturn(mockDeferred);
-                mockOverlayService.createOverlay.andReturn(mockOverlay);
+                mockQ.defer.and.returnValue(mockDeferred);
+                mockOverlayService.createOverlay.and.returnValue(mockOverlay);
 
                 dialogService = new DialogService(
                     mockOverlayService,
@@ -85,7 +85,7 @@ define(
 
             it("allows user input to be canceled", function () {
                 dialogService.getUserInput({}, { someKey: "some value" });
-                mockOverlayService.createOverlay.mostRecentCall.args[1].cancel();
+                mockOverlayService.createOverlay.calls.mostRecent().args[1].cancel();
                 expect(mockDeferred.reject).toHaveBeenCalled();
                 expect(mockDeferred.resolve).not.toHaveBeenCalled();
             });
@@ -93,7 +93,7 @@ define(
             it("passes back the result of user input when confirmed", function () {
                 var value = { someKey: 42 };
                 dialogService.getUserInput({}, value);
-                mockOverlayService.createOverlay.mostRecentCall.args[1].confirm();
+                mockOverlayService.createOverlay.calls.mostRecent().args[1].confirm();
                 expect(mockDeferred.reject).not.toHaveBeenCalled();
                 expect(mockDeferred.resolve).toHaveBeenCalledWith(value);
             });
@@ -109,7 +109,7 @@ define(
             it("can show multiple dialogs if prior ones are dismissed", function () {
                 dialogService.getUserInput({}, {});
                 expect(mockLog.warn).not.toHaveBeenCalled();
-                mockOverlayService.createOverlay.mostRecentCall.args[1].confirm();
+                mockOverlayService.createOverlay.calls.mostRecent().args[1].confirm();
                 dialogService.getUserInput({}, {});
                 expect(mockLog.warn).not.toHaveBeenCalled();
                 expect(mockDeferred.reject).not.toHaveBeenCalled();
@@ -148,13 +148,13 @@ define(
 
             it("destroys the event listener when the dialog is cancelled", function () {
                 dialogService.getUserInput({}, {});
-                mockOverlayService.createOverlay.mostRecentCall.args[1].cancel();
+                mockOverlayService.createOverlay.calls.mostRecent().args[1].cancel();
                 expect(mockBody.off).toHaveBeenCalledWith("keydown", jasmine.any(Function));
             });
 
             it("cancels the dialog when an escape keydown event is triggered", function () {
                 dialogService.getUserInput({}, {});
-                mockBody.on.mostRecentCall.args[1]({
+                mockBody.on.calls.mostRecent().args[1]({
                     keyCode: 27
                 });
                 expect(mockDeferred.reject).toHaveBeenCalled();
@@ -163,7 +163,7 @@ define(
 
             it("ignores non escape keydown events", function () {
                 dialogService.getUserInput({}, {});
-                mockBody.on.mostRecentCall.args[1]({
+                mockBody.on.calls.mostRecent().args[1]({
                     keyCode: 13
                 });
                 expect(mockDeferred.reject).not.toHaveBeenCalled();
@@ -197,7 +197,7 @@ define(
                         "overlay",
                         ["dismiss"]
                     );
-                    mockOverlayService.createOverlay.andReturn(secondMockOverlay);
+                    mockOverlayService.createOverlay.and.returnValue(secondMockOverlay);
                     secondDialogHandle = dialogService.showBlockingMessage(dialogModel);
 
                     //Dismiss the first dialog. It should only dismiss if it

platform/commonUI/dialog/test/OverlayServiceSpec.js

@@ -46,10 +46,10 @@ define(
                 mockElement = jasmine.createSpyObj("element", ["remove"]);
                 mockScope = jasmine.createSpyObj("scope", ["$destroy"]);
 
-                mockDocument.find.andReturn(mockBody);
-                mockCompile.andReturn(mockTemplate);
-                mockRootScope.$new.andReturn(mockScope);
-                mockTemplate.andReturn(mockElement);
+                mockDocument.find.and.returnValue(mockBody);
+                mockCompile.and.returnValue(mockTemplate);
+                mockRootScope.$new.and.returnValue(mockScope);
+                mockTemplate.and.returnValue(mockElement);
 
                 overlayService = new OverlayService(
                     mockDocument,
@@ -61,7 +61,7 @@ define(
             it("prepends an mct-include to create overlays", function () {
                 overlayService.createOverlay("test", {});
                 expect(mockCompile).toHaveBeenCalled();
-                expect(mockCompile.mostRecentCall.args[0].indexOf("mct-include"))
+                expect(mockCompile.calls.mostRecent().args[0].indexOf("mct-include"))
                     .not.toEqual(-1);
             });
 

platform/commonUI/edit/bundle.js

@@ -39,7 +39,6 @@ define([
     "./src/policies/EditableMovePolicy",
     "./src/policies/EditContextualActionPolicy",
     "./src/representers/EditRepresenter",
-    "./src/representers/EditToolbarRepresenter",
     "./src/capabilities/EditorCapability",
     "./src/capabilities/TransactionCapabilityDecorator",
     "./src/services/TransactionManager",
@@ -78,7 +77,6 @@ define([
     EditableMovePolicy,
     EditContextualActionPolicy,
     EditRepresenter,
-    EditToolbarRepresenter,
     EditorCapability,
     TransactionCapabilityDecorator,
     TransactionManager,
@@ -381,12 +379,6 @@ define([
                     "depends": [
                         "$log"
                     ]
-                },
-                {
-                    "implementation": EditToolbarRepresenter,
-                    "depends": [
-                        "openmct"
-                    ]
                 }
             ],
             "constants": [
@@ -424,6 +416,17 @@ define([
                         "transactionService"
                     ]
                 }
+            ],
+            "runs": [
+                {
+                    depends: [
+                        "toolbars[]",
+                        "openmct"
+                    ],
+                    implementation: function (toolbars, openmct) {
+                        toolbars.forEach(openmct.toolbars.addProvider, openmct.toolbars);
+                    }
+                }
             ]
         }
     });

platform/commonUI/edit/res/templates/edit-object.html

@@ -24,7 +24,8 @@
         <div class="items-select left flex-elem l-flex-row grows">
             <mct-representation key="'back-arrow'"
                                 mct-object="domainObject"
-                                class="flex-elem l-back"></mct-representation>
+                                class="flex-elem l-back">
+            </mct-representation>
             <mct-representation key="'object-header'"
                                 mct-object="domainObject"
                                 class="l-flex-row flex-elem grows object-header">
@@ -48,8 +49,8 @@
             <!-- Toolbar and Save/Cancel buttons -->
             <div class="l-edit-controls flex-elem l-flex-row flex-align-end">
                 <mct-toolbar name="mctToolbar"
-                             structure="toolbar.structure"
-                             ng-model="toolbar.state"
+                             structure="editToolbar.structure"
+                             ng-model="editToolbar.state"
                              class="flex-elem grows">
                 </mct-toolbar>
                 <mct-representation key="'edit-action-buttons'"
@@ -61,7 +62,6 @@
             <mct-representation key="representation.selected.key"
                                 mct-object="representation.selected.key && domainObject"
                                 class="abs flex-elem grows object-holder-main scroll"
-                                toolbar="toolbar"
                                 mct-selectable="{
                                     item: domainObject.useCapability('adapter'),
                                     oldItem: domainObject

platform/commonUI/edit/res/templates/elements.html

@@ -24,7 +24,7 @@
                  class="flex-elem holder"
                  ng-model="filterBy">
     </mct-include>
-    <div class="flex-elem grows vscroll">
+    <div class="flex-elem grows vscroll scroll-pad">
         <ul class="tree" id="inspector-elements-tree"
             ng-if="composition.length > 0">
             <li ng-repeat="containedObject in composition | filter:searchElements">

platform/commonUI/edit/src/representers/EditToolbar.js

@@ -20,192 +20,110 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 define(
-    [],
-    function () {
-
-        // Utility functions for reducing truth arrays
-        function and(a, b) {
-            return a && b;
-        }
-        function or(a, b) {
-            return a || b;
-        }
-
+    [
+        '../../../../../src/api/objects/object-utils',
+        'lodash'
+    ],
+    function (
+        objectUtils,
+        _
+    ) {
 
         /**
          * Provides initial structure and state (as suitable for provision
-         * to the `mct-toolbar` directive) for a view's tool bar, based on
-         * that view's declaration of what belongs in its tool bar and on
+         * to the `mct-toolbar` directive) for a view's toolbar, based on
+         * that view's declaration of what belongs in its toolbar and on
          * the current selection.
          *
-         * @param structure toolbar structure, as provided by view definition
-         * @param {Function} commit callback to invoke after changes
+         * @param $scope the Angular scope
+         * @param {Object} openmct the openmct object
+         * @param structure the toolbar structure
          * @memberof platform/commonUI/edit
          * @constructor
          */
-        function EditToolbar(structure, commit) {
+        function EditToolbar($scope, openmct, structure) {
+            this.toolbarStructure = [];
+            this.properties = [];
+            this.toolbarState = [];
+            this.openmct = openmct;
+            this.domainObjectsById = {};
+            this.unobserveObjects = [];
+            this.stateTracker = [];
+
+            $scope.$watchCollection(this.getState.bind(this), this.handleStateChanges.bind(this));
+            $scope.$on("$destroy", this.destroy.bind(this));
+
+            this.updateToolbar(structure);
+            this.registerListeners(structure);
+        }
+
+        /**
+         * Updates the toolbar with a new structure.
+         *
+         * @param {Array} structure the toolbar structure
+         */
+        EditToolbar.prototype.updateToolbar = function (structure) {
             var self = this;
 
-            // Generate a new key for an item's property
-            function addKey(property) {
-                self.properties.push(property);
+            function addKey(item) {
+                self.stateTracker.push({
+                    id: objectUtils.makeKeyString(item.domainObject.identifier),
+                    domainObject: item.domainObject,
+                    property: item.property
+                });
+                self.properties.push(item.property);
+
                 return self.properties.length - 1; // Return index of property
             }
 
-            // Invoke all functions in selections with the given name
-            function invoke(method, value) {
-                if (method) {
-                    // Make the change in the selection
-                    self.selection.forEach(function (selected) {
-                        if (typeof selected[method] === 'function') {
-                            selected[method](value);
-                        }
-                    });
-                    // ...and commit!
-                    commit();
-                }
-            }
-
-            // Prepare a toolbar item based on current selection
             function convertItem(item) {
                 var converted = Object.create(item || {});
+
                 if (item.property) {
-                    converted.key = addKey(item.property);
+                    converted.key = addKey(item);
                 }
+
                 if (item.method) {
-                    converted.click = function (v) {
-                        invoke(item.method, v);
+                    converted.click = function (value) {
+                        item.method(value);
                     };
                 }
+
                 return converted;
             }
 
-            // Prepare a toolbar section
-            function convertSection(section) {
-                var converted = Object.create(section || {});
-                converted.items =
-                    ((section || {}).items || [])
-                            .map(convertItem);
-                return converted;
-            }
-
-            this.toolbarState = [];
-            this.selection = undefined;
-            this.properties = [];
-            this.toolbarStructure = Object.create(structure || {});
-            this.toolbarStructure.sections =
-                ((structure || {}).sections || []).map(convertSection);
-        }
-
-        // Check if all elements of the selection which have this
-        // property have the same value for this property.
-        EditToolbar.prototype.isConsistent = function (property) {
-            var self = this,
-                consistent = true,
-                observed = false,
-                state;
-
-            // Check if a given element of the selection is consistent
-            // with previously-observed elements for this property.
-            function checkConsistency(selected) {
-                var next;
-                // Ignore selections which don't have this property
-                if (selected[property] !== undefined) {
-                    // Look up state of this element in the selection
-                    next = self.lookupState(property, selected);
-                    // Detect inconsistency
-                    if (observed) {
-                        consistent = consistent && (next === state);
-                    }
-                    // Track state for next iteration
-                    state = next;
-                    observed = true;
-                }
-            }
-
-            // Iterate through selections
-            self.selection.forEach(checkConsistency);
-
-            return consistent;
-        };
-
-        // Used to filter out items which are applicable (or not)
-        // to the current selection.
-        EditToolbar.prototype.isApplicable = function (item) {
-            var property = (item || {}).property,
-                method = (item || {}).method,
-                exclusive = !!(item || {}).exclusive;
-
-            // Check if a selected item defines this property
-            function hasProperty(selected) {
-                return (property && (selected[property] !== undefined)) ||
-                    (method && (typeof selected[method] === 'function'));
-            }
-
-            return this.selection.map(hasProperty).reduce(
-                    exclusive ? and : or,
-                    exclusive
-                ) && this.isConsistent(property);
-        };
-
-
-        // Look up the current value associated with a property
-        EditToolbar.prototype.lookupState = function (property, selected) {
-            var value = selected[property];
-            return (typeof value === 'function') ? value() : value;
-        };
-
-        /**
-         * Set the current selection. Visibility of sections
-         * and items in the toolbar will be updated to match this.
-         * @param {Array} s the new selection
-         */
-        EditToolbar.prototype.setSelection = function (s) {
-            var self = this;
-
-            // Show/hide controls in this section per applicability
-            function refreshSectionApplicability(section) {
-                var count = 0;
-                // Show/hide each item
-                (section.items || []).forEach(function (item) {
-                    item.hidden = !self.isApplicable(item);
-                    count += item.hidden ? 0 : 1;
-                });
-                // Hide this section if there are no applicable items
-                section.hidden = !count;
-            }
-
             // Get initial value for a given property
             function initializeState(property) {
                 var result;
-                // Look through all selections for this property;
-                // values should all match by the time we perform
-                // this lookup anyway.
-                self.selection.forEach(function (selected) {
-                    result = (selected[property] !== undefined) ?
-                        self.lookupState(property, selected) :
-                        result;
+                structure.forEach(function (item) {
+                    if (item.property === property) {
+                        result = _.get(item.domainObject, item.property);
+                    }
                 });
+
                 return result;
             }
 
-            this.selection = s;
-            this.toolbarStructure.sections.forEach(refreshSectionApplicability);
+            // Tracks the domain object and property for every element in the state array
+            this.stateTracker = [];
+            this.toolbarStructure = structure.map(convertItem);
             this.toolbarState = this.properties.map(initializeState);
         };
 
         /**
-         * Get the structure of the toolbar, as appropriate to
+         * Gets the structure of the toolbar, as appropriate to
          * pass to `mct-toolbar`.
-         * @returns the toolbar structure
+         *
+         * @returns {Array} the toolbar structure
          */
         EditToolbar.prototype.getStructure = function () {
             return this.toolbarStructure;
         };
 
         /**
-         * Get the current state of the toolbar, as appropriate
+         * Gets the current state of the toolbar, as appropriate
          * to two-way bind to the state handled by `mct-toolbar`.
+         *
          * @returns {Array} state of the toolbar
          */
         EditToolbar.prototype.getState = function () {
@@ -213,48 +131,124 @@ define(
         };
 
         /**
-         * Update state within the current selection.
+         * Mutates the domain object's property with a new value.
+         *
+         * @param {Object} dominObject the domain object
+         * @param {string} property the domain object's property to update
+         * @param value the property's new value
+         */
+        EditToolbar.prototype.updateDomainObject = function (domainObject, property, value) {
+            this.openmct.objects.mutate(domainObject, property, value);
+        };
+
+        /**
+         * Updates state with the new value.
+         *
          * @param {number} index the index of the corresponding
          *        element in the state array
-         * @param value the new value to convey to the selection
+         * @param value the new value to update the state array with
          */
         EditToolbar.prototype.updateState = function (index, value) {
+            this.toolbarState[index] = value;
+        };
+
+        /**
+         * Register listeners for domain objects to watch for updates.
+         *
+         * @param {Array} the toolbar structure
+         */
+        EditToolbar.prototype.registerListeners = function (structure) {
             var self = this;
 
-            // Update value for this property in all elements of the
-            // selection which have this property.
-            function updateProperties(property, val) {
-                var changed = false;
-
-                // Update property in a selected element
-                function updateProperty(selected) {
-                    // Ignore selected elements which don't have this property
-                    if (selected[property] !== undefined) {
-                        // Check if this is a setter, or just assignable
-                        if (typeof selected[property] === 'function') {
-                            changed =
-                                changed || (selected[property]() !== val);
-                            selected[property](val);
-                        } else {
-                            changed =
-                                changed || (selected[property] !== val);
-                            selected[property] = val;
-                        }
-                    }
-                }
-
-                // Update property in all selected elements
-                self.selection.forEach(updateProperty);
-
-                // Return whether or not anything changed
-                return changed;
+            function observeObject(domainObject, id) {
+                var unobserveObject = self.openmct.objects.observe(domainObject, '*', function (newObject) {
+                    self.domainObjectsById[id].newObject = JSON.parse(JSON.stringify(newObject));
+                    self.scheduleStateUpdate();
+                });
+                self.unobserveObjects.push(unobserveObject);
             }
 
-            return updateProperties(this.properties[index], value);
+            structure.forEach(function (item) {
+                var domainObject = item.domainObject;
+                var id = objectUtils.makeKeyString(domainObject.identifier);
+
+                if (!self.domainObjectsById[id]) {
+                    self.domainObjectsById[id] = {
+                        domainObject: domainObject,
+                        properties: []
+                    };
+                    observeObject(domainObject, id);
+                }
+
+                self.domainObjectsById[id].properties.push(item.property);
+            });
+        };
+
+        /**
+         * Delays updating the state.
+         */
+        EditToolbar.prototype.scheduleStateUpdate = function () {
+            if (this.stateUpdateScheduled) {
+                return;
+            }
+
+            this.stateUpdateScheduled = true;
+            setTimeout(this.updateStateAfterMutation.bind(this));
+        };
+
+        EditToolbar.prototype.updateStateAfterMutation = function () {
+            this.stateTracker.forEach(function (state, index) {
+                if (!this.domainObjectsById[state.id].newObject) {
+                    return;
+                }
+
+                var domainObject = this.domainObjectsById[state.id].domainObject;
+                var newObject = this.domainObjectsById[state.id].newObject;
+                var currentValue = _.get(domainObject, state.property);
+                var newValue = _.get(newObject, state.property);
+
+                state.domainObject = newObject;
+
+                if (currentValue !== newValue) {
+                    this.updateState(index, newValue);
+                }
+            }, this);
+
+            Object.values(this.domainObjectsById).forEach(function (tracker) {
+                if (tracker.newObject) {
+                    tracker.domainObject = tracker.newObject;
+                }
+                delete tracker.newObject;
+            });
+            this.stateUpdateScheduled = false;
+        };
+
+        /**
+         * Removes the listeners.
+         */
+        EditToolbar.prototype.deregisterListeners = function () {
+            this.unobserveObjects.forEach(function (unobserveObject) {
+                unobserveObject();
+            });
+            this.unobserveObjects = [];
+        };
+
+        EditToolbar.prototype.handleStateChanges = function (state) {
+            (state || []).map(function (newValue, index) {
+                var domainObject = this.stateTracker[index].domainObject;
+                var property = this.stateTracker[index].property;
+                var currentValue = _.get(domainObject, property);
+
+                if (currentValue !== newValue) {
+                    this.updateDomainObject(domainObject, property, newValue);
+                }
+            }, this);
+        };
+
+        EditToolbar.prototype.destroy = function () {
+            this.deregisterListeners();
         };
 
         return EditToolbar;
     }
 );
-
-

platform/commonUI/edit/src/representers/EditToolbarRepresenter.js

@@ -1,154 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define(
-    ['./EditToolbar', './EditToolbarSelection'],
-    function (EditToolbar, EditToolbarSelection) {
-
-        // No operation
-        var NOOP_REPRESENTER = {
-            represent: function () {},
-            destroy: function () {}
-        };
-
-        /**
-         * The EditToolbarRepresenter populates the toolbar in Edit mode
-         * based on a view's definition.
-         * @param {Scope} scope the Angular scope of the representation
-         * @memberof platform/commonUI/edit
-         * @constructor
-         * @implements {Representer}
-         */
-        function EditToolbarRepresenter(openmct, scope, element, attrs) {
-            var self = this;
-
-            // Mark changes as ready to persist
-            function commit(message) {
-                if (scope.commit) {
-                    scope.commit(message);
-                }
-            }
-
-            // Handle changes to the current selection
-            function updateSelection(selection) {
-                // Only update if there is a toolbar to update
-                if (self.toolbar) {
-                    // Make sure selection is array-like
-                    selection = Array.isArray(selection) ?
-                            selection :
-                            (selection ? [selection] : []);
-
-                    // Update the toolbar's selection
-                    self.toolbar.setSelection(selection);
-
-                    // ...and expose its structure/state
-                    self.toolbarObject.structure =
-                        self.toolbar.getStructure();
-                    self.toolbarObject.state =
-                        self.toolbar.getState();
-                }
-            }
-
-            // Get state (to watch it)
-            function getState() {
-                return self.toolbarObject.state;
-            }
-
-            // Update selection models to match changed toolbar state
-            function updateState(state) {
-                // Update underlying state based on toolbar changes
-                var changed = (state || []).map(function (value, index) {
-                    return self.toolbar.updateState(index, value);
-                }).reduce(function (a, b) {
-                    return a || b;
-                }, false);
-
-                // Only commit if something actually changed
-                if (changed) {
-                    // Commit the changes.
-                    commit("Changes from toolbar.");
-                }
-            }
-            this.clearExposedToolbar = function () {
-                // Clear exposed toolbar state (if any)
-                if (attrs.toolbar) {
-                    delete scope.$parent[attrs.toolbar];
-                }
-            };
-            this.exposeToolbar = function () {
-                scope.$parent[self.attrs.toolbar] = self.toolbarObject;
-            };
-
-            this.commit = commit;
-            this.attrs = attrs;
-            this.updateSelection = updateSelection;
-            this.toolbar = undefined;
-            this.toolbarObject = {};
-            this.openmct = openmct;
-            this.scope = scope;
-
-            // If this representation exposes a toolbar, set up watches
-            // to synchronize with it.
-            if (attrs && attrs.toolbar) {
-                // Detect and handle changes to state from the toolbar
-                scope.$watchCollection(getState, updateState);
-                // Watch for changes in the current selection state
-                scope.$watchCollection("selection.all()", updateSelection);
-                // Expose toolbar state under that name
-                scope.$parent[attrs.toolbar] = this.toolbarObject;
-            } else {
-                // No toolbar declared, so do nothing.
-                return NOOP_REPRESENTER;
-            }
-
-        }
-
-        // Represent a domain object using this definition
-        EditToolbarRepresenter.prototype.represent = function (representation) {
-            // Get the newest toolbar definition from the view
-            var definition = (representation || {}).toolbar || {};
-
-            // If we have been asked to expose toolbar state...
-            if (this.attrs.toolbar) {
-                // Initialize toolbar object
-                this.toolbar = new EditToolbar(definition, this.commit);
-                // Ensure toolbar state is exposed
-                this.exposeToolbar();
-            }
-
-            // Add toolbar selection to scope.
-            this.scope.selection = new EditToolbarSelection(
-                this.scope,
-                this.openmct
-            );
-            // Initialize toolbar to current selection
-            this.updateSelection(this.scope.selection.all());
-        };
-
-        // Destroy; remove toolbar object from parent scope
-        EditToolbarRepresenter.prototype.destroy = function () {
-            this.clearExposedToolbar();
-        };
-
-        return EditToolbarRepresenter;
-    }
-);

platform/commonUI/edit/src/representers/EditToolbarSelection.js

@@ -1,157 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define(
-    [],
-    function () {
-
-        /**
-         * Tracks selection state for editable views. Selection is
-         * implemented such that (from the toolbar's perspective)
-         * up to two objects can be "selected" at any given time:
-         *
-         * * The view proxy (see the `proxy` method), which provides
-         *   an interface for interacting with the view itself (e.g.
-         *   for buttons like "Add")
-         * * The selection, for single selected elements within the
-         *   view.
-         *
-         * @memberof platform/commonUI/edit
-         * @constructor
-         */
-        function EditToolbarSelection($scope, openmct) {
-            this.selection = [{}];
-            this.selecting = false;
-            this.selectedObj = undefined;
-            this.openmct = openmct;
-            var self = this;
-
-            function setSelection(selection) {
-                var selected = selection[0];
-
-                if (selected && selected.context.toolbar) {
-                    self.select(selected.context.toolbar);
-                } else {
-                    self.deselect();
-                }
-
-                if (selected && selected.context.viewProxy) {
-                    self.proxy(selected.context.viewProxy);
-                }
-
-                setTimeout(function () {
-                    $scope.$apply();
-                });
-            }
-
-            $scope.$on("$destroy", function () {
-                self.openmct.selection.off('change', setSelection);
-            });
-
-            this.openmct.selection.on('change', setSelection);
-            setSelection(this.openmct.selection.get());
-        }
-
-        /**
-         * Check if an object is currently selected.
-         * @param {*} obj the object to check for selection
-         * @returns {boolean} true if selected, otherwise false
-         */
-        EditToolbarSelection.prototype.selected = function (obj) {
-            return (obj === this.selectedObj) || (obj === this.selection[0]);
-        };
-
-        /**
-         * Select an object.
-         * @param obj the object to select
-         * @returns {boolean} true if selection changed
-         */
-        EditToolbarSelection.prototype.select = function (obj) {
-            // Proxy is always selected
-            if (obj === this.selection[0]) {
-                return false;
-            }
-
-            // Clear any existing selection
-            this.deselect();
-
-            // Note the current selection state
-            this.selectedObj = obj;
-            this.selecting = true;
-
-            // Add the selection
-            this.selection.push(obj);
-        };
-
-        /**
-         * Clear the current selection.
-         * @returns {boolean} true if selection changed
-         */
-        EditToolbarSelection.prototype.deselect = function () {
-            // Nothing to do if we don't have a selected object
-            if (this.selecting) {
-                // Clear state tracking
-                this.selecting = false;
-                this.selectedObj = undefined;
-
-                // Remove the selection
-                this.selection.pop();
-
-                return true;
-            }
-            return false;
-        };
-
-        /**
-         * Get the currently-selected object.
-         * @returns the currently selected object
-         */
-        EditToolbarSelection.prototype.get = function () {
-            return this.selectedObj;
-        };
-
-        /**
-         * Get/set the view proxy (for toolbar actions taken upon
-         * the view itself.)
-         * @param [proxy] the view proxy (if setting)
-         * @returns the current view proxy
-         */
-        EditToolbarSelection.prototype.proxy = function (p) {
-            if (arguments.length > 0) {
-                this.selection[0] = p;
-            }
-            return this.selection[0];
-        };
-
-        /**
-         * Get an array containing all selections, including the
-         * selection proxy. It is generally not advisable to
-         * mutate this array directly.
-         * @returns {Array} all selections
-         */
-        EditToolbarSelection.prototype.all = function () {
-            return this.selection;
-        };
-
-        return EditToolbarSelection;
-    }
-);

platform/commonUI/edit/test/actions/CancelActionSpec.js

@@ -49,7 +49,7 @@ define(
                         "getModel"
                     ]
                 );
-                mockDomainObject.getModel.andReturn({});
+                mockDomainObject.getModel.and.returnValue({});
 
                 mockParentObject = jasmine.createSpyObj(
                     "parentObject",
@@ -57,7 +57,7 @@ define(
                         "getCapability"
                     ]
                 );
-                mockParentObject.getCapability.andCallFake(function (name) {
+                mockParentObject.getCapability.and.callFake(function (name) {
                     return parentCapabilities[name];
                 });
 
@@ -77,14 +77,14 @@ define(
                         "getOriginal"
                     ]
                 );
-                capabilities.location.getOriginal.andReturn(mockPromise(mockDomainObject));
+                capabilities.location.getOriginal.and.returnValue(mockPromise(mockDomainObject));
                 capabilities.context = jasmine.createSpyObj(
                     "contextCapability",
                     [
                         "getParent"
                     ]
                 );
-                capabilities.context.getParent.andReturn(mockParentObject);
+                capabilities.context.getParent.and.returnValue(mockParentObject);
 
                 parentCapabilities.action = jasmine.createSpyObj(
                     "actionCapability",
@@ -97,37 +97,37 @@ define(
                     domainObject: mockDomainObject
                 };
 
-                mockDomainObject.getCapability.andCallFake(function (name) {
+                mockDomainObject.getCapability.and.callFake(function (name) {
                     return capabilities[name];
                 });
 
-                mockDomainObject.hasCapability.andCallFake(function (name) {
+                mockDomainObject.hasCapability.and.callFake(function (name) {
                     return !!capabilities[name];
                 });
 
-                capabilities.editor.finish.andReturn(mockPromise(true));
+                capabilities.editor.finish.and.returnValue(mockPromise(true));
 
                 action = new CancelAction(actionContext);
 
             });
 
             it("only applies to domain object that is being edited", function () {
-                capabilities.editor.isEditContextRoot.andReturn(true);
+                capabilities.editor.isEditContextRoot.and.returnValue(true);
                 expect(CancelAction.appliesTo(actionContext)).toBeTruthy();
                 expect(mockDomainObject.hasCapability).toHaveBeenCalledWith("editor");
 
-                capabilities.editor.isEditContextRoot.andReturn(false);
+                capabilities.editor.isEditContextRoot.and.returnValue(false);
                 expect(CancelAction.appliesTo(actionContext)).toBeFalsy();
 
-                mockDomainObject.hasCapability.andReturn(false);
+                mockDomainObject.hasCapability.and.returnValue(false);
                 expect(CancelAction.appliesTo(actionContext)).toBeFalsy();
             });
 
             it("invokes the editor capability's cancel functionality when" +
                 " performed", function () {
-                mockDomainObject.getModel.andReturn({persisted: 1});
+                mockDomainObject.getModel.and.returnValue({persisted: 1});
                 //Return true from navigate action
-                capabilities.action.perform.andReturn(mockPromise(true));
+                capabilities.action.perform.and.returnValue(mockPromise(true));
                 action.perform();
 
                 // Should have called finish
@@ -138,15 +138,15 @@ define(
             });
 
             it("navigates to object if existing using navigate action", function () {
-                mockDomainObject.getModel.andReturn({persisted: 1});
+                mockDomainObject.getModel.and.returnValue({persisted: 1});
                 //Return true from navigate action
-                capabilities.action.perform.andReturn(mockPromise(true));
+                capabilities.action.perform.and.returnValue(mockPromise(true));
                 action.perform();
                 expect(capabilities.action.perform).toHaveBeenCalledWith("navigate");
             });
 
             it("navigates to parent if new using navigate action", function () {
-                mockDomainObject.getModel.andReturn({persisted: undefined});
+                mockDomainObject.getModel.and.returnValue({persisted: undefined});
                 action.perform();
                 expect(parentCapabilities.action.perform).toHaveBeenCalledWith("navigate");
             });

platform/commonUI/edit/test/actions/EditActionSpec.js

@@ -66,11 +66,11 @@ define(
                     editor: mockEditor
                 };
 
-                mockDomainObject.getCapability.andCallFake(function (name) {
+                mockDomainObject.getCapability.and.callFake(function (name) {
                     return capabilities[name];
                 });
-                mockDomainObject.hasCapability.andReturn(true);
-                mockType.hasFeature.andReturn(true);
+                mockDomainObject.hasCapability.and.returnValue(true);
+                mockType.hasFeature.and.returnValue(true);
 
                 actionContext = { domainObject: mockDomainObject };
 
@@ -92,9 +92,9 @@ define(
             });
 
             it("is only applicable to objects not already in edit mode", function () {
-                mockEditor.isEditContextRoot.andReturn(false);
+                mockEditor.isEditContextRoot.and.returnValue(false);
                 expect(EditAction.appliesTo(actionContext)).toBe(true);
-                mockEditor.isEditContextRoot.andReturn(true);
+                mockEditor.isEditContextRoot.and.returnValue(true);
                 expect(EditAction.appliesTo(actionContext)).toBe(false);
             });
 

platform/commonUI/edit/test/actions/EditAndComposeActionSpec.js

@@ -71,14 +71,14 @@ define(
                 mockActionCapability = jasmine.createSpyObj("actionCapability", ["getActions"]);
                 mockEditAction = jasmine.createSpyObj("editAction", ["perform"]);
 
-                mockDomainObject.getId.andReturn("test");
-                mockDomainObject.getCapability.andReturn(mockContext);
-                mockContext.getParent.andReturn(mockParent);
-                mockType.hasFeature.andReturn(true);
-                mockType.getKey.andReturn("layout");
-                mockComposition.invoke.andReturn(mockPromise(true));
-                mockComposition.add.andReturn(mockPromise(true));
-                mockActionCapability.getActions.andReturn([]);
+                mockDomainObject.getId.and.returnValue("test");
+                mockDomainObject.getCapability.and.returnValue(mockContext);
+                mockContext.getParent.and.returnValue(mockParent);
+                mockType.hasFeature.and.returnValue(true);
+                mockType.getKey.and.returnValue("layout");
+                mockComposition.invoke.and.returnValue(mockPromise(true));
+                mockComposition.add.and.returnValue(mockPromise(true));
+                mockActionCapability.getActions.and.returnValue([]);
 
                 capabilities = {
                     composition: mockComposition,
@@ -105,14 +105,14 @@ define(
             });
 
             it("enables edit mode for objects that have an edit action", function () {
-                mockActionCapability.getActions.andReturn([mockEditAction]);
+                mockActionCapability.getActions.and.returnValue([mockEditAction]);
                 action.perform();
                 expect(mockEditAction.perform).toHaveBeenCalled();
             });
 
             it("Does not enable edit mode for objects that do not have an" +
                 " edit action", function () {
-                mockActionCapability.getActions.andReturn([]);
+                mockActionCapability.getActions.and.returnValue([]);
                 action.perform();
                 expect(mockEditAction.perform).not.toHaveBeenCalled();
                 expect(mockComposition.add)

platform/commonUI/edit/test/actions/PropertiesActionSpec.js

@@ -71,8 +71,8 @@ define(
                     }
                 };
 
-                capabilities.type.hasFeature.andReturn(true);
-                capabilities.mutation.andReturn(true);
+                capabilities.type.hasFeature.and.returnValue(true);
+                capabilities.mutation.and.returnValue(true);
 
                 action = new PropertiesAction(dialogService, context);
             });
@@ -80,7 +80,7 @@ define(
             it("mutates an object when performed", function () {
                 action.perform();
                 expect(capabilities.mutation).toHaveBeenCalled();
-                capabilities.mutation.mostRecentCall.args[0]({});
+                capabilities.mutation.calls.mostRecent().args[0]({});
             });
 
             it("does not muate object upon cancel", function () {

platform/commonUI/edit/test/actions/RemoveActionSpec.js

@@ -95,13 +95,13 @@ define(
                         "removeListener"
                     ]
                 );
-                mockNavigationService.getNavigation.andReturn(mockDomainObject);
+                mockNavigationService.getNavigation.and.returnValue(mockDomainObject);
 
 
-                mockDomainObject.getId.andReturn("test");
-                mockDomainObject.getCapability.andReturn(mockContext);
-                mockContext.getParent.andReturn(mockParent);
-                mockType.hasFeature.andReturn(true);
+                mockDomainObject.getId.and.returnValue("test");
+                mockDomainObject.getCapability.and.returnValue(mockContext);
+                mockContext.getParent.and.returnValue(mockParent);
+                mockType.hasFeature.and.returnValue(true);
 
                 capabilities = {
                     mutation: mockMutation,
@@ -119,7 +119,7 @@ define(
             it("only applies to objects with parents", function () {
                 expect(RemoveAction.appliesTo(actionContext)).toBeTruthy();
 
-                mockContext.getParent.andReturn(undefined);
+                mockContext.getParent.and.returnValue(undefined);
 
                 expect(RemoveAction.appliesTo(actionContext)).toBeFalsy();
 
@@ -136,7 +136,7 @@ define(
             it("changes composition from its mutation function", function () {
                 var mutator, result;
                 action.perform();
-                mutator = mockMutation.invoke.mostRecentCall.args[0];
+                mutator = mockMutation.invoke.calls.mostRecent().args[0];
                 result = mutator(model);
 
                 // Should not have cancelled the mutation
@@ -153,22 +153,22 @@ define(
 
             it("removes parent of object currently navigated to", function () {
                 // Navigates to child object
-                mockNavigationService.getNavigation.andReturn(mockChildObject);
+                mockNavigationService.getNavigation.and.returnValue(mockChildObject);
 
                 // Test is id of object being removed
                 // Child object has different id
-                mockDomainObject.getId.andReturn("test");
-                mockChildObject.getId.andReturn("not test");
+                mockDomainObject.getId.and.returnValue("test");
+                mockChildObject.getId.and.returnValue("not test");
 
                 // Sets context for the child and domainObject
-                mockDomainObject.getCapability.andReturn(mockContext);
-                mockChildObject.getCapability.andReturn(mockChildContext);
+                mockDomainObject.getCapability.and.returnValue(mockContext);
+                mockChildObject.getCapability.and.returnValue(mockChildContext);
 
                 // Parents of child and domainObject are set
-                mockContext.getParent.andReturn(mockParent);
-                mockChildContext.getParent.andReturn(mockDomainObject);
+                mockContext.getParent.and.returnValue(mockParent);
+                mockChildContext.getParent.and.returnValue(mockDomainObject);
 
-                mockType.hasFeature.andReturn(true);
+                mockType.hasFeature.and.returnValue(true);
 
                 action.perform();
 
@@ -178,25 +178,25 @@ define(
 
             it("checks if removing object not in ascendent path (reaches ROOT)", function () {
                 // Navigates to grandchild of ROOT
-                mockNavigationService.getNavigation.andReturn(mockGrandchildObject);
+                mockNavigationService.getNavigation.and.returnValue(mockGrandchildObject);
 
                 // domainObject (grandparent) is set as ROOT, child and grandchild
                 // are set objects not being removed
-                mockDomainObject.getId.andReturn("test 1");
-                mockRootObject.getId.andReturn("ROOT");
-                mockChildObject.getId.andReturn("not test 2");
-                mockGrandchildObject.getId.andReturn("not test 3");
+                mockDomainObject.getId.and.returnValue("test 1");
+                mockRootObject.getId.and.returnValue("ROOT");
+                mockChildObject.getId.and.returnValue("not test 2");
+                mockGrandchildObject.getId.and.returnValue("not test 3");
 
                 // Sets context for the grandchild, child, and domainObject
-                mockRootObject.getCapability.andReturn(mockRootContext);
-                mockChildObject.getCapability.andReturn(mockChildContext);
-                mockGrandchildObject.getCapability.andReturn(mockGrandchildContext);
+                mockRootObject.getCapability.and.returnValue(mockRootContext);
+                mockChildObject.getCapability.and.returnValue(mockChildContext);
+                mockGrandchildObject.getCapability.and.returnValue(mockGrandchildContext);
 
                 // Parents of grandchild and child are set
-                mockChildContext.getParent.andReturn(mockRootObject);
-                mockGrandchildContext.getParent.andReturn(mockChildObject);
+                mockChildContext.getParent.and.returnValue(mockRootObject);
+                mockGrandchildContext.getParent.and.returnValue(mockChildObject);
 
-                mockType.hasFeature.andReturn(true);
+                mockType.hasFeature.and.returnValue(true);
 
                 action.perform();
 

platform/commonUI/edit/test/actions/SaveActionSpec.js

@@ -19,7 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global describe,it,expect,beforeEach,jasmine,waitsFor,runs*/
+/*global describe,it,expect,beforeEach,jasmine*/
 
 define(
     ["../../src/actions/SaveAction"],
@@ -81,13 +81,13 @@ define(
                     ["info", "error"]
                 );
 
-                mockDomainObject.hasCapability.andReturn(true);
-                mockDomainObject.getCapability.andCallFake(function (capability) {
+                mockDomainObject.hasCapability.and.returnValue(true);
+                mockDomainObject.getCapability.and.callFake(function (capability) {
                     return capabilities[capability];
                 });
-                mockDomainObject.getModel.andReturn({persisted: 0});
-                mockEditorCapability.save.andReturn(mockPromise(true));
-                mockEditorCapability.isEditContextRoot.andReturn(true);
+                mockDomainObject.getModel.and.returnValue({persisted: 0});
+                mockEditorCapability.save.and.returnValue(mockPromise(true));
+                mockEditorCapability.isEditContextRoot.and.returnValue(true);
 
                 action = new SaveAction(mockDialogService, mockNotificationService, actionContext);
             });
@@ -96,14 +96,14 @@ define(
                 expect(SaveAction.appliesTo(actionContext)).toBe(true);
                 expect(mockDomainObject.hasCapability).toHaveBeenCalledWith("editor");
 
-                mockDomainObject.hasCapability.andReturn(false);
-                mockDomainObject.getCapability.andReturn(undefined);
+                mockDomainObject.hasCapability.and.returnValue(false);
+                mockDomainObject.getCapability.and.returnValue(undefined);
                 expect(SaveAction.appliesTo(actionContext)).toBe(false);
             });
 
             it("only applies to domain object that has already been persisted",
                 function () {
-                    mockDomainObject.getModel.andReturn({persisted: undefined});
+                    mockDomainObject.getModel.and.returnValue({persisted: undefined});
                     expect(SaveAction.appliesTo(actionContext)).toBe(false);
                 });
 
@@ -118,11 +118,11 @@ define(
 
                 beforeEach(function () {
                     mockDialogHandle = jasmine.createSpyObj("dialogHandle", ["dismiss"]);
-                    mockDialogService.showBlockingMessage.andReturn(mockDialogHandle);
+                    mockDialogService.showBlockingMessage.and.returnValue(mockDialogHandle);
                 });
 
                 it("shows a dialog while saving", function () {
-                    mockEditorCapability.save.andReturn(new Promise(function () {
+                    mockEditorCapability.save.and.returnValue(new Promise(function () {
                     }));
                     action.perform();
                     expect(mockDialogService.showBlockingMessage).toHaveBeenCalled();
@@ -137,12 +137,8 @@ define(
 
                 it("notifies if saving succeeded", function () {
                     var mockCallback = jasmine.createSpy("callback");
-                    mockEditorCapability.save.andReturn(Promise.resolve("success"));
-                    action.perform().then(mockCallback);
-                    waitsFor(function () {
-                        return mockCallback.calls.length > 0;
-                    });
-                    runs(function () {
+                    mockEditorCapability.save.and.returnValue(Promise.resolve());
+                    return action.perform().then(mockCallback).then(function () {
                         expect(mockNotificationService.info).toHaveBeenCalled();
                         expect(mockNotificationService.error).not.toHaveBeenCalled();
                     });
@@ -150,12 +146,8 @@ define(
 
                 it("notifies if saving failed", function () {
                     var mockCallback = jasmine.createSpy("callback");
-                    mockEditorCapability.save.andReturn(Promise.reject("some failure reason"));
-                    action.perform().then(mockCallback);
-                    waitsFor(function () {
-                        return mockCallback.calls.length > 0;
-                    });
-                    runs(function () {
+                    mockEditorCapability.save.and.returnValue(Promise.reject("some failure reason"));
+                    return action.perform().then(mockCallback).then(function () {
                         expect(mockNotificationService.error).toHaveBeenCalled();
                         expect(mockNotificationService.info).not.toHaveBeenCalled();
                     });

platform/commonUI/edit/test/actions/SaveAndStopEditingActionSpec.js

@@ -86,13 +86,13 @@ define(
                     ["info", "error"]
                 );
 
-                mockDomainObject.hasCapability.andReturn(true);
-                mockDomainObject.getCapability.andCallFake(function (capability) {
+                mockDomainObject.hasCapability.and.returnValue(true);
+                mockDomainObject.getCapability.and.callFake(function (capability) {
                     return capabilities[capability];
                 });
-                mockDomainObject.getModel.andReturn({ persisted: 0 });
-                mockEditorCapability.save.andReturn(mockPromise(true));
-                mockEditorCapability.isEditContextRoot.andReturn(true);
+                mockDomainObject.getModel.and.returnValue({ persisted: 0 });
+                mockEditorCapability.save.and.returnValue(mockPromise(true));
+                mockEditorCapability.isEditContextRoot.and.returnValue(true);
 
                 action = new SaveAndStopEditingAction(dialogService, notificationService, actionContext);
             });
@@ -102,18 +102,18 @@ define(
                 expect(SaveAndStopEditingAction.appliesTo(actionContext)).toBe(true);
                 expect(mockDomainObject.hasCapability).toHaveBeenCalledWith("editor");
 
-                mockDomainObject.hasCapability.andReturn(false);
-                mockDomainObject.getCapability.andReturn(undefined);
+                mockDomainObject.hasCapability.and.returnValue(false);
+                mockDomainObject.getCapability.and.returnValue(undefined);
                 expect(SaveAndStopEditingAction.appliesTo(actionContext)).toBe(false);
             });
 
             it("only applies to domain object that has already been persisted", function () {
-                mockDomainObject.getModel.andReturn({ persisted: undefined });
+                mockDomainObject.getModel.and.returnValue({ persisted: undefined });
                 expect(SaveAndStopEditingAction.appliesTo(actionContext)).toBe(false);
             });
 
             it("does not close the editor before completing the save", function () {
-                mockEditorCapability.save.andReturn(new Promise(function () {
+                mockEditorCapability.save.and.returnValue(new Promise(function () {
                 }));
                 action.perform();
                 expect(mockEditorCapability.save).toHaveBeenCalled();

platform/commonUI/edit/test/actions/SaveAsActionSpec.js

@@ -19,7 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global describe,it,expect,beforeEach,jasmine,runs,waitsFor,spyOn*/
+/*global describe,it,expect,beforeEach,jasmine,spyOn*/
 
 define(
     ["../../src/actions/SaveAsAction"],
@@ -63,12 +63,12 @@ define(
                         "getId"
                     ]
                 );
-                mockDomainObject.hasCapability.andReturn(true);
-                mockDomainObject.getCapability.andCallFake(function (capability) {
+                mockDomainObject.hasCapability.and.returnValue(true);
+                mockDomainObject.getCapability.and.callFake(function (capability) {
                     return capabilities[capability];
                 });
-                mockDomainObject.getModel.andReturn({location: 'a', persisted: undefined});
-                mockDomainObject.getId.andReturn(0);
+                mockDomainObject.getModel.and.returnValue({location: 'a', persisted: undefined});
+                mockDomainObject.getId.and.returnValue(0);
 
                 mockClonedObject = jasmine.createSpyObj(
                     "clonedObject",
@@ -76,7 +76,7 @@ define(
                         "getId"
                     ]
                 );
-                mockClonedObject.getId.andReturn(1);
+                mockClonedObject.getId.and.returnValue(1);
 
                 mockParent = jasmine.createSpyObj(
                     "parentObject",
@@ -91,9 +91,9 @@ define(
                     "editor",
                     ["save", "finish", "isEditContextRoot"]
                 );
-                mockEditorCapability.save.andReturn(mockPromise(true));
-                mockEditorCapability.finish.andReturn(mockPromise(true));
-                mockEditorCapability.isEditContextRoot.andReturn(true);
+                mockEditorCapability.save.and.returnValue(mockPromise(true));
+                mockEditorCapability.finish.and.returnValue(mockPromise(true));
+                mockEditorCapability.isEditContextRoot.and.returnValue(true);
                 capabilities.editor = mockEditorCapability;
 
                 mockActionCapability = jasmine.createSpyObj(
@@ -106,7 +106,7 @@ define(
                     "objectService",
                     ["getObjects"]
                 );
-                mockObjectService.getObjects.andReturn(mockPromise({'a': mockParent}));
+                mockObjectService.getObjects.and.returnValue(mockPromise({'a': mockParent}));
 
                 mockDialogService = jasmine.createSpyObj(
                     "dialogService",
@@ -115,7 +115,7 @@ define(
                         "showBlockingMessage"
                     ]
                 );
-                mockDialogService.getUserInput.andReturn(mockPromise(undefined));
+                mockDialogService.getUserInput.and.returnValue(mockPromise(undefined));
 
                 mockCopyService = jasmine.createSpyObj(
                     "copyService",
@@ -123,7 +123,7 @@ define(
                         "perform"
                     ]
                 );
-                mockCopyService.perform.andReturn(mockPromise(mockClonedObject));
+                mockCopyService.perform.and.returnValue(mockPromise(mockClonedObject));
 
                 mockNotificationService = jasmine.createSpyObj(
                     "notificationService",
@@ -146,10 +146,10 @@ define(
                     actionContext);
 
                 spyOn(action, "getObjectService");
-                action.getObjectService.andReturn(mockObjectService);
+                action.getObjectService.and.returnValue(mockObjectService);
 
                 spyOn(action, "createWizard");
-                action.createWizard.andReturn({
+                action.createWizard.and.returnValue({
                     getFormStructure: noop,
                     getInitialFormValue: noop,
                     populateObjectFromInput: function () {
@@ -163,8 +163,8 @@ define(
                 expect(SaveAsAction.appliesTo(actionContext)).toBe(true);
                 expect(mockDomainObject.hasCapability).toHaveBeenCalledWith("editor");
 
-                mockDomainObject.hasCapability.andReturn(false);
-                mockDomainObject.getCapability.andReturn(undefined);
+                mockDomainObject.hasCapability.and.returnValue(false);
+                mockDomainObject.getCapability.and.returnValue(undefined);
                 expect(SaveAsAction.appliesTo(actionContext)).toBe(false);
             });
 
@@ -173,35 +173,27 @@ define(
                 expect(SaveAsAction.appliesTo(actionContext)).toBe(true);
                 expect(mockDomainObject.hasCapability).toHaveBeenCalledWith("editor");
 
-                mockDomainObject.getModel.andReturn({persisted: 0});
+                mockDomainObject.getModel.and.returnValue({persisted: 0});
                 expect(SaveAsAction.appliesTo(actionContext)).toBe(false);
             });
 
             it("uses the editor capability to save the object", function () {
-                mockEditorCapability.save.andReturn(new Promise(function () {}));
-                runs(function () {
-                    action.perform();
-                });
-                waitsFor(function () {
-                    return mockEditorCapability.save.calls.length > 0;
-                }, "perform() should call EditorCapability.save");
-                runs(function () {
-                    expect(mockEditorCapability.finish).not.toHaveBeenCalled();
+                mockEditorCapability.save.and.returnValue(Promise.resolve());
+
+                return action.perform().then(function () {
+                    expect(mockEditorCapability.save).toHaveBeenCalled();
                 });
             });
 
             it("uses the editor capability to finish editing the object", function () {
-                runs(function () {
-                    action.perform();
+                return action.perform().then(function () {
+                    expect(mockEditorCapability.finish.calls.count()).toBeGreaterThan(0);
                 });
-                waitsFor(function () {
-                    return mockEditorCapability.finish.calls.length > 0;
-                }, "perform() should call EditorCapability.finish");
             });
 
             it("returns to browse after save", function () {
                 spyOn(action, "save");
-                action.save.andReturn(mockPromise(mockDomainObject));
+                action.save.and.returnValue(mockPromise(mockDomainObject));
                 action.perform();
                 expect(mockActionCapability.perform).toHaveBeenCalledWith(
                     "navigate"
@@ -218,48 +210,33 @@ define(
 
                 beforeEach(function () {
                     mockDialogHandle = jasmine.createSpyObj("dialogHandle", ["dismiss"]);
-                    mockDialogService.showBlockingMessage.andReturn(mockDialogHandle);
+                    mockDialogService.showBlockingMessage.and.returnValue(mockDialogHandle);
                 });
 
                 it("shows a blocking dialog indicating that saving is in progress", function () {
-                    mockEditorCapability.save.andReturn(new Promise(function () {}));
+                    mockEditorCapability.save.and.returnValue(new Promise(function () {}));
                     action.perform();
                     expect(mockDialogService.showBlockingMessage).toHaveBeenCalled();
                     expect(mockDialogHandle.dismiss).not.toHaveBeenCalled();
                 });
 
                 it("hides the blocking dialog after saving finishes", function () {
-                    var mockCallback = jasmine.createSpy();
-                    action.perform().then(mockCallback);
-                    expect(mockDialogService.showBlockingMessage).toHaveBeenCalled();
-                    waitsFor(function () {
-                        return mockCallback.calls.length > 0;
-                    });
-                    runs(function () {
+                    return action.perform().then(function () {
+                        expect(mockDialogService.showBlockingMessage).toHaveBeenCalled();
                         expect(mockDialogHandle.dismiss).toHaveBeenCalled();
                     });
                 });
 
                 it("notifies if saving succeeded", function () {
-                    var mockCallback = jasmine.createSpy();
-                    action.perform().then(mockCallback);
-                    waitsFor(function () {
-                        return mockCallback.calls.length > 0;
-                    });
-                    runs(function () {
+                    return action.perform().then(function () {
                         expect(mockNotificationService.info).toHaveBeenCalled();
                         expect(mockNotificationService.error).not.toHaveBeenCalled();
                     });
                 });
 
                 it("notifies if saving failed", function () {
-                    mockCopyService.perform.andReturn(Promise.reject("some failure reason"));
-                    var mockCallback = jasmine.createSpy();
-                    action.perform().then(mockCallback);
-                    waitsFor(function () {
-                        return mockCallback.calls.length > 0;
-                    });
-                    runs(function () {
+                    mockCopyService.perform.and.returnValue(Promise.reject("some failure reason"));
+                    action.perform().then(function () {
                         expect(mockNotificationService.error).toHaveBeenCalled();
                         expect(mockNotificationService.info).not.toHaveBeenCalled();
                     });

platform/commonUI/edit/test/capabilities/EditorCapabilitySpec.js

@@ -60,8 +60,8 @@ define(
                         "cancel"
                     ]
                 );
-                mockTransactionService.commit.andReturn(fastPromise());
-                mockTransactionService.cancel.andReturn(fastPromise());
+                mockTransactionService.commit.and.returnValue(fastPromise());
+                mockTransactionService.cancel.and.returnValue(fastPromise());
                 mockTransactionService.isActive = jasmine.createSpy('isActive');
 
                 mockStatusCapability = jasmine.createSpyObj(
@@ -76,23 +76,23 @@ define(
                     "contextCapability",
                     ["getParent"]
                 );
-                mockContextCapability.getParent.andReturn(mockParentObject);
+                mockContextCapability.getParent.and.returnValue(mockParentObject);
 
                 capabilities = {
                     context: mockContextCapability,
                     status: mockStatusCapability
                 };
 
-                mockDomainObject.hasCapability.andCallFake(function (name) {
+                mockDomainObject.hasCapability.and.callFake(function (name) {
                     return capabilities[name] !== undefined;
                 });
 
-                mockDomainObject.getCapability.andCallFake(function (name) {
+                mockDomainObject.getCapability.and.callFake(function (name) {
                     return capabilities[name];
                 });
 
-                mockParentObject.getCapability.andReturn(mockParentStatus);
-                mockParentObject.hasCapability.andReturn(false);
+                mockParentObject.getCapability.and.returnValue(mockParentStatus);
+                mockParentObject.hasCapability.and.returnValue(false);
 
                 capability = new EditorCapability(
                     mockTransactionService,
@@ -112,18 +112,18 @@ define(
 
             it("uses editing status to determine editing context root", function () {
                 capability.edit();
-                mockStatusCapability.get.andReturn(false);
+                mockStatusCapability.get.and.returnValue(false);
                 expect(capability.isEditContextRoot()).toBe(false);
-                mockStatusCapability.get.andReturn(true);
+                mockStatusCapability.get.and.returnValue(true);
                 expect(capability.isEditContextRoot()).toBe(true);
             });
 
             it("inEditingContext returns true if parent object is being" +
                 " edited", function () {
-                mockStatusCapability.get.andReturn(false);
-                mockParentStatus.get.andReturn(false);
+                mockStatusCapability.get.and.returnValue(false);
+                mockParentStatus.get.and.returnValue(false);
                 expect(capability.inEditContext()).toBe(false);
-                mockParentStatus.get.andReturn(true);
+                mockParentStatus.get.and.returnValue(true);
                 expect(capability.inEditContext()).toBe(true);
             });
 
@@ -142,7 +142,7 @@ define(
 
             describe("finish", function () {
                 beforeEach(function () {
-                    mockTransactionService.isActive.andReturn(true);
+                    mockTransactionService.isActive.and.returnValue(true);
                     capability.edit();
                     capability.finish();
                 });
@@ -156,7 +156,7 @@ define(
 
             describe("finish", function () {
                 beforeEach(function () {
-                    mockTransactionService.isActive.andReturn(false);
+                    mockTransactionService.isActive.and.returnValue(false);
                     capability.edit();
                 });
 
@@ -175,15 +175,15 @@ define(
                 var model = {};
 
                 beforeEach(function () {
-                    mockDomainObject.getModel.andReturn(model);
+                    mockDomainObject.getModel.and.returnValue(model);
                     capability.edit();
                     capability.finish();
                 });
                 it("returns true if the object has been modified since it" +
                     " was last persisted", function () {
-                    mockTransactionService.size.andReturn(0);
+                    mockTransactionService.size.and.returnValue(0);
                     expect(capability.dirty()).toBe(false);
-                    mockTransactionService.size.andReturn(1);
+                    mockTransactionService.size.and.returnValue(1);
                     expect(capability.dirty()).toBe(true);
                 });
             });

platform/commonUI/edit/test/capabilities/TransactionCapabilityDecoratorSpec.js

@@ -37,7 +37,7 @@ define(
                 mockQ = {};
                 mockTransactionService = {};
                 mockCapabilityService = jasmine.createSpyObj("capabilityService", ["getCapabilities"]);
-                mockCapabilityService.getCapabilities.andReturn({
+                mockCapabilityService.getCapabilities.and.returnValue({
                     persistence: function () {}
                 });
 

platform/commonUI/edit/test/capabilities/TransactionalPersistenceCapabilitySpec.js

@@ -47,7 +47,7 @@ define(
                 testId = "test-id";
 
                 mockQ = jasmine.createSpyObj("$q", ["when"]);
-                mockQ.when.andCallFake(function (val) {
+                mockQ.when.and.callFake(function (val) {
                     return fastPromise(val);
                 });
                 mockTransactionManager = jasmine.createSpyObj(
@@ -58,15 +58,15 @@ define(
                     "persistenceCapability",
                     ["persist", "refresh", "getSpace"]
                 );
-                mockPersistence.persist.andReturn(fastPromise());
-                mockPersistence.refresh.andReturn(fastPromise());
+                mockPersistence.persist.and.returnValue(fastPromise());
+                mockPersistence.refresh.and.returnValue(fastPromise());
 
                 mockDomainObject = jasmine.createSpyObj(
                     "domainObject",
                     ["getModel", "getId"]
                 );
-                mockDomainObject.getModel.andReturn({persisted: 1});
-                mockDomainObject.getId.andReturn(testId);
+                mockDomainObject.getModel.and.returnValue({persisted: 1});
+                mockDomainObject.getId.and.returnValue(testId);
 
                 capability = new TransactionalPersistenceCapability(
                     mockQ,
@@ -78,24 +78,24 @@ define(
 
             it("if no transaction is active, passes through to persistence" +
                 " provider", function () {
-                mockTransactionManager.isActive.andReturn(false);
+                mockTransactionManager.isActive.and.returnValue(false);
                 capability.persist();
                 expect(mockPersistence.persist).toHaveBeenCalled();
             });
 
             it("if transaction is active, persist and cancel calls are" +
                 " queued", function () {
-                mockTransactionManager.isActive.andReturn(true);
+                mockTransactionManager.isActive.and.returnValue(true);
                 capability.persist();
                 expect(mockTransactionManager.addToTransaction).toHaveBeenCalled();
-                mockTransactionManager.addToTransaction.mostRecentCall.args[1]();
+                mockTransactionManager.addToTransaction.calls.mostRecent().args[1]();
                 expect(mockPersistence.persist).toHaveBeenCalled();
-                mockTransactionManager.addToTransaction.mostRecentCall.args[2]();
+                mockTransactionManager.addToTransaction.calls.mostRecent().args[2]();
                 expect(mockPersistence.refresh).toHaveBeenCalled();
             });
 
             it("wraps getSpace", function () {
-                mockPersistence.getSpace.andReturn('foo');
+                mockPersistence.getSpace.and.returnValue('foo');
                 expect(capability.getSpace()).toEqual('foo');
             });
 

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

@@ -38,7 +38,7 @@ define(
                         jasmine.createSpyObj("mockSaveAction", ["getMetadata", "perform"])
                     ];
                     mockedSaveActions.forEach(function (action) {
-                        action.getMetadata.andReturn(mockSaveActionMetadata);
+                        action.getMetadata.and.returnValue(mockSaveActionMetadata);
                     });
                     return mockedSaveActions;
                 } else if (actionContext.category === "conclude-editing") {
@@ -54,14 +54,14 @@ define(
 
             beforeEach(function () {
                 mockActions = jasmine.createSpyObj("action", ["getActions"]);
-                mockActions.getActions.andCallFake(fakeGetActions);
+                mockActions.getActions.and.callFake(fakeGetActions);
                 mockScope = jasmine.createSpyObj("$scope", ["$watch"]);
                 mockScope.action = mockActions;
                 controller = new EditActionController(mockScope);
             });
 
             function makeControllerUpdateActions() {
-                mockScope.$watch.mostRecentCall.args[1]();
+                mockScope.$watch.calls.mostRecent().args[1]();
             }
 
             it("watches scope that may change applicable actions", function () {

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

@@ -61,17 +61,17 @@ define(
                 mockLocation = jasmine.createSpyObj('$location',
                     ["search"]
                 );
-                mockLocation.search.andReturn({"view": "fixed"});
+                mockLocation.search.and.returnValue({"view": "fixed"});
                 mockNavigationService = jasmine.createSpyObj('navigationService',
                     ["checkBeforeNavigation"]
                 );
 
                 removeCheck = jasmine.createSpy('removeCheck');
-                mockNavigationService.checkBeforeNavigation.andReturn(removeCheck);
+                mockNavigationService.checkBeforeNavigation.and.returnValue(removeCheck);
 
-                mockObject.getId.andReturn("test");
-                mockObject.getModel.andReturn({ name: "Test object" });
-                mockObject.getCapability.andCallFake(function (key) {
+                mockObject.getId.and.returnValue("test");
+                mockObject.getModel.and.returnValue({ name: "Test object" });
+                mockObject.getCapability.and.callFake(function (key) {
                     return mockCapabilities[key];
                 });
 
@@ -81,10 +81,10 @@ define(
                     { key: 'xyz' }
                 ];
 
-                mockObject.useCapability.andCallFake(function (c) {
+                mockObject.useCapability.and.callFake(function (c) {
                     return (c === 'view') && testViews;
                 });
-                mockLocation.search.andReturn({ view: 'def' });
+                mockLocation.search.and.returnValue({ view: 'def' });
 
                 mockScope.domainObject = mockObject;
 
@@ -99,17 +99,17 @@ define(
                 expect(mockNavigationService.checkBeforeNavigation)
                     .toHaveBeenCalledWith(jasmine.any(Function));
 
-                var checkFn = mockNavigationService.checkBeforeNavigation.mostRecentCall.args[0];
+                var checkFn = mockNavigationService.checkBeforeNavigation.calls.mostRecent().args[0];
 
-                mockEditorCapability.isEditContextRoot.andReturn(false);
-                mockEditorCapability.dirty.andReturn(false);
+                mockEditorCapability.isEditContextRoot.and.returnValue(false);
+                mockEditorCapability.dirty.and.returnValue(false);
 
                 expect(checkFn()).toBe("Continuing will cause the loss of any unsaved changes.");
 
-                mockEditorCapability.isEditContextRoot.andReturn(true);
+                mockEditorCapability.isEditContextRoot.and.returnValue(true);
                 expect(checkFn()).toBe("Continuing will cause the loss of any unsaved changes.");
 
-                mockEditorCapability.dirty.andReturn(true);
+                mockEditorCapability.dirty.and.returnValue(true);
                 expect(checkFn())
                     .toBe("Continuing will cause the loss of any unsaved changes.");
 
@@ -119,7 +119,7 @@ define(
                 expect(mockScope.$on)
                     .toHaveBeenCalledWith("$destroy", jasmine.any(Function));
 
-                mockScope.$on.mostRecentCall.args[1]();
+                mockScope.$on.calls.mostRecent().args[1]();
 
                 expect(mockEditorCapability.finish).toHaveBeenCalled();
                 expect(removeCheck).toHaveBeenCalled();

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

@@ -41,13 +41,13 @@ define(
                     ['getTrueRoot']
                 );
 
-                mockDomainObject.getId.andReturn('test-id');
-                mockDomainObject.getCapability.andReturn(mockContext);
+                mockDomainObject.getId.and.returnValue('test-id');
+                mockDomainObject.getCapability.and.returnValue(mockContext);
 
                 // Return a new instance of the root object each time
-                mockContext.getTrueRoot.andCallFake(function () {
+                mockContext.getTrueRoot.and.callFake(function () {
                     var mockRoot = jasmine.createSpyObj('root', ['getId']);
-                    mockRoot.getId.andReturn('root-id');
+                    mockRoot.getId.and.returnValue('root-id');
                     return mockRoot;
                 });
 
@@ -63,7 +63,7 @@ define(
             });
 
             it("exposes the root object found via the object's context capability", function () {
-                mockScope.$watch.mostRecentCall.args[1](mockDomainObject);
+                mockScope.$watch.calls.mostRecent().args[1](mockDomainObject);
 
                 // Verify that the correct capability was used
                 expect(mockDomainObject.getCapability)
@@ -76,10 +76,10 @@ define(
             it("preserves the same root instance to avoid excessive refreshing", function () {
                 var firstRoot;
                 // Expose the domain object
-                mockScope.$watch.mostRecentCall.args[1](mockDomainObject);
+                mockScope.$watch.calls.mostRecent().args[1](mockDomainObject);
                 firstRoot = controller.getRoot();
                 // Update!
-                mockScope.$watch.mostRecentCall.args[1](mockDomainObject);
+                mockScope.$watch.calls.mostRecent().args[1](mockDomainObject);
                 // Should still have the same object instance, to avoid
                 // triggering the watch used by the template we're supporting
                 expect(controller.getRoot()).toBe(firstRoot);
@@ -90,18 +90,18 @@ define(
             it("updates the root when it changes", function () {
                 var firstRoot;
                 // Expose the domain object
-                mockScope.$watch.mostRecentCall.args[1](mockDomainObject);
+                mockScope.$watch.calls.mostRecent().args[1](mockDomainObject);
                 firstRoot = controller.getRoot();
 
                 // Change the exposed root
-                mockContext.getTrueRoot.andCallFake(function () {
+                mockContext.getTrueRoot.and.callFake(function () {
                     var mockRoot = jasmine.createSpyObj('root', ['getId']);
-                    mockRoot.getId.andReturn('other-root-id');
+                    mockRoot.getId.and.returnValue('other-root-id');
                     return mockRoot;
                 });
 
                 // Update!
-                mockScope.$watch.mostRecentCall.args[1](mockDomainObject);
+                mockScope.$watch.calls.mostRecent().args[1](mockDomainObject);
 
                 // Should still have the same object instance, to avoid
                 // triggering the watch used by the template we're supporting

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

@@ -63,13 +63,13 @@ define(
                 mockMutationCapability = jasmine.createSpyObj("mutationCapability", [
                     "listen"
                 ]);
-                mockMutationCapability.listen.andReturn(mockUnlisten);
+                mockMutationCapability.listen.and.returnValue(mockUnlisten);
                 mockDomainObject = jasmine.createSpyObj("domainObject", [
                     "getCapability",
                     "useCapability"
                 ]);
-                mockDomainObject.useCapability.andReturn(mockCompositionCapability);
-                mockDomainObject.getCapability.andReturn(mockMutationCapability);
+                mockDomainObject.useCapability.and.returnValue(mockCompositionCapability);
+                mockDomainObject.getCapability.and.returnValue(mockMutationCapability);
 
                 mockScope = jasmine.createSpyObj("$scope", ['$on']);
                 mockSelection = jasmine.createSpyObj("selection", [
@@ -77,7 +77,7 @@ define(
                     'off',
                     'get'
                 ]);
-                mockSelection.get.andReturn([]);
+                mockSelection.get.and.returnValue([]);
                 mockOpenMCT = {
                     selection: mockSelection
                 };
@@ -88,7 +88,7 @@ define(
                     }
                 };
 
-                spyOn(ElementsController.prototype, 'refreshComposition').andCallThrough();
+                spyOn(ElementsController.prototype, 'refreshComposition').and.callThrough();
 
                 controller = new ElementsController(mockScope, mockOpenMCT);
             });
@@ -123,29 +123,29 @@ define(
             });
 
             it("refreshes composition on selection", function () {
-                mockOpenMCT.selection.on.mostRecentCall.args[1](selectable);
+                mockOpenMCT.selection.on.calls.mostRecent().args[1](selectable);
 
                 expect(ElementsController.prototype.refreshComposition).toHaveBeenCalledWith(mockDomainObject);
             });
 
             it("listens on mutation and refreshes composition", function () {
-                mockOpenMCT.selection.on.mostRecentCall.args[1](selectable);
+                mockOpenMCT.selection.on.calls.mostRecent().args[1](selectable);
 
                 expect(mockDomainObject.getCapability).toHaveBeenCalledWith('mutation');
                 expect(mockMutationCapability.listen).toHaveBeenCalled();
-                expect(ElementsController.prototype.refreshComposition.calls.length).toBe(1);
+                expect(ElementsController.prototype.refreshComposition.calls.count()).toBe(1);
 
-                mockMutationCapability.listen.mostRecentCall.args[0](mockDomainObject);
+                mockMutationCapability.listen.calls.mostRecent().args[0](mockDomainObject);
 
-                expect(ElementsController.prototype.refreshComposition.calls.length).toBe(2);
+                expect(ElementsController.prototype.refreshComposition.calls.count()).toBe(2);
             });
 
             it("cleans up mutation listener when selection changes", function () {
-                mockOpenMCT.selection.on.mostRecentCall.args[1](selectable);
+                mockOpenMCT.selection.on.calls.mostRecent().args[1](selectable);
 
                 expect(mockMutationCapability.listen).toHaveBeenCalled();
 
-                mockOpenMCT.selection.on.mostRecentCall.args[1](selectable);
+                mockOpenMCT.selection.on.calls.mostRecent().args[1](selectable);
 
                 expect(mockUnlisten).toHaveBeenCalled();
             });
@@ -156,7 +156,7 @@ define(
                         elementProxy: {}
                     }
                 };
-                mockOpenMCT.selection.on.mostRecentCall.args[1](selectable);
+                mockOpenMCT.selection.on.calls.mostRecent().args[1](selectable);
 
                 expect(mockDomainObject.getCapability).not.toHaveBeenCalledWith('mutation');
             });
@@ -167,13 +167,13 @@ define(
                     firstCompositionCallback,
                     secondCompositionCallback;
 
-                spyOn(mockCompositionCapability, "then").andCallThrough();
+                spyOn(mockCompositionCapability, "then").and.callThrough();
 
                 controller.refreshComposition(mockDomainObject);
                 controller.refreshComposition(mockDomainObject);
 
-                firstCompositionCallback = mockCompositionCapability.then.calls[0].args[0];
-                secondCompositionCallback = mockCompositionCapability.then.calls[1].args[0];
+                firstCompositionCallback = mockCompositionCapability.then.calls.all()[0].args[0];
+                secondCompositionCallback = mockCompositionCapability.then.calls.all()[1].args[0];
                 secondCompositionCallback(secondMockCompositionObjects);
                 firstCompositionCallback(mockCompositionObjects);
 

platform/commonUI/edit/test/creation/AddActionProviderSpec.js

@@ -51,9 +51,9 @@ define(
                         "hasFeature"
                     ]
                 );
-                mockType.hasFeature.andReturn(true);
-                mockType.getName.andReturn(name);
-                mockType.getKey.andReturn(name);
+                mockType.hasFeature.and.returnValue(true);
+                mockType.getName.and.returnValue(name);
+                mockType.getKey.and.returnValue(name);
                 return mockType;
             }
 
@@ -77,7 +77,7 @@ define(
                     mockTypeMap[type.getKey()] = type;
                 });
 
-                mockTypeService.getType.andCallFake(function (key) {
+                mockTypeService.getType.and.callFake(function (key) {
                     return mockTypeMap[key];
                 });
 

platform/commonUI/edit/test/creation/CreateActionProviderSpec.js

@@ -49,8 +49,8 @@ define(
                         "hasFeature"
                     ]
                 );
-                mockType.hasFeature.andReturn(true);
-                mockType.getName.andReturn(name);
+                mockType.hasFeature.and.returnValue(true);
+                mockType.getName.and.returnValue(name);
                 return mockType;
             }
 
@@ -74,11 +74,11 @@ define(
                     return mockPolicyMap[type.getName()];
                 };
 
-                mockPolicyService.allow.andCallFake(function (category, type) {
+                mockPolicyService.allow.and.callFake(function (category, type) {
                     return category === "creation" && mockCreationPolicy(type) ? true : false;
                 });
 
-                mockTypeService.listTypes.andReturn(mockTypes);
+                mockTypeService.listTypes.and.returnValue(mockTypes);
 
                 provider = new CreateActionProvider(
                     mockTypeService,

platform/commonUI/edit/test/creation/CreateActionSpec.js

@@ -77,10 +77,10 @@ define(
                         "useCapability"
                     ]
                 );
-                mockDomainObject.hasCapability.andCallFake(function (name) {
+                mockDomainObject.hasCapability.and.callFake(function (name) {
                     return !!capabilities[name];
                 });
-                mockDomainObject.getCapability.andCallFake(function (name) {
+                mockDomainObject.getCapability.and.callFake(function (name) {
                     return capabilities[name];
                 });
                 mockSaveAction = jasmine.createSpyObj(
@@ -117,14 +117,14 @@ define(
                 mockContext = {
                     domainObject: mockParent
                 };
-                mockParent.useCapability.andReturn(mockDomainObject);
+                mockParent.useCapability.and.returnValue(mockDomainObject);
 
-                mockType.getKey.andReturn("test");
-                mockType.getCssClass.andReturn("icon-telemetry");
-                mockType.getDescription.andReturn("a test type");
-                mockType.getName.andReturn("Test");
-                mockType.getProperties.andReturn([]);
-                mockType.getInitialModel.andReturn({});
+                mockType.getKey.and.returnValue("test");
+                mockType.getCssClass.and.returnValue("icon-telemetry");
+                mockType.getDescription.and.returnValue("a test type");
+                mockType.getName.and.returnValue("Test");
+                mockType.getProperties.and.returnValue([]);
+                mockType.getInitialModel.and.returnValue({});
 
                 action = new CreateAction(
                     mockType,
@@ -144,7 +144,7 @@ define(
             describe("the perform function", function () {
                 var promise = jasmine.createSpyObj("promise", ["then"]);
                 beforeEach(function () {
-                    capabilities.action.getActions.andReturn([mockEditAction]);
+                    capabilities.action.getActions.and.returnValue([mockEditAction]);
                 });
 
                 it("uses the instantiation capability when performed", function () {
@@ -159,30 +159,30 @@ define(
 
                 it("uses the save-as action if object does not have an edit action" +
                     " available", function () {
-                    capabilities.action.getActions.andReturn([]);
-                    capabilities.action.perform.andReturn(mockPromise(undefined));
-                    capabilities.editor.save.andReturn(promise);
+                    capabilities.action.getActions.and.returnValue([]);
+                    capabilities.action.perform.and.returnValue(mockPromise(undefined));
+                    capabilities.editor.save.and.returnValue(promise);
                     action.perform();
                     expect(capabilities.action.perform).toHaveBeenCalledWith("save-as");
                 });
 
                 describe("uses to editor capability", function () {
                     beforeEach(function () {
-                        capabilities.action.getActions.andReturn([]);
-                        capabilities.action.perform.andReturn(promise);
-                        capabilities.editor.save.andReturn(promise);
+                        capabilities.action.getActions.and.returnValue([]);
+                        capabilities.action.perform.and.returnValue(promise);
+                        capabilities.editor.save.and.returnValue(promise);
                     });
 
                     it("to save the edit if user saves dialog", function () {
                         action.perform();
                         expect(promise.then).toHaveBeenCalled();
-                        promise.then.mostRecentCall.args[0]();
+                        promise.then.calls.mostRecent().args[0]();
                         expect(capabilities.editor.save).toHaveBeenCalled();
                     });
 
                     it("to finish the edit if user cancels dialog", function () {
                         action.perform();
-                        promise.then.mostRecentCall.args[1]();
+                        promise.then.calls.mostRecent().args[1]();
                         expect(capabilities.editor.finish).toHaveBeenCalled();
                     });
                 });

platform/commonUI/edit/test/creation/CreateMenuControllerSpec.js

@@ -49,10 +49,10 @@ define(
             it("populates the scope with create actions", function () {
                 mockScope.action = mockActions;
 
-                mockActions.getActions.andReturn(["a", "b", "c"]);
+                mockActions.getActions.and.returnValue(["a", "b", "c"]);
 
                 // Call the watch
-                mockScope.$watch.mostRecentCall.args[1]();
+                mockScope.$watch.calls.mostRecent().args[1]();
 
                 // Should have grouped and ungrouped actions in scope now
                 expect(mockScope.createActions.length).toEqual(3);

platform/commonUI/edit/test/creation/CreateWizardSpec.js

@@ -41,10 +41,10 @@ define(
                     "property" + name,
                     ["getDefinition", "getValue", "setValue"]
                 );
-                mockProperty.getDefinition.andReturn({
+                mockProperty.getDefinition.and.returnValue({
                     control: "textfield"
                 });
-                mockProperty.getValue.andReturn(name);
+                mockProperty.getValue.and.returnValue(name);
                 return mockProperty;
             }
 
@@ -74,12 +74,12 @@ define(
 
                 testModel = { someKey: "some value" };
 
-                mockType.getKey.andReturn("test");
-                mockType.getCssClass.andReturn("icon-telemetry");
-                mockType.getDescription.andReturn("a test type");
-                mockType.getName.andReturn("Test");
-                mockType.getInitialModel.andReturn(testModel);
-                mockType.getProperties.andReturn(mockProperties);
+                mockType.getKey.and.returnValue("test");
+                mockType.getCssClass.and.returnValue("icon-telemetry");
+                mockType.getDescription.and.returnValue("a test type");
+                mockType.getName.and.returnValue("Test");
+                mockType.getInitialModel.and.returnValue(testModel);
+                mockType.getProperties.and.returnValue(mockProperties);
 
                 mockDomainObject = jasmine.createSpyObj(
                     'domainObject',
@@ -87,9 +87,9 @@ define(
                 );
 
                 //Mocking the getCapability('type') call
-                mockDomainObject.getCapability.andReturn(mockType);
-                mockDomainObject.useCapability.andReturn();
-                mockDomainObject.getModel.andReturn(testModel);
+                mockDomainObject.getCapability.and.returnValue(mockType);
+                mockDomainObject.useCapability.and.returnValue();
+                mockDomainObject.getModel.and.returnValue(testModel);
 
                 wizard = new CreateWizard(
                     mockDomainObject,
@@ -147,9 +147,11 @@ define(
                     "C": "ValueC"
                 },
                 compareModel = wizard.createModel(formValue);
+                //populateObjectFromInput adds a .location attribute that is not added by createModel.
+                compareModel.location = undefined;
                 wizard.populateObjectFromInput(formValue);
                 expect(mockDomainObject.useCapability).toHaveBeenCalledWith('mutation', jasmine.any(Function));
-                expect(mockDomainObject.useCapability.mostRecentCall.args[1]()).toEqual(compareModel);
+                expect(mockDomainObject.useCapability.calls.mostRecent().args[1]()).toEqual(compareModel);
             });
 
             it("validates selection types using policy", function () {
@@ -168,7 +170,7 @@ define(
                     rows = structure.sections[sections.length - 1].rows,
                     locationRow = rows[rows.length - 1];
 
-                mockDomainObj.getCapability.andReturn(mockOtherType);
+                mockDomainObj.getCapability.and.returnValue(mockOtherType);
                 locationRow.validate(mockDomainObj);
 
                 // Should check policy to see if the user-selected location

platform/commonUI/edit/test/creation/CreationPolicySpec.js

@@ -38,12 +38,12 @@ define(
             });
 
             it("allows creation of types with the creation feature", function () {
-                mockType.hasFeature.andReturn(true);
+                mockType.hasFeature.and.returnValue(true);
                 expect(policy.allow(mockType)).toBeTruthy();
             });
 
             it("disallows creation of types without the creation feature", function () {
-                mockType.hasFeature.andReturn(false);
+                mockType.hasFeature.and.returnValue(false);
                 expect(policy.allow(mockType)).toBeFalsy();
             });
         });