Merge remote-tracking branch 'origin/open254'

2016-07-18 11:35:43 -07:00
parent 41d0089e53 ea1780364b
commit 99ec188813
11 changed files with 212 additions and 148 deletions
--- a/platform/entanglement/test/actions/CopyActionSpec.js
+++ b/platform/entanglement/test/actions/CopyActionSpec.js
@@ -44,6 +44,7 @@ define(
                notificationService,
                notification,
                dialogService,
+                mockDialog,
                mockLog,
                abstractComposePromise,
                progress = {phase: "copying", totalObjects: 10, processed: 1};
@@ -120,9 +121,12 @@ define(
                    .andReturn(locationServicePromise);

                dialogService = jasmine.createSpyObj('dialogService',
-                    ['showBlockingMessage', 'dismiss']
+                    ['showBlockingMessage']
                );

+                mockDialog = jasmine.createSpyObj("dialog", ["dismiss"]);
+                dialogService.showBlockingMessage.andReturn(mockDialog);
+
                notification = jasmine.createSpyObj('notification',
                    ['dismiss', 'model']
                );