Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ public WireMockServer createWireMockServer(

final int serverHttpPort = portResolver.getServerHttpPortProperty(options);
final boolean httpEnabled = serverHttpPort != PORT_DISABLED;
serverOptions.httpDisabled(!httpEnabled);
if (httpEnabled) {
serverOptions.port(serverHttpPort);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,18 +88,21 @@ private void configureWireMockForDefaultInstance(final ExtensionContext extensio
}
}
if (wiremock != null) {
final boolean isHttps = wiremock.isHttpsEnabled();
final int port = isHttps ? wiremock.httpsPort() : wiremock.port();

LOGGER.info(
"Configuring WireMock for default instance, '"
+ wireMockName
+ "' on '"
+ wiremock.port()
+ port
+ "'.");
final String host = "localhost";
if (wiremock.isHttpsEnabled()) {
if (isHttps) {
WireMock.configureFor(
WireMock.create().https().host(host).port(wiremock.httpsPort()).build());
WireMock.create().https().host(host).port(port).build());
} else {
WireMock.configureFor(WireMock.create().http().host(host).port(wiremock.port()).build());
WireMock.configureFor(WireMock.create().http().host(host).port(port).build());
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl;
import static com.github.tomakehurst.wiremock.client.WireMock.get;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

import com.github.tomakehurst.wiremock.WireMockServer;
import com.github.tomakehurst.wiremock.client.WireMock;
Expand Down Expand Up @@ -59,4 +60,10 @@ void testDefaultClient() {

assertThat(WireMock.findAll(anyRequestedFor(anyUrl()))).hasSize(1);
}

@Test
void testHttpDisabled() {
assertThat(wiremock.isHttpEnabled()).isFalse();
assertThatThrownBy(() -> wiremock.port()).isExactlyInstanceOf(IllegalStateException.class);
}
}
Loading