Squashed commit of the following:
commit3f199a9f06Merge:27fe4ed736cba7Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Mon Jun 27 09:04:40 2016 -0700 Merge remote-tracking branch 'origin/master' into clear-transactions-1046 Conflicts: platform/commonUI/edit/src/actions/SaveAsAction.js commit27fe4edb30Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Jun 22 15:04:06 2016 -0700 [Edit] Mark restartTransaction as private API commit21d1938a0fAuthor: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Jun 22 15:03:17 2016 -0700 [Edit] Clarify JSDoc commit06a83f9fa9Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Jun 22 15:01:35 2016 -0700 [Edit] Update failing spec commit1f525160e0Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Jun 22 14:52:43 2016 -0700 [Edit] Refer to correct variable ...when clearing transactions after a restartTransaction commitb60e94bce4Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Jun 22 14:38:54 2016 -0700 [Edit] Clear transactions on Save As ...such that only persistence calls associated with the saved clones are actually issued. Fixes #1046.
This commit is contained in:
@@ -34,6 +34,7 @@ define(
|
||||
mockCopyService,
|
||||
mockParent,
|
||||
mockUrlService,
|
||||
mockTransactionService,
|
||||
actionContext,
|
||||
capabilities = {},
|
||||
action;
|
||||
@@ -119,11 +120,26 @@ define(
|
||||
["urlForLocation"]
|
||||
);
|
||||
|
||||
mockTransactionService = jasmine.createSpyObj(
|
||||
"transactionService",
|
||||
["restartTransaction"]
|
||||
);
|
||||
mockTransactionService.restartTransaction
|
||||
.andReturn(jasmine.createSpy());
|
||||
|
||||
actionContext = {
|
||||
domainObject: mockDomainObject
|
||||
};
|
||||
|
||||
action = new SaveAsAction(undefined, undefined, mockDialogService, undefined, mockCopyService, actionContext);
|
||||
action = new SaveAsAction(
|
||||
undefined,
|
||||
undefined,
|
||||
mockDialogService,
|
||||
undefined,
|
||||
mockCopyService,
|
||||
mockTransactionService,
|
||||
actionContext
|
||||
);
|
||||
|
||||
spyOn(action, "getObjectService");
|
||||
action.getObjectService.andReturn(mockObjectService);
|
||||
|
||||
Reference in New Issue
Block a user