fix: use fixed jsforce autoFetch, restore ut

forcedotcom · Jun 21, 2022 · 0b32d21 · 0b32d21
1 parent b2a554f
commit 0b32d21
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 23 deletions.
diff --git a/src/shared/remoteSourceTrackingService.ts b/src/shared/remoteSourceTrackingService.ts
@@ -13,7 +13,6 @@ import { retryDecorator, NotRetryableError } from 'ts-retry-promise';
 import { ConfigFile, Logger, Org, Messages, Lifecycle, SfError } from '@salesforce/core';
 import { Dictionary, Optional } from '@salesforce/ts-types';
 import { env, Duration } from '@salesforce/kit';
-import { QueryResult } from 'jsforce';
 import { ChangeResult, RemoteChangeElement, MemberRevision, SourceMember, RemoteSyncInput } from './types';
 import { getMetadataKeyFromFileResponse, mappingsForSourceMemberTypesToMetadataType } from './metadataKeys';
 import { getMetadataKey } from './functions';
@@ -565,27 +564,8 @@ export class RemoteSourceTrackingService extends ConfigFile<RemoteSourceTracking
     }
 
     try {
-      const result: QueryResult<SourceMember> = await new Promise((resolve, reject) => {
-        const records: SourceMember[] = [];
-        const res = this.org
-          .getConnection()
-          .tooling.query<SourceMember>(query)
-          .on('record', (rec) => records.push(rec))
-          .on('error', (err) => reject(err))
-          .on('end', () => {
-            resolve({
-              done: true,
-              totalSize: res.totalSize ?? 0,
-              records,
-            });
-          })
-          .run({
-            autoFetch: true,
-            maxFetch: 5000000,
-          });
-      });
-
-      return result.records;
+      return (await this.org.getConnection().tooling.query<SourceMember>(query, { autoFetch: true, maxFetch: 50000 }))
+        .records;
     } catch (error) {
       throw SfError.wrap(error as Error);
     }

diff --git a/test/unit/remoteSourceTracking.test.ts b/test/unit/remoteSourceTracking.test.ts
@@ -40,7 +40,7 @@ const getMemberRevisionEntries = (revision: number, synced = false): { [key: str
   return sourceMemberEntries;
 };
 
-describe.skip('remoteSourceTrackingService', () => {
+describe('remoteSourceTrackingService', () => {
   const username = 'foo@bar.com';
   const orgId = '00D456789012345';
   const $$ = instantiateContext();