Merge d170bfa into 440f406

Author: sam-gc

packages-exp/auth-exp/test/helpers/integration/helpers.ts

@@ -70,19 +70,6 @@ export function getTestInstance(): Auth {
 }
 
 export async function cleanUpTestInstance(auth: Auth): Promise<void> {
+  await auth.signOut();
   await (auth as IntegrationTestAuth).cleanUp();
 }
-
-export function initIntegrationTestContext(): Auth {
-  const auth = getTestInstance();
-
-  afterEach(async () => {
-    await auth.signOut();
-  });
-
-  after(async () => {
-    await cleanUpTestInstance(auth);
-  });
-
-  return auth;
-}

packages-exp/auth-exp/test/integration/flows/anonymous.test.ts

@@ -27,18 +27,21 @@ import {
   updateEmail,
   updatePassword
 } from '@firebase/auth-exp/index.browser';
-import { OperationType } from '@firebase/auth-types-exp';
+import { Auth, OperationType } from '@firebase/auth-types-exp';
 import { FirebaseError } from '@firebase/util';
 
 import {
-  initIntegrationTestContext,
+  cleanUpTestInstance,
+  getTestInstance,
   randomEmail
 } from '../../helpers/integration/helpers';
 
 use(chaiAsPromised);
 
 describe('Integration test: anonymous auth', () => {
-  const auth = initIntegrationTestContext();
+  let auth: Auth;
+  beforeEach(() => (auth = getTestInstance()));
+  afterEach(() => cleanUpTestInstance(auth));
 
   it('signs in anonymously', async () => {
     const userCred = await signInAnonymously(auth);