diff --git a/test/lib/cloudfunc.js b/test/lib/cloudfunc.js index 9a533f91..07ccadc2 100644 --- a/test/lib/cloudfunc.js +++ b/test/lib/cloudfunc.js @@ -13,9 +13,10 @@ TEMPLATEPATH = FS_DIR + 'file.html', LINK_TEMPLATE_PATH = FS_DIR + 'link.html', PATHTEMPLATE_PATH = FS_DIR + 'path.html', + PATH_LINK = FS_DIR + 'path-link.html', EXPECT_PATH = DIR + 'test/lib/cloudfunc.html', - Files = [TEMPLATEPATH, PATHTEMPLATE_PATH, LINK_TEMPLATE_PATH, EXPECT_PATH], + Files = [TEMPLATEPATH, PATHTEMPLATE_PATH, LINK_TEMPLATE_PATH, EXPECT_PATH, PATH_LINK], JSON_FILES = { path : '/etc/X11/', @@ -34,14 +35,14 @@ Expect = '
' + - '' + '' + '' + '' + - '/' + - '' + + '/' + + ''+ 'etc' + '/X11/' + '' + @@ -49,7 +50,7 @@ exports.check = function() { files.read(Files, 'utf-8', function(errors, files) { - var isNotOk, i, template, pathTemplate, linkTemplate, expect, result; + var isNotOk, i, template, pathTemplate, pathLink, linkTemplate, expect, result; if (errors) Util.log(errors); @@ -58,15 +59,17 @@ template = files[TEMPLATEPATH]; pathTemplate = files[PATHTEMPLATE_PATH]; + pathLink = files[PATH_LINK], linkTemplate = files[LINK_TEMPLATE_PATH]; expect = files[EXPECT_PATH]; result = CloudFunc.buildFromJSON({ data: JSON_FILES, template: { - file: template, - path: pathTemplate, - link: linkTemplate + file : template, + path : pathTemplate, + pathLink : pathLink, + link : linkTemplate } }); @@ -89,7 +92,6 @@ 'Result: ' + result.substr(i) ); throw('buildFromJSON: Not OK'); - } } });