diff --git a/src/main/java/com/codeborne/selenide/proxy/SelenideProxyServer.java b/src/main/java/com/codeborne/selenide/proxy/SelenideProxyServer.java index de0b677d7d..93502cfcca 100644 --- a/src/main/java/com/codeborne/selenide/proxy/SelenideProxyServer.java +++ b/src/main/java/com/codeborne/selenide/proxy/SelenideProxyServer.java @@ -157,7 +157,7 @@ private Proxy createSeleniumProxy() { public void shutdown() { if (proxy.isStarted()) { try { - proxy.abort(); + proxy.stop(); } catch (IllegalStateException ignore) { } diff --git a/src/test/java/com/codeborne/selenide/proxy/SelenideProxyServerTest.java b/src/test/java/com/codeborne/selenide/proxy/SelenideProxyServerTest.java index c4d2cfc0ea..93eca8dad1 100644 --- a/src/test/java/com/codeborne/selenide/proxy/SelenideProxyServerTest.java +++ b/src/test/java/com/codeborne/selenide/proxy/SelenideProxyServerTest.java @@ -74,7 +74,7 @@ void canChainProxyServersWithEmptyNoProxySettings() { void canShutdownProxyServer() { when(bmp.isStarted()).thenReturn(true); proxyServer.shutdown(); - verify(bmp).abort(); + verify(bmp).stop(); } @Test diff --git a/src/test/java/integration/server/LocalHttpServer.java b/src/test/java/integration/server/LocalHttpServer.java index 94c4b7bff4..8c6c6e4ffe 100644 --- a/src/test/java/integration/server/LocalHttpServer.java +++ b/src/test/java/integration/server/LocalHttpServer.java @@ -68,6 +68,10 @@ public LocalHttpServer start() throws Exception { return this; } + public void stop() throws Exception { + server.stop(); + } + public static LocalHttpServer startWithRetry(boolean ssl) throws Exception { IOException lastError = null; for (int i = 0; i < 5; i++) {