Move isSafari()

Author: hsubox76

packages/firestore/test/unit/util/async_queue.test.ts

@@ -24,16 +24,10 @@ import { getLogLevel, setLogLevel, LogLevel } from '../../../src/util/log';
 import { Deferred, Rejecter, Resolver } from '../../../src/util/promise';
 import { fail } from '../../../src/util/assert';
 import { IndexedDbTransactionError } from '../../../src/local/simple_db';
+import { isSafari } from '../../util/test_platform';
 
 use(chaiAsPromised);
 
-function isSafari(): boolean {
-  return (
-    navigator.userAgent.includes('Safari') &&
-    !navigator.userAgent.includes('Chrome')
-  );
-}
-
 describe('AsyncQueue', () => {
   // We reuse these TimerIds for generic testing.
   const timerId1 = TimerId.ListenStreamConnectionBackoff;
@@ -147,12 +141,6 @@ describe('AsyncQueue', () => {
   // Flaky on Safari.
   // eslint-disable-next-line no-restricted-properties
   (isSafari() ? it.skip : it)('can schedule ops in the future', async () => {
-    if (
-      navigator.userAgent.includes('Safari') &&
-      !navigator.userAgent.includes('Chrome')
-    ) {
-      return;
-    }
     const queue = new AsyncQueue();
     const completedSteps: number[] = [];
     const doStep = (n: number): Promise<number> =>

packages/firestore/test/util/test_platform.ts

@@ -22,6 +22,7 @@ import { JsonProtoSerializer } from '../../src/remote/serializer';
 import { debugAssert, fail } from '../../src/util/assert';
 import { ConnectivityMonitor } from './../../src/remote/connectivity_monitor';
 import { NoopConnectivityMonitor } from './../../src/remote/connectivity_monitor_noop';
+import { isNode } from '@firebase/util';
 
 /* eslint-disable no-restricted-globals */
 
@@ -272,11 +273,11 @@ export class TestPlatform implements Platform {
   }
 }
 
-/** Returns true if we are running under Node. */
-export function isNode(): boolean {
+/** Returns true if we are running in Safari. */
+export function isSafari(): boolean {
   return (
-    typeof process !== 'undefined' &&
-    process.title !== undefined &&
-    process.title.indexOf('node') !== -1
+    !isNode() &&
+    navigator.userAgent.includes('Safari') &&
+    !navigator.userAgent.includes('Chrome')
   );
 }