Merge 982e008 into 6ab45ce

hexojs · Aug 30, 2015 · 6391d0e · 6391d0e
2 parents 6ab45ce + 982e008
commit 6391d0e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/lib/generator.js b/lib/generator.js
@@ -25,17 +25,8 @@ module.exports = function(locals) {
   var posts = locals.posts.sort('-date');
   if (feedConfig.limit) posts = posts.limit(feedConfig.limit);
 
-  var url;
-
-  // Sorry for that, it is hexo URL handling way.
-  if (config.root === '/') {
-    url = config.url + config.root;
-  } else {
-    url = config.url + '/';
-  }
-
-  // And sorry for that too.
-  url = url.replace(/([^:])\/\//g, '$1/');
+  var url = config.url;
+  if (url[url.length - 1] !== '/') url += '/';
 
   var xml = template.render({
     config: config,

diff --git a/test/index.js b/test/index.js
@@ -115,9 +115,9 @@ describe('Feed generator', function() {
       path: 'atom.xml'
     };
 
-    var checkURL = function(root, path, valid) {
-      hexo.config.url = root;
-      hexo.config.path = path;
+    var checkURL = function(url, root, valid) {
+      hexo.config.url = url;
+      hexo.config.root = root;
 
       var result = generator(locals);
       var $ = cheerio.load(result.data);