diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-09-14 10:56:49 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-09-14 10:56:49 +0200 |
| commit | 228808bd70a032ee9f20ad5bdd00f2b79578a84b (patch) | |
| tree | 58f456e2c2b5625a26cac2d698cc664166ff1a32 /js/test/Common/ControllerI.js | |
| parent | Additional fixes to allow building mappings against C++ binary distribution (diff) | |
| download | ice-228808bd70a032ee9f20ad5bdd00f2b79578a84b.tar.bz2 ice-228808bd70a032ee9f20ad5bdd00f2b79578a84b.tar.xz ice-228808bd70a032ee9f20ad5bdd00f2b79578a84b.zip | |
Allow running JS tests with browser started manually (eventually
from remote host).
Use --browser=Manual with ./allTests.py and connect to the given
URL with the browser. If browser is running on a different host,
you'll need to start ./allTests.py --host=<host> with host set
to the IP address of the machine running ./allTests.py
Fixes ICE-8366
Diffstat (limited to 'js/test/Common/ControllerI.js')
| -rw-r--r-- | js/test/Common/ControllerI.js | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/js/test/Common/ControllerI.js b/js/test/Common/ControllerI.js index 9c32b492b89..49aa36ddcbb 100644 --- a/js/test/Common/ControllerI.js +++ b/js/test/Common/ControllerI.js @@ -97,7 +97,7 @@ class ProcessI extends Test.Common.Process } } -class ProcessControllerI extends Test.Common.ProcessController +class ProcessControllerI extends Test.Common.BrowserProcessController { constructor(clientOutput, serverOutput, useWorker, scripts) { @@ -193,6 +193,12 @@ class ProcessControllerI extends Test.Common.ProcessController { return "127.0.0.1"; } + + redirect(url, current) + { + current.con.close(Ice.ConnectionClose.Gracefully); + window.location.href = url; + } } function runController(clientOutput, serverOutput, scripts) @@ -272,7 +278,7 @@ function runController(clientOutput, serverOutput, scripts) }; let comm = Ice.initialize(initData); - let str = "Util/ProcessControllerRegistry:" + protocol + " -h 127.0.0.1 -p " + port; + let str = "Util/ProcessControllerRegistry:" + protocol + " -h " + document.location.hostname + " -p " + port; let registry = Test.Common.ProcessControllerRegistryPrx.uncheckedCast(comm.stringToProxy(str)); comm.createObjectAdapter("").then( adapter => |