PR feedback

Author: sam-gc

packages-exp/auth-exp/src/core/util/popup.test.ts

@@ -20,8 +20,9 @@ import * as sinon from 'sinon';
 import * as sinonChai from 'sinon-chai';
 
 import { FirebaseError } from '@firebase/util';
+import * as utils from '@firebase/util';
 
-import { _open, _uaGetter, AuthPopup } from './popup';
+import { _open, AuthPopup } from './popup';
 
 use(sinonChai);
 
@@ -30,7 +31,7 @@ describe('src/core/util/popup', () => {
   let popupStub: sinon.SinonStubbedInstance<Window>;
 
   function setUA(ua: string): void {
-    sinon.stub(_uaGetter, 'getUA').returns(ua);
+    sinon.stub(utils, 'getUA').returns(ua);
   }
 
   function windowTarget(): string {

packages-exp/auth-exp/src/core/util/popup.ts

@@ -48,11 +48,6 @@ export class AuthPopup {
   }
 }
 
-/** Wrapper so that we can stub the UA in tests */
-export const _uaGetter = {
-  getUA
-};
-
 export function _open(
   appName: string,
   url?: string,
@@ -74,7 +69,7 @@ export function _open(
 
   // Chrome iOS 7 and 8 is returning an undefined popup win when target is
   // specified, even though the popup is not necessarily blocked.
-  const ua = _uaGetter.getUA().toLowerCase();
+  const ua = getUA().toLowerCase();
 
   if (name) {
     target = _isChromeIOS(ua) ? TARGET_BLANK : name;