More refactoring

Author: htemelski

packages/search/lib/commands/PROFILE_AGGREGATE.spec.ts

@@ -1,5 +1,5 @@
 import { strict as assert } from 'node:assert';
-import testUtils, { GLOBAL, skipTest } from '../test-utils';
+import testUtils, { GLOBAL } from '../test-utils';
 import { FT_AGGREGATE_STEPS } from './AGGREGATE';
 import PROFILE_AGGREGATE from './PROFILE_AGGREGATE';
 import { SCHEMA_FIELD_TYPE } from './CREATE';
@@ -59,7 +59,7 @@ describe('PROFILE AGGREGATE', () => {
     assert.ok(shardProfile.includes('Warning'));
     assert.ok(shardProfile.includes('Iterators profile'));
 
-  }, GLOBAL.SERVERS.OPEN, skipTest);
+  }, Object.assign(GLOBAL.SERVERS.OPEN, {skipTest: true}));
 
   testUtils.testWithClientIfVersionWithinRange([[7, 2, 0], [7, 4, 0]], 'client.ft.search', async client => {
     await Promise.all([
@@ -106,5 +106,5 @@ describe('PROFILE AGGREGATE', () => {
     const normalizedRes = normalizeObject(res);
     assert.equal(normalizedRes.Results.total_results, 1);
     assert.ok(normalizedRes.Profile.Shards);
-  }, GLOBAL.SERVERS.OPEN_3, skipTest);
+  }, Object.assign(GLOBAL.SERVERS.OPEN_3, {skipTest: true}));
 });

packages/search/lib/test-utils.ts

@@ -2,8 +2,6 @@ import TestUtils from '@redis/test-utils';
 import RediSearch from '.';
 import { RespVersions } from '@redis/client';
 
-export const skipTest = true;
-
 export default TestUtils.createFromConfig({
   dockerImageName: 'redislabs/client-libs-test',
   dockerImageVersionArgument: 'redis-version',

packages/test-utils/lib/index.ts

@@ -54,6 +54,7 @@ interface TestUtilsConfig {
 interface CommonTestOptions {
   serverArguments: Array<string>;
   minimumDockerVersion?: Array<number>;
+  skipTest?: boolean;
 }
 
 interface ClientTestOptions<
@@ -228,8 +229,7 @@ export default class TestUtils {
   >(
     title: string,
     fn: (client: RedisClientType<M, F, S, RESP, TYPE_MAPPING>) => unknown,
-    options: ClientTestOptions<M, F, S, RESP, TYPE_MAPPING>,
-    skipTest?: boolean,
+    options: ClientTestOptions<M, F, S, RESP, TYPE_MAPPING>
   ): void {
     let dockerPromise: ReturnType<typeof spawnRedisServer>;
     if (this.isVersionGreaterThan(options.minimumDockerVersion)) {
@@ -243,7 +243,7 @@ export default class TestUtils {
     }
 
     it(title, async function () {
-      if (skipTest) return this.skip();
+      if (options.skipTest) return this.skip();
       if (!dockerPromise) return this.skip();
 
       const client = createClient({
@@ -284,12 +284,11 @@ export default class TestUtils {
     range: ([minVersion: Array<number>, maxVersion: Array<number>] | [minVersion: Array<number>, 'LATEST']),
     title: string,
     fn: (client: RedisClientType<M, F, S, RESP, TYPE_MAPPING>) => unknown,
-    options: ClientTestOptions<M, F, S, RESP, TYPE_MAPPING>,
-    skipTest?: boolean
+    options: ClientTestOptions<M, F, S, RESP, TYPE_MAPPING>
   ): void {
 
     if (this.isVersionInRange(range[0], range[1] === 'LATEST' ? [Infinity, Infinity, Infinity] : range[1])) {
-      return this.testWithClient(`${title}  [${range[0].join('.')}] - [${(range[1] === 'LATEST') ? range[1] : range[1].join(".")}] `, fn, options, skipTest)
+      return this.testWithClient(`${title}  [${range[0].join('.')}] - [${(range[1] === 'LATEST') ? range[1] : range[1].join(".")}] `, fn, options)
     } else {
       console.warn(`Skipping test ${title} because server version ${this.#VERSION_NUMBERS.join('.')} is not within range ${range[0].join(".")} - ${range[1] !== 'LATEST' ? range[1].join(".") : 'LATEST'}`)
     }
@@ -319,6 +318,7 @@ export default class TestUtils {
     }
 
     it(title, async function () {
+      if (options.skipTest) return this.skip();
       if (!dockerPromise) return this.skip();
 
       const pool = createClientPool({