Fix trailing paths in baseUrl bug.

tighten · Dec 15, 2017 · 1f29ef4 · 1f29ef4
1 parent b4ede02
commit 1f29ef4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/js/UrlBuilder.js b/src/js/UrlBuilder.js
@@ -19,10 +19,13 @@ class UrlBuilder {
         if (! this.absolute)
             return '/';
 
+        if (!this.route.domain)
+            return Ziggy.baseUrl.replace(/\/?$/, '/');
+
         let host = (this.route.domain || Ziggy.baseDomain).replace(/\/+$/, '');
 
         if (Ziggy.basePort && (host.replace(/\/+$/, '') === Ziggy.baseDomain.replace(/\/+$/, '')))
-            host = host + ':' + Ziggy.basePort;
+            host = Ziggy.baseDomain + ':' + Ziggy.basePort;
 
         return Ziggy.baseProtocol + '://' + host + '/';
     }

diff --git a/tests/js/test.route.js b/tests/js/test.route.js
@@ -300,5 +300,15 @@ describe('route()', function() {
             'events.venues.index',
             route().current()
         );
-    })
+    });
+
+    it('Should still work if paths are appended to baseUrl.', function() {
+        let orgBaseUrl = Ziggy.baseUrl;
+        global.Ziggy.baseUrl = 'http://test.thing/ab/cd/';
+
+        assert.equal(
+            'http://test.thing/ab/cd/events/1/venues',
+            route('events.venues.index', 1)
+        );
+    });
 });