fix convert URLs

See #17
matthewmueller · Apr 8, 2015 · 246915c · 246915c
1 parent 3b3338c
commit 246915c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/lib/utils/absolute-urls.js b/lib/utils/absolute-urls.js
@@ -40,10 +40,9 @@ function absolute(path, $) {
 
  if (~src.indexOf('://')) {
  return;
- } else if (src[0] == '/') {
- src = remote + src;
  } else {
- src = remote + '/' + parts.pathname.replace(/^\//, '') + '/' + src
+ var current = url.resolve(remote, parts.pathname);
+ src = url.resolve(current, src);
  }
 
  $el.attr(key, src);

diff --git a/test/x-ray.js b/test/x-ray.js
@@ -10,6 +10,8 @@ var isArray = Array.isArray;
 var subs = require('subs');
 var xray = require('..');
 var fs = require('fs');
+var cheerio = require('cheerio');
+var absolute = require('../lib/utils/absolute-urls');
 
 /**
  * Tests
@@ -252,6 +254,26 @@ describe('x-ray', function() {
  done();
  })
  })
+
+ describe('absolute URLs', function(){
+ var $el;
+ var path = 'http://example.com/foo.html';
+
+ it('should not convert URL', function(){
+ $el = cheerio.load('<a href="http://example.com/bar.html"></a>');
+ assert.equal('<a href="http://example.com/bar.html"></a>', absolute(path, $el).html());
+ });
+
+ it('should convert absolute URL', function(){
+ $el = cheerio.load('<a href="/bar.html"></a>');
+ assert.equal('<a href="http://example.com/bar.html"></a>', absolute(path, $el).html());
+ });
+
+ it('should convert relative URL', function(){
+ $el = cheerio.load('<a href="bar.html"></a>');
+ assert.equal('<a href="http://example.com/bar.html"></a>', absolute(path, $el).html());
+ });
+ });
 })
 
 /**