summaryrefslogtreecommitdiff
path: root/js/test/Common/TestHelper.js
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2018-12-18 11:45:06 +0100
committerJose <jose@zeroc.com>2018-12-18 11:45:06 +0100
commitc5eb3b424cd3b516689a64087534ba4b36dd24b6 (patch)
treebd69b17797e85a5961281710b254ac682577cf2e /js/test/Common/TestHelper.js
parentCheck for bin/<arch> directory when running tests, fixes #125 (diff)
downloadice-c5eb3b424cd3b516689a64087534ba4b36dd24b6.tar.bz2
ice-c5eb3b424cd3b516689a64087534ba4b36dd24b6.tar.xz
ice-c5eb3b424cd3b516689a64087534ba4b36dd24b6.zip
JavaScript Ice/timeout extra fixes, Close #262
Diffstat (limited to 'js/test/Common/TestHelper.js')
-rw-r--r--js/test/Common/TestHelper.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/js/test/Common/TestHelper.js b/js/test/Common/TestHelper.js
index 3fe09dce0b5..4839235f6bc 100644
--- a/js/test/Common/TestHelper.js
+++ b/js/test/Common/TestHelper.js
@@ -186,6 +186,12 @@
return typeof navigator !== "undefined" &&
(/^((?!chrome).)*safari/i).test(navigator.userAgent);
}
+
+ static isIE()
+ {
+ return typeof navigator !== "undefined" &&
+ (navigator.userAgent.indexOf("MSIE") !== -1 || navigator.userAgent.match(/Trident.*rv:11\./));
+ }
}
exports.TestHelper = TestHelper;