Fix silently broken auth tests

Author: sam-gc

packages-exp/auth-exp/src/platform_browser/messagechannel/sender.test.ts

@@ -29,14 +29,15 @@ import {
   _Status,
   _TimeoutDuration
 } from '.';
-import { delay } from '../../../test/helpers/delay';
 import { FakeServiceWorker } from '../../../test/helpers/fake_service_worker';
 import { stubTimeouts, TimerMap } from '../../../test/helpers/timeout_stub';
 import { Sender } from './sender';
 
 use(sinonChai);
 use(chaiAsPromised);
 
+const oldSetTimeout = setTimeout;
+
 describe('platform_browser/messagechannel/sender', () => {
   describe('_send', () => {
     let sender: Sender;
@@ -88,7 +89,7 @@ describe('platform_browser/messagechannel/sender', () => {
 
     it('should timeout if it doesnt see an ACK', async () => {
       serviceWorker.addEventListener('message', (_event: Event) => {
-        delay(() => {
+        Promise.resolve().then(() => {
           pendingTimeouts[_TimeoutDuration.ACK]();
         });
       });
@@ -109,7 +110,7 @@ describe('platform_browser/messagechannel/sender', () => {
         }
       ];
       serviceWorker.addEventListener('message', (event: Event) => {
-        delay(() => {
+        Promise.resolve().then(() => {
           pendingTimeouts[_TimeoutDuration.ACK]();
         });
         const messageEvent = event as MessageEvent<
@@ -138,6 +139,9 @@ describe('platform_browser/messagechannel/sender', () => {
 
     it('it should timeout if it gets an ACK but not a DONE', async () => {
       serviceWorker.addEventListener('message', (event: Event) => {
+        oldSetTimeout(() => {
+          pendingTimeouts[_TimeoutDuration.COMPLETION]();
+        }, 5);
         const messageEvent = event as MessageEvent<
           SenderMessageEvent<PingRequest>
         >;
@@ -147,9 +151,6 @@ describe('platform_browser/messagechannel/sender', () => {
           eventType: messageEvent.data.eventType,
           response: null
         } as ReceiverMessageEvent<_PingResponse>);
-        delay(() => {
-          pendingTimeouts[_TimeoutDuration.COMPLETION]();
-        });
       });
       await expect(
         sender._send<_PingResponse, PingRequest>(

packages-exp/auth-exp/src/platform_browser/popup_redirect.test.ts

@@ -41,8 +41,11 @@ import {
   PopupRedirectResolver
 } from '../model/popup_redirect';
 import * as authWindow from './auth_window';
+import * as mockFetch from '../../test/helpers/mock_fetch';
 import * as gapiLoader from './iframe/gapi';
 import { browserPopupRedirectResolver } from './popup_redirect';
+import { mockEndpoint } from '../../test/helpers/api/helper';
+import { Endpoint } from '../api';
 
 use(chaiAsPromised);
 use(sinonChai);
@@ -54,6 +57,7 @@ describe('platform_browser/popup_redirect', () => {
   let iframeSendStub: sinon.SinonStub;
 
   beforeEach(async () => {
+    mockFetch.setUp();
     auth = await testAuth();
     resolver = new (browserPopupRedirectResolver as SingletonInstantiator<
       PopupRedirectResolver
@@ -74,10 +78,18 @@ describe('platform_browser/popup_redirect', () => {
           })
       } as unknown) as gapi.iframes.Context)
     );
+
+    authWindow._window().gapi = {
+      iframes: {
+        CROSS_ORIGIN_IFRAMES_FILTER: 'cross-origin-iframes-filter',
+      }
+    } as unknown as typeof gapi;
   });
 
   afterEach(() => {
     sinon.restore();
+    mockFetch.tearDown();
+    delete authWindow._window().gapi;
   });
 
   context('#_openPopup', () => {
@@ -114,11 +126,13 @@ describe('platform_browser/popup_redirect', () => {
     });
 
     it('throws an error if authDomain is unspecified', async () => {
-      delete auth.config.authDomain;
-      await resolver._initialize(auth);
+       await resolver._initialize(auth);
+      
+      mockEndpoint(Endpoint.GET_PROJECT_CONFIG, {
+        authorizedDomains: []
+      });
 
-      await expect(
-        resolver._openPopup(auth, provider, event)
+      expect(resolver._openPopup(auth, provider, event)
       ).to.be.rejectedWith(FirebaseError, 'auth/auth-domain-config-required');
     });
 
@@ -312,7 +326,7 @@ describe('platform_browser/popup_redirect', () => {
       expect(args[1]).to.eql({
         type: 'webStorageSupport'
       });
-      expect(args[3]).to.eq(gapi.iframes.CROSS_ORIGIN_IFRAMES_FILTER);
+      expect(args[3]).to.eq('cross-origin-iframes-filter');
     });
 
     it('passes through true value from the response to the callback', done => {

packages-exp/auth-exp/src/platform_browser/strategies/phone.test.ts

@@ -418,13 +418,15 @@ describe('platform_browser/strategies/phone', () => {
     let reloadMock: fetch.Route;
     let signInMock: fetch.Route;
     let credential: PhoneAuthCredential;
+    let idToken: string;
 
     beforeEach(() => {
+      idToken = makeJWT({exp: '200', iat: '100'})
       reloadMock = mockEndpoint(Endpoint.GET_ACCOUNT_INFO, {
         users: [{ uid: 'uid' }]
       });
       signInMock = mockEndpoint(Endpoint.SIGN_IN_WITH_PHONE_NUMBER, {
-        idToken: 'new-access-token',
+        idToken,
         refreshToken: 'refresh-token'
       });
       credential = PhoneAuthCredential._fromVerification(
@@ -447,7 +449,7 @@ describe('platform_browser/strategies/phone', () => {
     it('should update the access token', async () => {
       await updatePhoneNumber(user, credential);
       const idToken = await user.getIdToken();
-      expect(idToken).to.eq('new-access-token');
+      expect(idToken).to.eq(idToken);
     });
 
     it('should reload the user', async () => {