Merge 6131c81 into 9c402f7

hexojs · Feb 14, 2019 · 2e9bea2 · 2e9bea2
2 parents 9c402f7 + 6131c81
commit 2e9bea2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/generator.js b/lib/generator.js
@@ -32,7 +32,7 @@ module.exports = function(locals) {
   if (feedConfig.limit) posts = posts.limit(feedConfig.limit);
 
   var url = config.url;
-  if (url[url.length - 1] !== '/') url += '/';
+  url = url.slice(0, -1) + [url.slice(-1), '/', config.root, '/'].join('').replace(/\/+/g, '/');
 
   var icon;
   if (feedConfig.icon) icon = url + feedConfig.icon;

diff --git a/test/index.js b/test/index.js
@@ -155,10 +155,10 @@ describe('Feed generator', function() {
 
     var GOOD = 'http://localhost/blog/';
 
-    checkURL('http://localhost/blog', '/blog/', GOOD);
-    checkURL('http://localhost/blog', '/blog', GOOD);
-    checkURL('http://localhost/blog/', '/blog/', GOOD);
-    checkURL('http://localhost/blog/', '/blog', GOOD);
+    checkURL('http://localhost', '/blog/', GOOD);
+    checkURL('http://localhost', '/blog', GOOD);
+    checkURL('http://localhost/', '/blog/', GOOD);
+    checkURL('http://localhost/', '/blog', GOOD);
 
     checkURL('http://localhost/b/l/o/g', '/', 'http://localhost/b/l/o/g/');