Merge remote-tracking branch 'origin/master' into rsgowman/link_by_fe…

…derated_id

test/integration/auth.spec.ts

@@ -560,6 +560,27 @@ describe('admin.auth', () => {
 
     it('updates the user record with the given parameters', () => {
       const updatedDisplayName = 'Updated User ' + updateUser.uid;
+      return admin.auth().updateUser(updateUser.uid, {
+        email: updatedEmail,
+        phoneNumber: updatedPhone,
+        emailVerified: true,
+        displayName: updatedDisplayName,
+      })
+        .then((userRecord) => {
+          expect(userRecord.emailVerified).to.be.true;
+          expect(userRecord.displayName).to.equal(updatedDisplayName);
+          // Confirm expected email.
+          expect(userRecord.email).to.equal(updatedEmail);
+          // Confirm expected phone number.
+          expect(userRecord.phoneNumber).to.equal(updatedPhone);
+        });
+    });
+
+    it('creates, updates, and removes second factors', function () {
+      if (authEmulatorHost) {
+        return this.skip(); // Not yet supported in Auth Emulator.
+      }
+
       const now = new Date(1476235905000).toUTCString();
       // Update user with enrolled second factors.
       const enrolledFactors = [
@@ -579,21 +600,11 @@ describe('admin.auth', () => {
         },
       ];
       return admin.auth().updateUser(updateUser.uid, {
-        email: updatedEmail,
-        phoneNumber: updatedPhone,
-        emailVerified: true,
-        displayName: updatedDisplayName,
         multiFactor: {
           enrolledFactors,
         },
       })
         .then((userRecord) => {
-          expect(userRecord.emailVerified).to.be.true;
-          expect(userRecord.displayName).to.equal(updatedDisplayName);
-          // Confirm expected email.
-          expect(userRecord.email).to.equal(updatedEmail);
-          // Confirm expected phone number.
-          expect(userRecord.phoneNumber).to.equal(updatedPhone);
           // Confirm second factors added to user.
           const actualUserRecord: {[key: string]: any} = userRecord.toJSON();
           expect(actualUserRecord.multiFactor.enrolledFactors.length).to.equal(2);