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

Merge remote-tracking branch 'origin/master' into persist-on-mutation-825

Browse Source
This commit is contained in:
Victor Woeltjen
2016-10-07 11:27:58 -07:00
parent 385d90b056 cbd001e280
commit 1a88c9a651
314 changed files with 6153 additions and 7464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -150,7 +150,7 @@ define(
it("prompts for location", function () {
expect(locationService.getLocationFromUser)
.toHaveBeenCalledWith(
"Compose selectedObject to a new location",
"Compose selectedObject To a New Location",
"Compose To",
jasmine.any(Function),
currentParent

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

@@ -173,7 +173,7 @@ define(
it("prompts for location", function () {
expect(locationService.getLocationFromUser)
.toHaveBeenCalledWith(
"Duplicate selectedObject to a location",
"Duplicate selectedObject To a Location",
"Duplicate To",
jasmine.any(Function),
currentParent

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

@@ -126,7 +126,7 @@ define(
it("prompts for location", function () {
expect(locationService.getLocationFromUser)
.toHaveBeenCalledWith(
"Link selectedObject to a new location",
"Link selectedObject To a New Location",
"Link To",
jasmine.any(Function),
currentParent

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

@@ -126,7 +126,7 @@ define(
it("prompts for location", function () {
expect(locationService.getLocationFromUser)
.toHaveBeenCalledWith(
"Move selectedObject to a new location",
"Move selectedObject To a New Location",
"Move To",
jasmine.any(Function),
currentParent