Merge branch 'main' into feat/rtn-web-browser-unit-tests

Author: ahmedhamouda78

packages/analytics/__tests__/trackers/PageViewTracker.test.ts

@@ -0,0 +1,72 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { PageViewTracker } from '../../src/trackers/PageViewTracker';
+
+Object.defineProperty(window, 'location', {
+	value: { origin: 'http://localhost:3000', pathname: '/test' },
+});
+Object.defineProperty(window, 'sessionStorage', {
+	value: { getItem: jest.fn(), setItem: jest.fn(), removeItem: jest.fn() },
+});
+
+describe('PageViewTracker', () => {
+	let mockEventRecorder: jest.Mock;
+
+	beforeEach(() => {
+		mockEventRecorder = jest.fn();
+		jest.clearAllMocks();
+	});
+
+	it('should use custom urlProvider when provided', () => {
+		const customUrlProvider = jest.fn(() => 'http://localhost:3000/custom');
+		(window.sessionStorage.getItem as jest.Mock).mockReturnValue(null);
+
+		const tracker = new PageViewTracker(mockEventRecorder, {
+			appType: 'multiPage',
+			urlProvider: customUrlProvider,
+		});
+
+		expect(customUrlProvider).toHaveBeenCalled();
+		expect(mockEventRecorder).toHaveBeenCalledWith('pageView', {
+			url: 'http://localhost:3000/custom',
+		});
+
+		tracker.cleanup();
+	});
+
+	it('should use default urlProvider when none provided', () => {
+		(window.sessionStorage.getItem as jest.Mock).mockReturnValue(null);
+
+		const tracker = new PageViewTracker(mockEventRecorder, {
+			appType: 'multiPage',
+		});
+
+		expect(mockEventRecorder).toHaveBeenCalledWith('pageView', {
+			url: 'http://localhost:3000/test',
+		});
+
+		tracker.cleanup();
+	});
+
+	it('should preserve custom urlProvider after reconfiguration', () => {
+		const customUrlProvider = jest.fn(() => 'http://localhost:3000/custom');
+		(window.sessionStorage.getItem as jest.Mock).mockReturnValue(null);
+
+		const tracker = new PageViewTracker(mockEventRecorder, {
+			urlProvider: customUrlProvider,
+		});
+
+		tracker.configure(mockEventRecorder, {
+			urlProvider: customUrlProvider,
+			appType: 'multiPage',
+		});
+
+		expect(customUrlProvider).toHaveBeenCalled();
+		expect(mockEventRecorder).toHaveBeenCalledWith('pageView', {
+			url: 'http://localhost:3000/custom',
+		});
+
+		tracker.cleanup();
+	});
+});

packages/analytics/src/trackers/PageViewTracker.ts

@@ -57,8 +57,8 @@ export class PageViewTracker implements TrackerInterface {
 		this.options = {
 			appType: options?.appType ?? DEFAULT_APP_TYPE,
 			attributes: options?.attributes ?? undefined,
-			eventName: this.options?.eventName ?? DEFAULT_EVENT_NAME,
-			urlProvider: this.options?.urlProvider ?? DEFAULT_URL_PROVIDER,
+			eventName: options?.eventName ?? DEFAULT_EVENT_NAME,
+			urlProvider: options?.urlProvider ?? DEFAULT_URL_PROVIDER,
 		};
 
 		// Configure SPA or MPA page view tracking