alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1519 from nasa/mct1456

Browse Source 
[Duplicate] Differentiate between user cancellation and other errors
This commit is contained in:
Pete Richards
2017-04-24 15:39:18 -07:00
committed by GitHub
parent 8830ee8c2d 6219fa1d87
commit f07934f512
7 changed files with 53 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/entanglement/test/actions/AbstractComposeActionSpec.js
View File

@@ -157,9 +157,9 @@ define(
);
});
it("waits for location from user", function () {
it("waits for location and handles cancellation by user", function () {
expect(locationServicePromise.then)
.toHaveBeenCalledWith(jasmine.any(Function));
.toHaveBeenCalledWith(jasmine.any(Function), jasmine.any(Function));
});
it("copies object to selected location", function () {

4
platform/entanglement/test/actions/CopyActionSpec.js
View File

@@ -180,9 +180,9 @@ define(
);
});
it("waits for location from user", function () {
it("waits for location and handles cancellation by user", function () {
expect(locationServicePromise.then)
.toHaveBeenCalledWith(jasmine.any(Function));
.toHaveBeenCalledWith(jasmine.any(Function), jasmine.any(Function));
});
it("copies object to selected location", function () {

4
platform/entanglement/test/actions/LinkActionSpec.js
View File

@@ -133,9 +133,9 @@ define(
);
});
it("waits for location from user", function () {
it("waits for location and handles cancellation by user", function () {
expect(locationServicePromise.then)
.toHaveBeenCalledWith(jasmine.any(Function));
.toHaveBeenCalledWith(jasmine.any(Function), jasmine.any(Function));
});
it("links object to selected location", function () {

4
platform/entanglement/test/actions/MoveActionSpec.js
View File

@@ -133,9 +133,9 @@ define(
);
});
it("waits for location from user", function () {
it("waits for location and handles cancellation by user", function () {
expect(locationServicePromise.then)
.toHaveBeenCalledWith(jasmine.any(Function));
.toHaveBeenCalledWith(jasmine.any(Function), jasmine.any(Function));
});
it("moves object to selected location", function () {