Fix abstract started container async dispose (#1203)

Signed-off-by: Joe Bowbeer <[email protected]>

Author: joebowbeer

packages/testcontainers/src/generic-container/abstract-started-container.test.ts

@@ -0,0 +1,41 @@
+import { Mock } from "vitest";
+import { AbstractStartedContainer, GenericContainer } from "../index";
+
+describe.sequential("AbstractStartedContainer", { timeout: 60_000 }, () => {
+  let containerStopping: Mock;
+  let containerStopped: Mock;
+
+  beforeEach(() => {
+    containerStopping = vi.fn();
+    containerStopped = vi.fn();
+  });
+
+  it("should call overridden lifecycle methods when disposing asynchronously", async () => {
+    {
+      await using _container = await new CustomContainerWithCustomStartedContainer(
+        "cristianrgreco/testcontainer:1.1.14"
+      )
+        .withExposedPorts(8080)
+        .start();
+    }
+
+    expect(containerStopping).toHaveBeenCalled();
+    expect(containerStopped).toHaveBeenCalled();
+  });
+
+  class CustomContainerWithCustomStartedContainer extends GenericContainer {
+    public override async start(): Promise<CustomStartedContainer> {
+      return new CustomStartedContainer(await super.start());
+    }
+  }
+
+  class CustomStartedContainer extends AbstractStartedContainer {
+    protected override async containerStopping(): Promise<void> {
+      containerStopping();
+    }
+
+    protected override async containerStopped(): Promise<void> {
+      containerStopped();
+    }
+  }
+});

packages/testcontainers/src/generic-container/abstract-started-container.ts

@@ -12,7 +12,7 @@ export class AbstractStartedContainer implements StartedTestContainer {
       await this.containerStopping();
     }
 
-    const stoppedContainer = this.startedTestContainer.stop(options);
+    const stoppedContainer = await this.startedTestContainer.stop(options);
 
     if (this.containerStopped) {
       await this.containerStopped();
@@ -105,6 +105,6 @@ export class AbstractStartedContainer implements StartedTestContainer {
   }
 
   async [Symbol.asyncDispose]() {
-    await this.startedTestContainer[Symbol.asyncDispose]();
+    await this.stop();
   }
 }