test: minor test fixes and cleanup

Author: kukhariev

test/__mocks__/parse-duration.js

@@ -1,6 +1,6 @@
 import { TestStorage } from './shared';
 
-describe('expiration shorthand', () => {
+describe('expiration', () => {
   it('should normalize string shorthand to ExpirationOptions', () => {
     const s = new TestStorage({ expiration: '6h' });
     expect(s.config.expiration).toBeDefined();

test/expiration.spec.ts

@@ -10,15 +10,14 @@ import {
 } from '../packages/gcs/src';
 import { authRequest, deepClone, metafile, storageOptions, testfile } from './shared';
 
-const mockFetch = jest.fn();
-global.fetch = mockFetch;
-
 const mockAuthRequest = jest.fn();
 jest.mock('google-auth-library', () => ({
   GoogleAuth: jest.fn(() => ({ request: mockAuthRequest }))
 }));
 
 describe('GCStorage', () => {
+  const mockFetch = jest.fn();
+  const originalFetch = global.fetch;
   jest.useFakeTimers().setSystemTime(new Date('2022-02-02'));
   let storage: GCStorage;
   const uri = 'http://api.com?upload_id=123456789';
@@ -30,10 +29,16 @@ describe('GCStorage', () => {
 
   beforeEach(async () => {
     jest.clearAllMocks();
+    global.fetch = mockFetch;
     mockAuthRequest.mockResolvedValueOnce({ bucket: 'ok' });
     storage = new GCStorage({ ...storageOptions, bucket: 'test-bucket' });
   });
 
+  afterAll(() => {
+    jest.useRealTimers();
+    global.fetch = originalFetch;
+  });
+
   describe('initialization', () => {
     it('should set defaults', () => {
       mockAuthRequest.mockResolvedValueOnce({ bucket: 'ok' });
@@ -46,9 +51,7 @@ describe('GCStorage', () => {
   describe('.create()', () => {
     it('should request api and set status and uri', async () => {
       mockAuthRequest.mockRejectedValueOnce({ code: 404, detail: 'meta not found' }); // getMeta
-      mockAuthRequest.mockResolvedValueOnce({
-        headers: new Headers({ location: uri })
-      }); //
+      mockAuthRequest.mockResolvedValueOnce({ headers: new Headers({ location: uri }) });
       mockAuthRequest.mockResolvedValueOnce('_saveOk');
       const gcsFile = await storage.create(req, metafile);
       expect(gcsFile).toMatchSnapshot();

test/gcs-storage.spec.ts

@@ -129,7 +129,7 @@ describe('S3Storage', () => {
     });
   });
 
-  describe('delete()', () => {
+  describe('.delete()', () => {
     it('should set status', async () => {
       s3Mock.on(HeadObjectCommand).resolves(metafileResponse);
       s3Mock.on(DeleteObjectCommand).resolves({});
@@ -200,7 +200,7 @@ describe('S3PresignedStorage', () => {
     });
   });
 
-  describe('update', () => {
+  describe('.update()', () => {
     it('should add partsUrls', async () => {
       s3Mock.on(HeadObjectCommand).resolves(metafileResponse);
       s3Mock.on(ListPartsCommand).resolves({ Parts: [] });

test/s3-storage.spec.ts

@@ -40,7 +40,9 @@ describe('BaseStorage', () => {
 
   it('should check if not expired', async () => {
     storage = new TestStorage({ expiration: { maxAge: '1h' } });
-    expect(storage.checkIfExpired({ ...metafile, expiredAt: Date.now() + 1000 })).toBeTruthy();
+    expect(
+      await storage.checkIfExpired({ ...metafile, expiredAt: Date.now() + 1000 })
+    ).toBeTruthy();
   });
 
   it('should save meta and update cache', async () => {