diff options
Diffstat (limited to 'js/test/Ice/acm/Client.js')
| -rw-r--r-- | js/test/Ice/acm/Client.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/js/test/Ice/acm/Client.js b/js/test/Ice/acm/Client.js index 84d48d28d8d..25ab4cbcd6c 100644 --- a/js/test/Ice/acm/Client.js +++ b/js/test/Ice/acm/Client.js @@ -147,7 +147,7 @@ ).exception( function(ex) { - self._msg = "unexpected exception:\n" + ex.stack; + self._msg = "unexpected exception:\n" + ex.toString() + "\n" + ex.stack; } ); }, @@ -441,7 +441,9 @@ // IE doesn't allow more than 6 connections. // if(typeof(navigator) !== "undefined" && - (navigator.userAgent.indexOf("MSIE") != -1 || navigator.userAgent.indexOf("Trident/7.0") != -1)) + (navigator.userAgent.indexOf("MSIE") != -1 || + navigator.userAgent.indexOf("Trident/7.0") != -1 || + navigator.userAgent.indexOf("Edge/12") != -1)) { tests.push(new HeartbeatOnIdleTest(com, out)); tests.push(new HeartbeatAlwaysTest(com, out)); |