Support using tokens multiple times

closes #19
2014-10-03 09:42:42 +03:00
parent 5731ebee6b
commit 5e050a7d23
4 changed files with 22 additions and 4 deletions
@@ -1,3 +1,8 @@
+unreleased
+==========
+
+  * Support using tokens multiple times
+
 1.3.1 / 2014-10-01
 ==================

@@ -172,10 +172,10 @@ exports.html = function(req, res, files, next, dir, showUp, icons, path, view, t
        files.sort(fileSort);
        if (showUp) files.unshift({ name: '..' });
        str = str
-          .replace('{style}', style.concat(iconStyle(files, icons)))
-          .replace('{files}', html(files, dir, icons, view))
-          .replace('{directory}', dir)
-          .replace('{linked-path}', htmlPath(dir));
+          .replace(/\{style\}/g, style.concat(iconStyle(files, icons)))
+          .replace(/\{files\}/g, html(files, dir, icons, view))
+          .replace(/\{directory\}/g, dir)
+          .replace(/\{linked-path\}/g, htmlPath(dir));

        var buf = new Buffer(str, 'utf8');
        res.setHeader('Content-Type', 'text/html; charset=utf-8');
@@ -6,6 +6,7 @@
  </head>
  <body class="directory">
    <h1>This is the test template</h1>
+    <h2>directory {directory}</h2>
    <div id="wrapper">
      <h1>{linked-path}</h1>
      {files}
@@ -506,6 +506,18 @@ describe('serveIndex(root)', function () {
      .set('Accept', 'text/html')
      .expect(200, /ul#files/, done)
    });
+
+    it('should list directory twice', function (done) {
+      request(server)
+      .get('/users/')
+      .set('Accept', 'text/html')
+      .expect(function (res) {
+        var occurances = res.text.match(/directory \/users\//g)
+        if (occurances && occurances.length === 2) return
+        throw new Error('directory not listed twice')
+      })
+      .expect(200, done)
+    });
  });

  describe('when setting a custom stylesheet', function () {