fix: [#1664] Support using URL as an object for URL:s when using the …

…Browser API (#1672)
capricorn86 · Jan 7, 2025 · 4732136 · 4732136
1 parent 00b34b4
commit 4732136
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/packages/happy-dom/src/browser/utilities/BrowserFrameURL.ts b/packages/happy-dom/src/browser/utilities/BrowserFrameURL.ts
@@ -13,7 +13,7 @@ export default class BrowserFrameURL {
 	 * @returns Relative URL.
 	 */
 	public static getRelativeURL(frame: IBrowserFrame, url: string | URL): URL {
-		url = (url instanceof URL ? url.toString() : url) || 'about:blank';
+		url = url ? String(url) : 'about:blank';
 
 		if (url.startsWith('about:') || url.startsWith('javascript:')) {
 			return new URL(url);

diff --git a/packages/happy-dom/test/browser/BrowserFrame.test.ts b/packages/happy-dom/test/browser/BrowserFrame.test.ts
@@ -113,10 +113,16 @@ describe('BrowserFrame', () => {
 		it('Sets the document URL.', () => {
 			const browser = new Browser();
 			const page = browser.defaultContext.newPage();
-			const location = page.mainFrame.window.location;
 			page.mainFrame.url = 'http://localhost:3000';
 			expect(page.mainFrame.window.location.href).toBe('http://localhost:3000/');
 		});
+
+		it(`Supports URL as an object.`, async () => {
+			const browser = new Browser();
+			const page = browser.defaultContext.newPage();
+			page.mainFrame.url = <string>(<unknown>{ toString: () => 'http://localhost:3000' });
+			expect(page.mainFrame.window.location.href).toBe('http://localhost:3000/');
+		});
 	});
 
 	describe('waitUntilComplete()', () => {

diff --git a/packages/happy-dom/test/browser/detached-browser/DetachedBrowserFrame.test.ts b/packages/happy-dom/test/browser/detached-browser/DetachedBrowserFrame.test.ts
@@ -137,10 +137,19 @@ describe('DetachedBrowserFrame', () => {
 				browser.defaultContext.pages[0].mainFrame
 			);
 			const page = browser.defaultContext.pages[0];
-			const location = page.mainFrame.window.location;
 			page.mainFrame.url = 'http://localhost:3000';
 			expect(page.mainFrame.window.location.href).toBe('http://localhost:3000/');
 		});
+
+		it(`Supports URL as an object.`, async () => {
+			const browser = new DetachedBrowser(BrowserWindow);
+			browser.defaultContext.pages[0].mainFrame.window = new BrowserWindow(
+				browser.defaultContext.pages[0].mainFrame
+			);
+			const page = browser.defaultContext.pages[0];
+			page.mainFrame.url = <string>(<unknown>{ toString: () => 'http://localhost:3000' });
+			expect(page.mainFrame.window.location.href).toBe('http://localhost:3000/');
+		});
 	});
 
 	describe('waitUntilComplete()', () => {