From 729c90ec9efb1daff47b5d48ffa9b7857276f94e Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Mon, 21 Jan 2013 19:04:28 +0200 Subject: [PATCH] Use latest urlmaster with proper testing for valid location URLs. Update url_resolution() tests automated to use better urlmaster. --- package.json | 2 +- test/jsdom/index.js | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index d3a6f35025..5a7bcae1ae 100644 --- a/package.json +++ b/package.json @@ -198,7 +198,7 @@ "console.log" : "*", "html5" : ">=0.3.8", "optimist" : "*", - "urlmaster" : ">=0.2.x" + "urlmaster" : ">=0.2.5" }, "directories": { "lib": "./lib/jsdom" diff --git a/test/jsdom/index.js b/test/jsdom/index.js index 40cc4db3d8..3a1a721184 100644 --- a/test/jsdom/index.js +++ b/test/jsdom/index.js @@ -719,19 +719,22 @@ exports.tests = { // build html with every possible link var html = '\ \ - \ + \ '; refs.forEach(function(ref,i){ html += 'link'+i+'\n'; }); html += ""; + var locn = locn = "file://"+__filename; // now check each base case bases.forEach(function(base,i){ - var doc = jsdom.jsdom(html, null, {url: base}), expected = um.resolveTrack(base,refs); + var doc = jsdom.jsdom(html, null, {url: locn}), expected = um.resolveTrack(locn,base,refs); + // set up the base + doc.getElementsByTagName("base")[0].setAttribute("href",base); refs.forEach(function(ref,j){ - var result = expected[j][2]; - test.equal(doc.getElementById("link"+j).href, result, 'base '+base+' with ref '+ref+' should resolve to '+result); + var result = expected[j][3]; + test.equal(doc.getElementById("link"+j).href, result, 'locn '+locn+' base '+base+' with ref '+ref+' should resolve to '+result+' instead of '+doc.getElementById("link"+j).href); }); }); }