Merge pull request #35 from bitxon/bugfix/allow-to-override-waiting-strategy

oleg-nenashev · web-flow · commit b610044d1d78 · 2023-05-08T21:16:07.000+02:00
Allow to override waiting strategy and waiting time
diff --git a/src/main/java/org/wiremock/integrations/testcontainers/WireMockContainer.java b/src/main/java/org/wiremock/integrations/testcontainers/WireMockContainer.java
@@ -77,6 +77,7 @@ public WireMockContainer(String version) {
     public WireMockContainer(String image, String version) {
         super(image + ":" + version);
         wireMockArgs = new StringBuilder();
+        setWaitStrategy(DEFAULT_WAITER);
     }
 
     /**
@@ -200,7 +201,6 @@ public Integer getServerPort() {
     protected void configure() {
         super.configure();
         withExposedPorts(PORT);
-        waitingFor(DEFAULT_WAITER);
         for (Stub stub : mappingStubs.values()) {
             withCopyToContainer(Transferable.of(stub.json), MAPPINGS_DIR + stub.name + ".json");
         }

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ public WireMockContainer(String version) {`
`77`	`77`	`public WireMockContainer(String image, String version) {`
`78`	`78`	`super(image + ":" + version);`
`79`	`79`	`wireMockArgs = new StringBuilder();`
	`80`	`+ setWaitStrategy(DEFAULT_WAITER);`
`80`	`81`	`}`
`81`	`82`
`82`	`83`	`/**`
`@@ -200,7 +201,6 @@ public Integer getServerPort() {`
`200`	`201`	`protected void configure() {`
`201`	`202`	`super.configure();`
`202`	`203`	`withExposedPorts(PORT);`
`203`		`- waitingFor(DEFAULT_WAITER);`
`204`	`204`	`for (Stub stub : mappingStubs.values()) {`
`205`	`205`	`withCopyToContainer(Transferable.of(stub.json), MAPPINGS_DIR + stub.name + ".json");`
`206`	`206`	`}`