Merge pull request #1 from sjpotter/change-testing

Change testing

Author: sjpotter

packages/bloom/lib/test-utils.ts

@@ -2,15 +2,15 @@ import TestUtils from '@redis/test-utils';
 import RedisBloomModules from '.';
 
 export default new TestUtils({
-  dockerImageName: 'redislabs/rebloom',
+  dockerImageName: 'redis',
   dockerImageVersionArgument: 'redisbloom-version',
-  defaultDockerVersion: 'edge'
+  defaultDockerVersion: '8.0-M01'
 });
 
 export const GLOBAL = {
   SERVERS: {
     OPEN: {
-      serverArguments: ['--loadmodule /usr/lib/redis/modules/redisbloom.so'],
+      serverArguments: [],
       clientOptions: {
         modules: RedisBloomModules
       }

packages/client/lib/test-utils.ts

@@ -5,7 +5,7 @@ import { setTimeout } from 'node:timers/promises';
 const utils = new TestUtils({
   dockerImageName: 'redis',
   dockerImageVersionArgument: 'redis-version',
-  defaultDockerVersion: '7.4'
+  defaultDockerVersion: '8.0-M01'
 });
 
 export default utils;

packages/graph/lib/test-utils.ts

@@ -2,14 +2,15 @@ import TestUtils from '@redis/test-utils';
 import RedisGraph from '.';
 
 export default new TestUtils({
-  dockerImageName: 'redislabs/redisgraph',
-  dockerImageVersionArgument: 'redisgraph-version'
+  dockerImageName: 'redis',
+  dockerImageVersionArgument: 'redisgraph-version',
+  defaultDockerVersion: '8.0-M01'
 });
 
 export const GLOBAL = {
   SERVERS: {
     OPEN: {
-      serverArguments: ['--loadmodule /usr/lib/redis/modules/redisgraph.so'],
+      serverArguments: [],
       clientOptions: {
         modules: {
           graph: RedisGraph

packages/json/lib/test-utils.ts

@@ -2,14 +2,15 @@ import TestUtils from '@redis/test-utils';
 import RedisJSON from '.';
 
 export default new TestUtils({
-  dockerImageName: 'redislabs/rejson',
-  dockerImageVersionArgument: 'rejson-version'
+  dockerImageName: 'redis',
+  dockerImageVersionArgument: 'redisgraph-version',
+  defaultDockerVersion: '8.0-M01'
 });
 
 export const GLOBAL = {
   SERVERS: {
     OPEN: {
-      serverArguments: ['--loadmodule /usr/lib/redis/modules/rejson.so'],
+      serverArguments: [],
       clientOptions: {
         modules: {
           json: RedisJSON

packages/search/lib/test-utils.ts

@@ -2,15 +2,15 @@ import TestUtils from '@redis/test-utils';
 import RediSearch from '.';
 
 export default new TestUtils({
-    dockerImageName: 'redislabs/redisearch',
+    dockerImageName: 'redis',
     dockerImageVersionArgument: 'redisearch-version',
-    defaultDockerVersion: '2.4.9'
+    defaultDockerVersion: '8.0-M01'
 });
 
 export const GLOBAL = {
     SERVERS: {
         OPEN: {
-            serverArguments: ['--loadmodule /usr/lib/redis/modules/redisearch.so'],
+            serverArguments: [],
             clientOptions: {
                 modules: {
                     ft: RediSearch

packages/test-utils/lib/dockers.ts

@@ -3,7 +3,6 @@ import { once } from 'node:events';
 import { createClient } from '@redis/client/index';
 import { setTimeout } from 'node:timers/promises';
 // import { ClusterSlotsReply } from '@redis/client/dist/lib/commands/CLUSTER_SLOTS';
-import * as path from 'node:path';
 import { promisify } from 'node:util';
 import { exec } from 'node:child_process';
 const execAsync = promisify(exec);
@@ -46,17 +45,10 @@ export interface RedisServerDocker {
   dockerId: string;
 }
 
-// extra ".." cause it'll be in `./dist`
-const DOCKER_FODLER_PATH = path.join(__dirname, '../../docker');
-
 async function spawnRedisServerDocker({ image, version }: RedisServerDockerConfig, serverArguments: Array<string>): Promise<RedisServerDocker> {
   const port = (await portIterator.next()).value,
     { stdout, stderr } = await execAsync(
-      'docker run -d --network host $(' +
-      `docker build ${DOCKER_FODLER_PATH} -q ` +
-      `--build-arg IMAGE=${image}:${version} ` +
-      `--build-arg REDIS_ARGUMENTS="--save '' --port ${port.toString()} ${serverArguments.join(' ')}"` +
-      ')'
+      `docker run -d --network host ${image}:${version} --port ${port.toString()} ${serverArguments.join(' ')}`
     );
 
   if (!stdout) {

packages/time-series/lib/test-utils.ts

@@ -2,14 +2,15 @@ import TestUtils from '@redis/test-utils';
 import TimeSeries from '.';
 
 export default new TestUtils({
-  dockerImageName: 'redislabs/redistimeseries',
-  dockerImageVersionArgument: 'timeseries-version'
+  dockerImageName: 'redis',
+  dockerImageVersionArgument: 'timeseries-version',
+  defaultDockerVersion: '8.0-M01'
 });
 
 export const GLOBAL = {
   SERVERS: {
     OPEN: {
-      serverArguments: ['--loadmodule /usr/lib/redis/modules/redistimeseries.so'],
+      serverArguments: [],
       clientOptions: {
         modules: {
           ts: TimeSeries