ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-19 13:17:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into csv-export-update-751

Browse Source
This commit is contained in:
Victor Woeltjen 2016-05-25 12:33:43 -07:00
commit 536e2290b8
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/commonUI/edit/bundle.js
View File

@ -146,7 +146,7 @@ define([
"$timeout",
"objectService"
]
},
}
],
"directives": [
{
@ -309,7 +309,7 @@ define([
"uses": [
"action"
]
},
}
],
"components": [
{

12
platform/commonUI/edit/test/creation/CreateActionSpec.js
View File

@ -77,10 +77,10 @@ define(
]
);
mockDomainObject.hasCapability.andCallFake(function (name) {
return !!capabilities[name];
return !!capabilities[name];
});
mockDomainObject.getCapability.andCallFake(function (name) {
return capabilities[name];
return capabilities[name];
});
mockSaveAction = jasmine.createSpyObj(
"saveAction",
@ -165,10 +165,10 @@ define(
describe("uses to editor capability", function () {
var promise = jasmine.createSpyObj("promise", ["then"]);
beforeEach(function () {
capabilities.action.getActions.andReturn([]);
capabilities.action.perform.andReturn(promise);
});
beforeEach(function () {
capabilities.action.getActions.andReturn([]);
capabilities.action.perform.andReturn(promise);
});
it("to save the edit if user saves dialog", function () {
action.perform();