Fix tests (#533)

---------

Signed-off-by: Nik Nasr <[email protected]>

Author: nikrooz

package-lock.json

@@ -41,8 +41,7 @@
   },
   "devDependencies": {
     "tsx": "^4.15.7",
-    "@restatedev/restate-sdk-testcontainers": "^1.5.4",
-    "testcontainers": "^10.24.1"
+    "@restatedev/restate-sdk-testcontainers": "^1.5.4"
   },
   "engines": {
     "node": ">= 18.13"

packages/restate-sdk-examples/package.json

@@ -9,12 +9,14 @@
  * https://github.com/restatedev/sdk-typescript/blob/main/LICENSE
  */
 
-import { RestateTestEnvironment } from "@restatedev/restate-sdk-testcontainers";
+import {
+  RestateContainer,
+  RestateTestEnvironment,
+} from "@restatedev/restate-sdk-testcontainers";
 import { counter } from "../src/object.js";
 import * as clients from "@restatedev/restate-sdk-clients";
 import * as core from "@restatedev/restate-sdk-core";
 import { describe, it, beforeAll, afterAll, expect } from "vitest";
-import { GenericContainer } from "testcontainers";
 
 describe("ExampleObject", () => {
   let restateTestEnvironment: RestateTestEnvironment;
@@ -127,7 +129,7 @@ describe("Custom testcontainer config", () => {
     restateTestEnvironment = await RestateTestEnvironment.start(
       (restateServer) => restateServer.bind(counter),
       () =>
-        new GenericContainer("restatedev/restate:1.1")
+        new RestateContainer()
           .withEnvironment({ RESTATE_LOG_FORMAT: "json" })
           .withLogConsumer((stream) => {
             // eslint-disable-next-line no-console

packages/restate-sdk-examples/test/testcontainers.test.ts

@@ -9,4 +9,7 @@
  * https://github.com/restatedev/sdk-typescript/blob/main/LICENSE
  */
 
-export { RestateTestEnvironment } from "./restate_test_environment.js";
+export {
+  RestateTestEnvironment,
+  RestateContainer,
+} from "./restate_test_environment.js";

packages/restate-sdk-testcontainers/src/public_api.ts

@@ -147,7 +147,7 @@ export class RestateTestEnvironment {
   public static async start(
     mountServicesFn: (server: restate.RestateEndpoint) => void,
     restateContainerFactory: () => GenericContainer = () =>
-      new GenericContainer("docker.io/restatedev/restate:latest")
+      new RestateContainer()
   ): Promise<RestateTestEnvironment> {
     const startedRestateHttpServer = await prepareRestateEndpoint(
       mountServicesFn
@@ -167,6 +167,11 @@ export class RestateTestEnvironment {
 export type TypedState = Record<string, any>;
 export type UntypedState = { _: never };
 
+export class RestateContainer extends GenericContainer {
+  constructor(version = "latest") {
+    super(`docker.io/restatedev/restate:${version}`);
+  }
+}
 export class StateProxy<TState extends TypedState> {
   constructor(
     private adminAPIBaseUrl: string,

packages/restate-sdk-testcontainers/src/restate_test_environment.ts

@@ -30,10 +30,9 @@ const greeterFoo = restate.service({
 
 describe("BindService", () => {
   it("should preserve `this`", async () => {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-assignment
-    const handler = greeterFoo["service"]["greet"];
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-    expect(await handler({}, "abc")).toEqual("abc");
+    // @ts-expect-error service does not exist in the returned type
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
+    expect(await greeterFoo.service?.greet({}, "abc")).toEqual("abc");
   });
 });