fix(absoluteTo): return original URI for URI with scheme

closes #328 #329
medialize · Feb 27, 2017 · 1cc30ee · 1cc30ee
1 parent 0396291
commit 1cc30ee
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/URI.js b/src/URI.js
@@ -2077,7 +2077,10 @@
       base = new URI(base);
     }
 
-    if (!resolved._parts.protocol) {
+    if (resolved._parts.protocol) {
+      // Directly returns even if this._parts.hostname is empty.
+      return resolved;
+    } else {
       resolved._parts.protocol = base._parts.protocol;
     }
 

diff --git a/test/test.js b/test/test.js
@@ -1342,6 +1342,16 @@
         url: 'http://github.com//the_relative_url',
         base: 'http://example.com/foo/bar',
         result: 'http://github.com//the_relative_url'
+      }, {
+        name: 'absolute passthru - file:/// - urljoin (#328)',
+        url: 'file:///C:/skyclan/snipkit',
+        base: 'http://example.com/foo/bar',
+        result: 'file:///C:/skyclan/snipkit'
+      }, {
+        name: 'absolute passthru - generic empty-hostname - urljoin (#328)',
+        url: 'http:///foo',
+        base: 'http://example.com/foo/bar',
+        result: 'http:///foo'
       }, {
         name: 'file paths - urljoin',
         url: 'anotherFile',