Merge pull request #732 from boarwell/relative-paths

Use relative paths in directory listing #661

Author: thornjad

lib/core/show-dir/index.js

@@ -95,7 +95,7 @@ module.exports = (opts) => {
           const writeRow = (file) => {
             // render a row given a [name, stat] tuple
             const isDir = file[1].isDirectory && file[1].isDirectory();
-            let href = `${parsed.pathname.replace(/\/$/, '')}/${encodeURIComponent(file[0])}`;
+            let href = `./${encodeURIComponent(file[0])}`;
 
             // append trailing slash and query for dir entry
             if (isDir) {

test/main.test.js

@@ -57,8 +57,8 @@ test('http-server main', (t) => {
             requestAsync("http://localhost:8080/").then(res => {
               t.ok(res);
               t.equal(res.statusCode, 200);
-              t.includes(res.body, '/file');
-              t.includes(res.body, '/canYouSeeMe');
+              t.includes(res.body, './file');
+              t.includes(res.body, './canYouSeeMe');
 
               // Custom headers
               t.equal(res.headers['access-control-allow-origin'], '*');

test/showdir-href-encoding.test.js

@@ -26,7 +26,7 @@ test('url encoding in href', (t) => {
     request.get({
       uri,
     }, (err, res, body) => {
-      t.match(body, /href="\/base\/show-dir%24%24href_encoding%24%24\/aname%2Baplus.txt"/, 'We found the right href');
+      t.match(body, /href="\.\/aname%2Baplus.txt"/, 'We found the right href');
       server.close();
       t.end();
     });

test/showdir-search-encoding.test.js

@@ -26,7 +26,7 @@ test('directory listing with query string specified', (t) => {
     request.get({
       uri,
     }, (err, res, body) => {
-      t.match(body, /href="\/base\/subdir\/\?a=1&b=2"/, 'We found the encoded href');
+      t.match(body, /href="\.\/subdir\/\?a=1&b=2"/, 'We found the encoded href');
       t.notMatch(body, /a=1&b=2/, 'We didn\'t find the unencoded query string value');
       server.close();
       t.end();

test/showdir-with-spaces.test.js

@@ -26,7 +26,7 @@ test('directory listing when directory name contains spaces', (t) => {
     request.get({
       uri,
     }, (err, res, body) => {
-      t.ok(/href="\/base\/subdir_with%20space\/index.html"/.test(body), 'We found the right href');
+      t.ok(/href="\.\/index.html"/.test(body), 'We found the right href');
       server.close();
       t.end();
     });