Merge remote-tracking branch 'origin/master' into rsgowman/usermetadata_tojson_lastrefreshtime

Author: rsgowman

test/integration/auth.spec.ts

@@ -336,12 +336,10 @@ describe('admin.auth', () => {
           .then((userRecord) => {
             expect(userRecord.metadata.lastRefreshTime).to.exist;
             expect(isUTCString(userRecord.metadata.lastRefreshTime!));
-            expect(new Date(userRecord.metadata.creationTime).getTime())
-              .lte(new Date(userRecord.metadata.lastRefreshTime!).getTime());
-            const creationTimePlus1Hour = new Date(userRecord.metadata.creationTime);
-            creationTimePlus1Hour.setHours(creationTimePlus1Hour.getHours()+1);
-            expect(new Date(userRecord.metadata.lastRefreshTime!).getTime())
-              .lte(creationTimePlus1Hour.getTime());
+            const creationTime = new Date(userRecord.metadata.creationTime).getTime();
+            const lastRefreshTime = new Date(userRecord.metadata.lastRefreshTime!).getTime();
+            expect(creationTime).lte(lastRefreshTime);
+            expect(lastRefreshTime).lte(creationTime + 3600 * 1000);
           });
       } finally {
         admin.auth().deleteUser('lastRefreshTimeUser');

test/unit/auth/user-record.spec.ts

@@ -681,6 +681,10 @@ describe('UserMetadata', () => {
         (actualMetadata as any).creationTime = new Date();
       }).to.throw(Error);
     });
+
+    it('should return expected lastRefreshTime', () => {
+      expect(actualMetadata.lastRefreshTime).to.equal(new Date(expectedLastRefreshAt).toUTCString())
+    });
   });
 
   describe('toJSON', () => {