replace bowser castle logic for simpler user agent helpers

Author: fadi-george

__test__/support/environment/TestEnvironment.ts

@@ -10,7 +10,6 @@ import { generateNewSubscription } from '../helpers/core';
 import BrowserUserAgent from '../models/BrowserUserAgent';
 import {
   initOSGlobals,
-  mockUserAgent,
   resetDatabase,
   stubDomEnvironment,
   stubNotification,
@@ -33,7 +32,6 @@ export interface TestEnvironmentConfig {
 
 export class TestEnvironment {
   static async initialize(config: TestEnvironmentConfig = {}) {
-    mockUserAgent(config);
     // reset db & localStorage
     resetDatabase();
 

__test__/support/environment/TestEnvironmentHelpers.ts

@@ -1,4 +1,3 @@
-import bowser from 'bowser';
 import { type DOMWindow, JSDOM, ResourceLoader } from 'jsdom';
 import CoreModule from 'src/core/CoreModule';
 import { SubscriptionModel } from 'src/core/models/SubscriptionModel';
@@ -17,7 +16,6 @@ import { getSlidedownElement } from '../../../src/page/slidedown/SlidedownElemen
 import Emitter from '../../../src/shared/libraries/Emitter';
 import Database from '../../../src/shared/services/Database';
 import { CUSTOM_LINK_CSS_CLASSES } from '../../../src/shared/slidedown/constants';
-import * as bowerCastleHelpers from '../../../src/shared/utils/bowserCastle';
 import { DUMMY_ONESIGNAL_ID, DUMMY_SUBSCRIPTION_ID_3 } from '../constants';
 import MockNotification from '../mocks/MockNotification';
 import BrowserUserAgent from '../models/BrowserUserAgent';
@@ -27,26 +25,12 @@ import { type TestEnvironmentConfig } from './TestEnvironment';
 
 declare const global: any;
 
-const bowserCastleSpy = vi.spyOn(bowerCastleHelpers, 'bowserCastle');
-
 export function resetDatabase() {
   // Erase and reset IndexedDb database name to something random
   Database.resetInstance();
   Database.databaseInstanceName = Random.getRandomString(10);
 }
 
-export function mockUserAgent(config: TestEnvironmentConfig = {}): void {
-  // @ts-expect-error - bowser is not typed correctly
-  const info = bowser._detect(config.userAgent ?? BrowserUserAgent.Default);
-  // Modify the mock implementation
-  bowserCastleSpy.mockReturnValue({
-    mobile: info.mobile,
-    tablet: info.tablet,
-    name: info.name.toLowerCase(),
-    version: info.version,
-  });
-}
-
 export async function initOSGlobals(config: TestEnvironmentConfig = {}) {
   global.OneSignal = OneSignal;
   global.OneSignal.EVENTS = ONESIGNAL_EVENTS;

__test__/unit/core/coreModuleDirector.test.ts

@@ -1,4 +1,3 @@
-import { mockUserAgent } from '__test__/support/environment/TestEnvironmentHelpers';
 import { CoreModuleDirector } from '../../../src/core/CoreModuleDirector';
 import { TestEnvironment } from '../../support/environment/TestEnvironment';
 import {
@@ -12,11 +11,6 @@ describe('CoreModuleDirector tests', () => {
   });
 
   describe('getPushSubscriptionModel', () => {
-    beforeEach(() => {
-      vi.resetAllMocks();
-      mockUserAgent();
-    });
-
     async function getPushSubscriptionModel() {
       return (await getCoreModuleDirector()).getPushSubscriptionModel();
     }

__test__/unit/core/osModel.test.ts

@@ -1,13 +1,8 @@
-import { mockUserAgent } from '__test__/support/environment/TestEnvironmentHelpers';
 import { SubscriptionModel } from 'src/core/models/SubscriptionModel';
 import { SubscriptionType } from 'src/core/types/subscription';
 import { generateNewSubscription } from '../../support/helpers/core';
 
 describe('Model tests', () => {
-  beforeAll(() => {
-    mockUserAgent();
-  });
-
   test('Set function updates data', async () => {
     const newSub = generateNewSubscription();
     expect(newSub.enabled).toBe(undefined);

__test__/unit/http/sdkVersion.test.ts

@@ -1,4 +1,3 @@
-import { mockUserAgent } from '__test__/support/environment/TestEnvironmentHelpers';
 import { generateNewSubscription } from '__test__/support/helpers/core';
 import { nock } from '__test__/support/helpers/general';
 import AliasPair from '../../../src/core/requestService/AliasPair';
@@ -11,10 +10,7 @@ import {
 import { expectHeaderToBeSent } from '../../support/helpers/sdkVersion';
 
 describe('Sdk Version Header Tests', () => {
-  beforeAll(() => {
-    nock({});
-    mockUserAgent();
-  });
+  beforeAll(() => nock({}));
 
   test('POST /users: SDK-Version header is sent', () => {
     // @ts-expect-error - partial identity object

__test__/unit/pushSubscription/nativePermissionChange.test.ts

@@ -6,10 +6,7 @@ import {
   DUMMY_SUBSCRIPTION_ID_3,
 } from '__test__/support/constants';
 import { TestEnvironment } from '__test__/support/environment/TestEnvironment';
-import {
-  createPushSub,
-  mockUserAgent,
-} from '__test__/support/environment/TestEnvironmentHelpers';
+import { createPushSub } from '__test__/support/environment/TestEnvironmentHelpers';
 import { MockServiceWorker } from '__test__/support/mocks/MockServiceWorker';
 import Emitter from 'src/shared/libraries/Emitter';
 import { AppState } from 'src/shared/models/AppState';
@@ -29,7 +26,6 @@ vi.useFakeTimers();
 
 describe('Notification Types are set correctly on subscription change', () => {
   beforeEach(async () => {
-    mockUserAgent();
     await TestEnvironment.initialize();
     OneSignal.emitter = new Emitter();
   });

package-lock.json

@@ -4,7 +4,6 @@
   "description": "Web push notifications from OneSignal.",
   "type": "module",
   "dependencies": {
-    "bowser": "github:OneSignal/bowser#fix-android8-opr6-build-detection",
     "jsonp": "github:OneSignal/jsonp#onesignal",
     "uuid": "^11.1.0"
   },

package.json

@@ -9,7 +9,6 @@ import {
   DUMMY_SUBSCRIPTION_ID_2,
 } from '__test__/support/constants';
 import { TestEnvironment } from '__test__/support/environment/TestEnvironment';
-import { mockUserAgent } from '__test__/support/environment/TestEnvironmentHelpers';
 import { SomeOperation } from '__test__/support/helpers/executors';
 import {
   createUserFn,
@@ -53,7 +52,6 @@ describe('LoginUserOperationExecutor', () => {
 
   beforeEach(async () => {
     await Database.clear();
-    mockUserAgent();
     identityModelStore = new IdentityModelStore();
     propertiesModelStore = new PropertiesModelStore();
     subscriptionModelStore = new SubscriptionModelStore();

src/core/executors/LoginUserOperationExecutor.test.ts

@@ -6,7 +6,6 @@ import {
   DUMMY_SUBSCRIPTION_ID,
   DUMMY_SUBSCRIPTION_ID_2,
 } from '__test__/support/constants';
-import { mockUserAgent } from '__test__/support/environment/TestEnvironmentHelpers';
 import { SomeOperation } from '__test__/support/helpers/executors';
 import {
   setGetUserError,
@@ -38,7 +37,6 @@ vi.mock('src/shared/libraries/Log');
 describe('RefreshUserOperationExecutor', () => {
   beforeEach(async () => {
     await Database.clear(); // in case subscription model (from previous tests) are loaded from db
-    mockUserAgent();
     identityModelStore = new IdentityModelStore();
     propertiesModelStore = new PropertiesModelStore();
     subscriptionModelStore = new SubscriptionModelStore();