move browser push support helpers to useragent detect

Author: fadi-george

src/entries/sdk.ts

@@ -7,6 +7,6 @@
  */
 
 // NOTE: Careful if adding imports, ES5 targets can't clean up functions never called.
-import { start } from '../page/utils/OneSignalShimLoader';
+import { start } from '../page/utils/shimLoader';
 
 start();

src/page/bell/Bell.ts

@@ -12,7 +12,7 @@ import type {
   BellSize,
   BellText,
 } from 'src/shared/prompts/types';
-import { wasPromptOfTypeDismissed } from '../../shared/helpers/DismissHelper';
+import { wasPromptOfTypeDismissed } from '../../shared/helpers/dismiss';
 import { getNotificationIcons } from '../../shared/helpers/main';
 import Log from '../../shared/libraries/Log';
 import OneSignalEvent from '../../shared/services/OneSignalEvent';

src/page/managers/PromptsManager.ts

@@ -23,7 +23,7 @@ import {
   requiresUserInteraction,
 } from 'src/shared/useragent/detect';
 import { logMethodCall } from 'src/shared/utils/utils';
-import { markPromptDismissedWithType } from '../../shared/helpers/DismissHelper';
+import { markPromptDismissedWithType } from '../../shared/helpers/dismiss';
 import Log from '../../shared/libraries/Log';
 import OneSignalEvent from '../../shared/services/OneSignalEvent';
 import { DismissPrompt } from '../models/Dismiss';

src/page/managers/slidedownManager/SlidedownManager.ts

@@ -27,7 +27,7 @@ import { CoreModuleDirector } from '../../../core/CoreModuleDirector';
 import {
   markPromptDismissedWithType,
   wasPromptOfTypeDismissed,
-} from '../../../shared/helpers/DismissHelper';
+} from '../../../shared/helpers/dismiss';
 import Log from '../../../shared/libraries/Log';
 import type { PushSubscriptionState } from '../../../shared/models/PushSubscriptionState';
 import { DismissPrompt } from '../../models/Dismiss';

src/page/utils/BrowserSupportsPush.test.ts

@@ -1,11 +1,11 @@
-import * as BrowserSupportsPush from './BrowserSupportsPush';
-import { start } from './OneSignalShimLoader';
+import * as useragentHelpers from 'src/shared/useragent/detect';
+import { start } from './shimLoader';
 
 const supportsSpy = vi
-  .spyOn(BrowserSupportsPush, 'isPushNotificationsSupported')
+  .spyOn(useragentHelpers, 'isPushNotificationsSupported')
   .mockReturnValue(true);
 const isIosSafariSpy = vi
-  .spyOn(BrowserSupportsPush, 'isIosSafari')
+  .spyOn(useragentHelpers, 'isIosSafari')
   .mockReturnValue(false);
 
 describe('OneSignalShimLoader', () => {

src/page/utils/BrowserSupportsPush.ts

@@ -1,14 +1,14 @@
+import {
+  isIosSafari,
+  isPushNotificationsSupported,
+} from 'src/shared/useragent/detect';
 import {
   BUILD_ORIGIN,
   BUILD_TYPE,
   IS_HTTPS,
   NO_DEV_PORT,
   VERSION,
 } from 'src/shared/utils/env';
-import {
-  isIosSafari,
-  isPushNotificationsSupported,
-} from './BrowserSupportsPush';
 // NOTE: Careful if adding imports, ES5 targets can't clean up functions never called.
 
 // See sdk.ts for what entry points this handles

…c/page/utils/OneSignalShimLoader.test.ts src/page/utils/shimLoader.test.tssrc/page/utils/OneSignalShimLoader.test.ts renamed to src/page/utils/shimLoader.test.ts src/page/utils/OneSignalShimLoader.test.ts renamed to src/page/utils/shimLoader.test.ts

@@ -1,9 +1,12 @@
 import { USER_AGENTS } from '__test__/constants';
+import { TestEnvironment } from '__test__/support/environment/TestEnvironment';
 import { Browser } from './constants';
 import {
   getBrowserName,
   getBrowserVersion,
+  isIosSafari,
   isMobileBrowser,
+  isPushNotificationsSupported,
   isTabletBrowser,
 } from './detect';
 
@@ -425,3 +428,51 @@ describe('getBrowserVersion()', () => {
     });
   });
 });
+
+describe('isPushNotificationsSupported()', () => {
+  beforeEach(() => {
+    Object.defineProperty(global, 'PushSubscriptionOptions', {
+      value: {
+        prototype: {
+          applicationServerKey: 'test',
+        },
+      },
+      writable: true,
+    });
+    TestEnvironment.initialize();
+  });
+
+  test('can check if browser supports push notifications', () => {
+    expect(isPushNotificationsSupported()).toBe(true);
+
+    Object.defineProperty(global, 'PushSubscriptionOptions', {
+      value: undefined,
+      writable: true,
+    });
+    expect(isPushNotificationsSupported()).toBe(false);
+
+    Object.defineProperty(window, 'safari', {
+      value: {
+        pushNotification: {},
+      },
+      writable: true,
+    });
+    expect(isPushNotificationsSupported()).toBe(true);
+  });
+});
+
+describe('isIosSafari()', () => {
+  beforeEach(() => {
+    TestEnvironment.initialize();
+  });
+
+  test('can check if on ios safari browser', () => {
+    expect(isIosSafari()).toBe(false);
+
+    Object.defineProperty(navigator, 'maxTouchPoints', {
+      value: 1,
+      writable: true,
+    });
+    expect(isIosSafari()).toBe(true);
+  });
+});