fix tests

Author: fadi-george

__test__/setupTests.ts

@@ -24,3 +24,9 @@ vi.mock('src/core/operationRepo/constants', () => ({
   OP_REPO_EXECUTION_INTERVAL: 5,
   OP_REPO_POST_CREATE_RETRY_UP_TO: 10,
 }));
+
+Object.defineProperty(navigator, 'userAgent', {
+  value:
+    'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.0.0 Safari/537.36',
+  writable: true,
+});

__test__/unit/core/coreModuleDirector.test.ts

@@ -38,7 +38,7 @@ describe('CoreModuleDirector tests', () => {
         'getPushSubscriptionModelByLastKnownToken',
         // @ts-expect-error - private method
       ).mockResolvedValue(pushModelLastKnown);
-      expect(await getPushSubscriptionModel()).toBe(pushModelLastKnown);
+      expect(await getPushSubscriptionModel()).toEqual(pushModelLastKnown);
     });
 
     test('returns current subscription over last known', async () => {

package.json

@@ -72,12 +72,12 @@
     },
     {
       "path": "./build/releases/OneSignalSDK.page.es6.js",
-      "limit": "63.75 kB",
+      "limit": "61.2 kB",
       "gzip": true
     },
     {
       "path": "./build/releases/OneSignalSDK.sw.js",
-      "limit": "34 kB",
+      "limit": "31.3 kB",
       "gzip": true
     },
     {

src/entries/pageSdkInit.test.ts

@@ -5,16 +5,6 @@ import { server } from '__test__/support/mocks/server';
 import { http, HttpResponse } from 'msw';
 import Log from 'src/shared/libraries/Log';
 
-// need to mock browsercastle since we resetting modules after each test
-vi.mock('src/shared/utils/bowserCastle', () => ({
-  bowserCastle: () => ({
-    mobile: false,
-    tablet: false,
-    name: 'Chrome',
-    version: '100',
-  }),
-}));
-
 // need to wait for full OperationRepo rework
 describe('pageSdkInit', () => {
   beforeEach(async () => {

src/sw/serviceWorker/ServiceWorker.test.ts

@@ -198,11 +198,6 @@ describe('ServiceWorker', () => {
     });
 
     test('should confirm delivery', async () => {
-      mockBowser.mockReturnValue({
-        name: 'Chrome',
-        version: '130',
-      });
-
       const payload = mockOSMinifiedNotificationPayload({
         custom: {
           rr: 'y',
@@ -731,15 +726,6 @@ vi.mock('../helpers/ModelCacheDirectAccess', () => ({
   },
 }));
 
-// -- browser info mock
-const mockBowser = vi.fn().mockReturnValue({
-  name: 'Safari',
-  version: '18',
-});
-vi.mock('../../../src/shared/utils/bowserCastle', () => ({
-  bowserCastle: () => mockBowser(),
-}));
-
 // -- awaitable timeout mock
 vi.mock('../../../src/shared/utils/AwaitableTimeout', () => ({
   awaitableTimeout: vi.fn().mockResolvedValue(undefined),

src/sw/serviceWorker/ServiceWorker.ts

@@ -1,54 +1,50 @@
-import OneSignalApiBase from '../../../src/shared/api/OneSignalApiBase';
-import OneSignalApiSW from '../../../src/shared/api/OneSignalApiSW';
+import {
+  NotificationType,
+  type NotificationTypeValue,
+} from 'src/core/types/subscription';
+import FuturePushSubscriptionRecord from 'src/page/userModel/FuturePushSubscriptionRecord';
+import OneSignalApiBase from 'src/shared/api/OneSignalApiBase';
+import OneSignalApiSW from 'src/shared/api/OneSignalApiSW';
+import { type AppConfig, getServerAppConfig } from 'src/shared/config';
+import { Utils } from 'src/shared/context/Utils';
+import ServiceWorkerHelper from 'src/shared/helpers/ServiceWorkerHelper';
 import {
   WorkerMessenger,
   WorkerMessengerCommand,
   type WorkerMessengerMessage,
-} from '../../../src/shared/libraries/WorkerMessenger';
-import { RawPushSubscription } from '../../../src/shared/models/RawPushSubscription';
-import FuturePushSubscriptionRecord from '../../page/userModel/FuturePushSubscriptionRecord';
-import { Utils } from '../../shared/context/Utils';
-import ServiceWorkerHelper from '../../shared/helpers/ServiceWorkerHelper';
-import ContextSW from '../../shared/models/ContextSW';
+} from 'src/shared/libraries/WorkerMessenger';
+import ContextSW from 'src/shared/models/ContextSW';
+import type { DeliveryPlatformKindValue } from 'src/shared/models/DeliveryPlatformKind';
 import {
   type NotificationClickEventInternal,
   type NotificationForegroundWillDisplayEventSerializable,
-} from '../../shared/models/NotificationEvent';
+} from 'src/shared/models/NotificationEvent';
 import {
   type IMutableOSNotification,
   type IOSNotification,
-} from '../../shared/models/OSNotification';
+} from 'src/shared/models/OSNotification';
+import { RawPushSubscription } from 'src/shared/models/RawPushSubscription';
 import {
   type PageVisibilityRequest,
   type PageVisibilityResponse,
   SessionStatus,
   type UpsertOrDeactivateSessionPayload,
-} from '../../shared/models/Session';
-import { SubscriptionStrategyKind } from '../../shared/models/SubscriptionStrategyKind';
-import Database from '../../shared/services/Database';
-import { awaitableTimeout } from '../../shared/utils/AwaitableTimeout';
+} from 'src/shared/models/Session';
+import { SubscriptionStrategyKind } from 'src/shared/models/SubscriptionStrategyKind';
+import Database from 'src/shared/services/Database';
+import { Browser, getBrowserName } from 'src/shared/useragent';
+import { awaitableTimeout } from 'src/shared/utils/AwaitableTimeout';
+import { VERSION } from 'src/shared/utils/EnvVariables';
 import { cancelableTimeout } from '../helpers/CancelableTimeout';
+import { ModelCacheDirectAccess } from '../helpers/ModelCacheDirectAccess';
 import Log from '../libraries/Log';
 import {
   type OSMinifiedNotificationPayload,
   OSMinifiedNotificationPayloadHelper,
 } from '../models/OSMinifiedNotificationPayload';
-import {
-  type OSServiceWorkerFields,
-  type SubscriptionChangeEvent,
-} from './types';
-
-import {
-  NotificationType,
-  type NotificationTypeValue,
-} from 'src/core/types/subscription';
-import { type AppConfig, getServerAppConfig } from 'src/shared/config';
-import type { DeliveryPlatformKindValue } from 'src/shared/models/DeliveryPlatformKind';
-import { Browser, getBrowserName } from 'src/shared/useragent';
-import { VERSION } from 'src/shared/utils/EnvVariables';
-import { ModelCacheDirectAccess } from '../helpers/ModelCacheDirectAccess';
 import { OSNotificationButtonsConverter } from '../models/OSNotificationButtonsConverter';
 import { OSWebhookNotificationEventSender } from '../webhooks/notifications/OSWebhookNotificationEventSender';
+import type { OSServiceWorkerFields, SubscriptionChangeEvent } from './types';
 
 declare const self: ServiceWorkerGlobalScope & OSServiceWorkerFields;