summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2015-09-23 09:46:42 +0200
committerJose <jose@zeroc.com>2015-09-23 09:46:42 +0200
commitee61f2948d9a9259589994a33e5474dfe9c3494b (patch)
tree08ddc4f2e91b80586395f22f0e357a45d1648de8
parentJS test suite fixes (diff)
downloadice-ee61f2948d9a9259589994a33e5474dfe9c3494b.tar.bz2
ice-ee61f2948d9a9259589994a33e5474dfe9c3494b.tar.xz
ice-ee61f2948d9a9259589994a33e5474dfe9c3494b.zip
JS test suite minor fix for NodeJS
- ICE-6822 isSafari not defined with NodeJS
-rw-r--r--js/test/Ice/ami/Client.js2
-rw-r--r--js/test/Ice/timeout/Client.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/js/test/Ice/ami/Client.js b/js/test/Ice/ami/Client.js
index 402418707e3..258ce2cc891 100644
--- a/js/test/Ice/ami/Client.js
+++ b/js/test/Ice/ami/Client.js
@@ -505,7 +505,7 @@
return Promise.try(
function()
{
- if(isSafari() && isWorker())
+ if(typeof(navigator) !== 'undefined' && isSafari() && isWorker())
{
out.writeLine("Test not supported with Safari web workers.");
return Test.TestIntfPrx.uncheckedCast(
diff --git a/js/test/Ice/timeout/Client.js b/js/test/Ice/timeout/Client.js
index 88fa0bb36db..199e203072f 100644
--- a/js/test/Ice/timeout/Client.js
+++ b/js/test/Ice/timeout/Client.js
@@ -458,7 +458,7 @@
return Promise.try(
function()
{
- if(isSafari() && isWorker())
+ if(typeof(navigator) !== 'undefined' && isSafari() && isWorker())
{
out.writeLine("Test not supported with Safari web workers.");
return Test.TimeoutPrx.uncheckedCast(c.stringToProxy("timeout:default -p 12010")).shutdown();