fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

clearer comments about the path handling behavior

This commit is contained in:
Tom Hunkapiller 2015-04-10 20:19:26 -05:00 committed by John McLear
parent 5409eb314c
commit 0b0a349081
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/node/hooks/express/tests.js
View File

@ -23,7 +23,10 @@ exports.expressCreateServer = function (hook_name, args, cb) {
});
var rootTestFolder = path.join(npm.root, "..", "/tests/frontend/");
// path.join seems to normalize by default, but we'll just be explicit
var rootTestFolder = path.normalize(path.join(npm.root, "../tests/frontend/"));
var url2FilePath = function(url){
var subPath = url.substr("/tests/frontend".length);
if (subPath == ""){
@ -34,7 +37,7 @@ exports.expressCreateServer = function (hook_name, args, cb) {
var filePath = path.normalize(path.join(rootTestFolder, subPath));
// make sure we jail the paths to the test folder, otherwise serve index
if (filePath.indexOf(rootTestFolder) !== 0) {
filePath = path.normalize(path.join(rootTestFolder, "index.html"));
filePath = path.join(rootTestFolder, "index.html");
}
return filePath;
}