Merge branch '2.2.x'

2020-02-12 17:34:31 +01:00
parent eeb2d87c14 9d7f64c9b5
commit cb7b298d5c
78 changed files with 1623 additions and 18 deletions
--- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java
+++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java
@@ -157,7 +157,11 @@ public class WireMockConfiguration implements SmartLifecycle {
 	void resetMappings() {
 		if (this.server.isRunning()) {
 			this.server.resetAll();
+			this.server.resetRequests();
+			this.server.resetScenarios();
 			WireMock.reset();
+			WireMock.resetAllRequests();
+			WireMock.resetAllScenarios();
 			registerStubs();
 			logRegisteredMappings();
 		}