Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/Analytics.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import {
getAnalytics,
logEvent as firebaseLogEvent,
logScreenView as firebaseLogScreenView,
setUserProperty as firebaseSetUserProperty,
} from '@react-native-firebase/analytics';

Expand All @@ -26,7 +25,6 @@ describe('Analytics', () => {
beforeEach(() => {
jest.clearAllMocks();
(firebaseLogEvent as jest.Mock).mockResolvedValue(undefined);
(firebaseLogScreenView as jest.Mock).mockResolvedValue(undefined);
(firebaseSetUserProperty as jest.Mock).mockResolvedValue(undefined);
});

Expand Down Expand Up @@ -115,7 +113,7 @@ describe('Analytics', () => {

it('absorbs screen-view failures', async () => {
const error = new Error('Screen view failed');
(firebaseLogScreenView as jest.Mock).mockRejectedValue(error);
(firebaseLogEvent as jest.Mock).mockRejectedValue(error);

await expect(logScreenView('Game')).resolves.toBeUndefined();
expect(logger.error).toHaveBeenCalledWith(
Expand Down
3 changes: 1 addition & 2 deletions src/Analytics.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import {
getAnalytics,
logEvent as firebaseLogEvent,
logScreenView as firebaseLogScreenView,
setUserProperty as firebaseSetUserProperty,
} from '@react-native-firebase/analytics';

Expand Down Expand Up @@ -50,7 +49,7 @@ export const logEvent = async <K extends keyof AnalyticsEventParams>(

export const logScreenView = async (screenName: string): Promise<void> => {
try {
await firebaseLogScreenView(getAnalytics(), {
await firebaseLogEvent(getAnalytics(), 'screen_view', {
screen_name: screenName,
screen_class: screenName,
});
Expand Down
16 changes: 9 additions & 7 deletions src/Navigation.test.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';

import { logScreenView } from '@react-native-firebase/analytics';
import { logEvent as firebaseLogEvent } from '@react-native-firebase/analytics';
import { configureStore } from '@reduxjs/toolkit';
import { act, render } from '@testing-library/react-native';
import { Provider } from 'react-redux';
Expand Down Expand Up @@ -168,7 +168,7 @@ describe('Navigation', () => {
beforeEach(() => {
mockActiveRouteName = 'List';
mockNavigationContainerProps = undefined;
(logScreenView as jest.Mock).mockClear();
(firebaseLogEvent as jest.Mock).mockClear();
Object.keys(mockScreenListeners).forEach((key) => {
delete mockScreenListeners[key];
});
Expand Down Expand Up @@ -264,21 +264,23 @@ describe('Navigation', () => {
mockNavigationContainerProps?.onReady?.();
});

expect((logScreenView as jest.Mock)).toHaveBeenCalledWith(
expect((firebaseLogEvent as jest.Mock)).toHaveBeenCalledWith(
expect.anything(),
'screen_view',
{ screen_name: 'List', screen_class: 'List' },
);

(logScreenView as jest.Mock).mockClear();
(firebaseLogEvent as jest.Mock).mockClear();
setActiveRoute('Game');
expect((logScreenView as jest.Mock)).toHaveBeenCalledWith(
expect((firebaseLogEvent as jest.Mock)).toHaveBeenCalledWith(
expect.anything(),
'screen_view',
{ screen_name: 'Game', screen_class: 'Game' },
);

// Same route fires onStateChange again — should not re-log.
(logScreenView as jest.Mock).mockClear();
(firebaseLogEvent as jest.Mock).mockClear();
setActiveRoute('Game');
expect((logScreenView as jest.Mock)).not.toHaveBeenCalled();
expect((firebaseLogEvent as jest.Mock)).not.toHaveBeenCalled();
});
});
Loading