Fix bug and tests

Author: hsubox76

packages/storage/src/implementation/url.ts

@@ -21,7 +21,13 @@
 import { UrlParams } from './requestinfo';
 
 export function makeUrl(urlPart: string, host: string): string {
-  return `https://${host}/v0${urlPart}`;
+  const protocolMatch = host.match(/^(\w+):\/\/.+/);
+  const protocol = protocolMatch?.[1];
+  let origin = host;
+  if (protocol == null) {
+    origin = `https://${host}`;
+  }
+  return `${origin}/v0${urlPart}`;
 }
 
 export function makeQueryString(params: UrlParams): string {

packages/storage/test/unit/service.compat.test.ts

@@ -172,7 +172,7 @@ describe('Firebase Storage > Service', () => {
     });
   });
   describe('useStorageEmulator(service, host, port)', () => {
-    it('sets emulator host correctly', () => {
+    it('sets emulator host correctly', done => {
       function newSend(
         xhrio: TestingXhrIo,
         url: string,
@@ -182,8 +182,9 @@ describe('Firebase Storage > Service', () => {
       ): void {
         // Expect emulator host to be in url of storage operations requests,
         // in this case getDownloadURL.
-        expect(url).to.include('http://test.host.org:1234');
+        expect(url).to.match(/^http:\/\/test\.host\.org:1234.+/);
         xhrio.abort();
+        done();
       }
       const service = makeService(
         testShared.fakeApp,

packages/storage/test/unit/service.exp.test.ts

@@ -221,7 +221,7 @@ GOOG4-RSA-SHA256`
     });
   });
   describe('useStorageEmulator(service, host, port)', () => {
-    it('sets emulator host correctly', () => {
+    it('sets emulator host correctly', done => {
       function newSend(
         xhrio: TestingXhrIo,
         url: string,
@@ -231,8 +231,9 @@ GOOG4-RSA-SHA256`
       ): void {
         // Expect emulator host to be in url of storage operations requests,
         // in this case getDownloadURL.
-        expect(url).to.include('http://test.host.org:1234');
+        expect(url).to.match(/^http:\/\/test\.host\.org:1234.+/);
         xhrio.abort();
+        done();
       }
       const service = new StorageService(
         testShared.fakeApp,