chore: test refactor and project cleanup

Author: thiyaguk09

handwritten/storage/test/resumable-upload.ts

@@ -68,8 +68,7 @@ function mockAuthorizeRequest(
   return nock('https://oauth2.googleapis.com').post('/token').reply(code, data);
 }
 
-/* TODO: UnSkip once the circular dependency is fixed. */
-describe.skip('resumable-upload', () => {
+describe('resumable-upload', () => {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let upload: any;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -98,7 +97,7 @@ describe.skip('resumable-upload', () => {
   const keyFile = path.join(getDirName(), '../../../test/fixtures/keys.json');
 
   before(() => {
-    mockery.enable({useCleanCache: true, warnOnUnregistered: false});
+    mockery.enable({useCleanCache: false, warnOnUnregistered: false});
     upload = require('../src/resumable-upload').upload;
   });
 
@@ -1369,7 +1368,7 @@ describe.skip('resumable-upload', () => {
           return {
             status: 200,
             data: {},
-            headers: {},
+            headers: new Headers(),
             config: opts,
             statusText: 'OK',
           } as GaxiosResponse;
@@ -1427,6 +1426,10 @@ describe.skip('resumable-upload', () => {
         const capturedReqOpts: GaxiosOptions[] = [];
         requestCount = 0;
 
+        const totalChunks = isMultiChunk
+          ? Math.ceil(data.byteLength / CHUNK_SIZE)
+          : 1;
+
         uploadInstance.makeRequestStream = async (
           requestOptions: GaxiosOptions,
         ) => {
@@ -1446,33 +1449,33 @@ describe.skip('resumable-upload', () => {
 
           const serverCrc32c = expectedCrc32c || CALCULATED_CRC32C;
           const serverMd5 = expectedMd5 || CALCULATED_MD5;
-          if (
-            isMultiChunk &&
-            requestCount < Math.ceil(DUMMY_CONTENT.byteLength / CHUNK_SIZE)
-          ) {
+          if (isMultiChunk && requestCount < totalChunks) {
             const lastByteReceived = requestCount * CHUNK_SIZE - 1;
             return {
               data: '',
               status: RESUMABLE_INCOMPLETE_STATUS_CODE,
-              headers: {range: `bytes=0-${lastByteReceived}`},
-              // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            } as any;
-          } else {
-            return {
-              status: 200,
-              data: {
-                crc32c: serverCrc32c,
-                md5Hash: serverMd5,
-                name: FILE,
-                bucket: BUCKET,
-                size: DUMMY_CONTENT.byteLength.toString(),
+              headers: {
+                range: `bytes=0-${lastByteReceived}`,
+                'Content-Length': '0',
               },
-              headers: {},
-              config: {},
-              statusText: 'OK',
               // eslint-disable-next-line @typescript-eslint/no-explicit-any
             } as any;
           }
+
+          return {
+            status: 200,
+            data: {
+              crc32c: serverCrc32c,
+              md5Hash: serverMd5,
+              name: FILE,
+              bucket: BUCKET,
+              size: DUMMY_CONTENT.byteLength.toString(),
+            },
+            headers: new Headers(),
+            config: {},
+            statusText: 'OK',
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          } as any;
         };
 
         return new Promise((resolve, reject) => {
@@ -1584,19 +1587,23 @@ describe.skip('resumable-upload', () => {
           const headers = reqOpts[0].headers as Record<string, any>;
           assert.strictEqual(reqOpts.length, 2);
 
-          assert.strictEqual(headers['Content-Length'], CHUNK_SIZE);
+          assert.strictEqual(headers['Content-Length'], CHUNK_SIZE.toString());
           assert.strictEqual(headers['X-Goog-Hash'], undefined);
         });
 
         it('should include X-Goog-Hash header ONLY on the final multi-chunk request', async () => {
           const expectedHashHeader = `crc32c=${CALCULATED_CRC32C},md5=${CALCULATED_MD5}`;
           const reqOpts = await performUpload(up, DUMMY_CONTENT, true);
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          const headers = reqOpts[0].headers as Record<string, any>;
+          const headers = reqOpts[1].headers as any;
           assert.strictEqual(reqOpts.length, 2);
 
-          assert.strictEqual(headers['Content-Length'], CHUNK_SIZE);
-          assert.equal(headers['X-Goog-Hash'], expectedHashHeader);
+          const xGoogHash =
+            typeof headers.get === 'function'
+              ? headers.get('x-goog-hash')
+              : headers['X-Goog-Hash'];
+          assert.strictEqual(headers['Content-Length'], CHUNK_SIZE.toString());
+          assert.equal(xGoogHash, expectedHashHeader);
         });
       });
     });