summaryrefslogtreecommitdiff
path: root/js/test
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2015-07-21 00:15:18 +0200
committerJose <jose@zeroc.com>2015-07-21 00:15:18 +0200
commit8433a619b185e7e81df4ec237090992522636de8 (patch)
treeb437bcfaf17a19f4ff5fc281f0fa1ba23324d180 /js/test
parentFix issue with JavaScript brwoser mapping when proxy contains TCP endpoints (diff)
downloadice-8433a619b185e7e81df4ec237090992522636de8.tar.bz2
ice-8433a619b185e7e81df4ec237090992522636de8.tar.xz
ice-8433a619b185e7e81df4ec237090992522636de8.zip
Fix JavaScript test for non connectable endpoints
Diffstat (limited to 'js/test')
-rw-r--r--js/test/Ice/proxy/Client.js18
1 files changed, 9 insertions, 9 deletions
diff --git a/js/test/Ice/proxy/Client.js b/js/test/Ice/proxy/Client.js
index 9bb381e7e30..746b385767f 100644
--- a/js/test/Ice/proxy/Client.js
+++ b/js/test/Ice/proxy/Client.js
@@ -1054,15 +1054,15 @@
).then(
function()
{
- if(typeof window !== 'undefined')
- {
- //
- // Ensure that TCP endpoints are skipped when runing in a browser.
- //
- var p = communicator.stringToProxy("test:tcp -p 12010:ws -p 12010");
- p = p.ice_endpointSelection(Ice.EndpointSelectionType.Ordered);
- return p.ice_ping();
- }
+ //
+ // Ensure that non connectable endpoints are skipped.
+ //
+ var p = (typeof window === 'undefined') ?
+ communicator.stringToProxy("test:ws -p 12010:default -p 12010") :
+ communicator.stringToProxy("test:tcp -p 12010:default -p 12010");
+
+ p = p.ice_endpointSelection(Ice.EndpointSelectionType.Ordered);
+ return p.ice_ping();
}
).then(
function()