Triggers once.

Author: atrauzzi

test/e2e/jobs/jobs.test.ts

@@ -13,23 +13,23 @@ limitations under the License.
 
 import { GenericContainer, Network, StartedNetwork, StartedTestContainer, TestContainers, Wait } from "testcontainers";
 // import { LogWaitStrategy } from "testcontaineclienrs/build/wait-strategies/log-wait-strategy";
-import { CommunicationProtocolEnum, DaprClient, DaprServer } from "../../../src";
+import { CommunicationProtocolEnum, DaprServer } from "../../../src";
+import express from "express";
+import http from "http";
+import fetch from "node-fetch";
 // import { AbstractWaitStrategy } from "testcontainers/build/wait-strategies/wait-strategy";
 
-jest.setTimeout(40 * 1000);
+jest.setTimeout(120 * 1000);
 
 describe("Jobs End to End", () => {
 
     let network: StartedNetwork | null = null;
     let daprScheduler: StartedTestContainer | null = null;
     let daprd: StartedTestContainer | null = null;
     let server: DaprServer | null = null;
-    let client: DaprClient | null = null;
 
     beforeAll(async () => {
 
-      await TestContainers.exposeHostPorts(8070);
-
       network = await new Network().start();
 
       daprScheduler = await (new GenericContainer("ghcr.io/dapr/dapr")
@@ -51,8 +51,17 @@ describe("Jobs End to End", () => {
         })
         // note: Because dapr containers don't have `sh` or `bash` inside, this is kind of the best health check.
         .withWaitStrategy(Wait.forLogMessage("api is ready").withStartupTimeout(10000))
+        // .withWaitStrategy(Wait.forHttp("/v1.0/healthz/outbound", 8082)
+        //   .forStatusCodeMatching((statusCode) => statusCode >= 200 && statusCode <= 399))
+        // .withStartupTimeout(120_000)
         .start());
 
+        const dummyExpress = createDummyExpress(8070);
+
+        console.info("Exposing 8070.")
+        await TestContainers.exposeHostPorts(8070);
+        console.info("8070 exposed.")
+
         daprd = await (new GenericContainer("ghcr.io/dapr/dapr")
           .withName("dapr-js-sdk-test-daemon")
           .withNetwork(network)
@@ -62,6 +71,7 @@ describe("Jobs End to End", () => {
             "./daprd",
             "--app-id", "dapr-js-sdk-testing",
             "--app-channel-address", "host.testcontainers.internal",
+            "--app-protocol", "http",
             "--app-port", "8070",
             "--dapr-grpc-port", "8081",
             "--dapr-http-port", "8082",
@@ -74,6 +84,8 @@ describe("Jobs End to End", () => {
           .withWaitStrategy(Wait.forLogMessage("HTTP server is running on port").withStartupTimeout(10000))
           .start());
 
+      dummyExpress.close();
+
       console.info(`Scheduler: ${getIp(daprScheduler)}`);
       console.info(`Daemon: ${getIp(daprd)}`);
 
@@ -87,12 +99,6 @@ describe("Jobs End to End", () => {
           communicationProtocol: CommunicationProtocolEnum.HTTP,
         },
       });
-
-      client = new DaprClient({
-        daprHost: "localhost",
-        daprPort: getPort(daprd, 8082),
-        communicationProtocol: CommunicationProtocolEnum.HTTP,
-      });
     });
 
     afterAll(async () => {
@@ -110,17 +116,20 @@ describe("Jobs End to End", () => {
 
       await server?.start();
 
-      await client?.jobs.schedule(
+      await server?.client.jobs.schedule(
         "test",
         { value: "test" },
         "* * * * * *"
       );
 
       const job = await server?.client.jobs.get("test");
 
-      await (new Promise(resolve => setTimeout(resolve, 6000)));
+      console.log("Waiting...");
+      await (new Promise(resolve => setTimeout(resolve, 10000)));
+      console.log("Done waiting.");
 
-      await client?.jobs.delete("test");
+      await server?.stop();
+      await server?.client.jobs.delete("test");
 
       expect(job).toMatchObject({
         "data": {
@@ -151,4 +160,11 @@ describe("Jobs End to End", () => {
 
     return container.getMappedPort(port).toString();
   }
+
+  function createDummyExpress(port: number): http.Server {
+
+    const expressApp = express();
+
+    return expressApp.listen(port);
+  }
 })