summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2017-06-06 21:56:16 +0200
committerJose <jose@zeroc.com>2017-06-06 21:56:16 +0200
commit202562320a111b58d300de39ac2c1a88ecb61cb5 (patch)
treec90fca31f046730782b385929070461da40a3739 /js
parentReenabled stacktrace testing on Windows (diff)
downloadice-202562320a111b58d300de39ac2c1a88ecb61cb5.tar.bz2
ice-202562320a111b58d300de39ac2c1a88ecb61cb5.tar.xz
ice-202562320a111b58d300de39ac2c1a88ecb61cb5.zip
JavaScript test controller missing data for reder
Diffstat (limited to 'js')
-rw-r--r--js/bin/HttpServer.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/bin/HttpServer.js b/js/bin/HttpServer.js
index ad8a4bc0e1b..844d07aa2b1 100644
--- a/js/bin/HttpServer.js
+++ b/js/bin/HttpServer.js
@@ -202,7 +202,7 @@ function Init()
var testSuite = TestSuites[m];
if(testSuite)
{
- scripts = scripts.concat(TestSuites[m].files.map(function(f) {
+ TestData.scripts = scripts.concat(TestSuites[m].files.map(function(f) {
if(f.indexOf("/") === -1)
{
return "/test/" + matchController[1] + "/" + f;
@@ -219,10 +219,10 @@ function Init()
}
else
{
- scripts = scripts.concat(fs.readdirSync(testpath).filter(function(f) { return path.extname(f) === ".js"; }))
+ TestData.scripts = scripts.concat(fs.readdirSync(testpath).filter(function(f) { return path.extname(f) === ".js"; }))
}
res.writeHead(200, {"Content-Type": "text/html"});
- res.end(controller.render({ "scripts" : scripts }))
+ res.end(controller.render(TestData))
console.log("HTTP/200 (Ok) " + req.method + " " + req.url.pathname);
}
else