--Added new cukes option 'follow_redirects'

--Added new method shutDownAllServers() to MockClientServerFacade that stops all mock services --Added @InflateContext to lv.ctco.cukes.rest.api.WhenSteps
avyas · Oct 23, 2018 · 85f2256 · 85f2256
1 parent cd61e2e
commit 85f2256
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/cukes-core/src/main/java/lv/ctco/cukes/core/CukesOptions.java b/cukes-core/src/main/java/lv/ctco/cukes/core/CukesOptions.java
@@ -33,4 +33,6 @@ public interface CukesOptions {
     String CONTEXT_INFLATING_ENABLED = "context_inflating_enabled";
     String ASSERTIONS_DISABLED = "assertions_disabled";
     String LOADRUNNER_FILTER_BLOCKS_REQUESTS = "loadrunner_filter_blocks_requests";
+
+    String FOLLOW_REDIRECTS = "follow_redirects";
 }
diff --git a/cukes-http-mock/src/main/java/lv/ctco/cukes/http/mock/internal/MockClientServerFacade.java b/cukes-http-mock/src/main/java/lv/ctco/cukes/http/mock/internal/MockClientServerFacade.java
@@ -74,4 +74,8 @@ public void stopAllServers() {
     public void resetAllServers() {
 //        servers.reset();
     }
+
+    public void shutDownAllServers() {
+        servers.values().forEach(server -> server.stop(true));
+    }
 }
diff --git a/cukes-http/src/main/java/lv/ctco/cukes/http/RestAssuredConfiguration.java b/cukes-http/src/main/java/lv/ctco/cukes/http/RestAssuredConfiguration.java
@@ -11,6 +11,7 @@
 import static io.restassured.config.DecoderConfig.ContentDecoder.DEFLATE;
 import static io.restassured.config.DecoderConfig.decoderConfig;
 import static io.restassured.config.JsonConfig.jsonConfig;
+import static io.restassured.config.RedirectConfig.redirectConfig;
 import static io.restassured.config.RestAssuredConfig.newConfig;
 
 @Singleton
@@ -29,7 +30,8 @@ public RestAssuredConfig getConfig() {
     }
 
     private RestAssuredConfig buildRestAssuredConfig() {
-        RestAssuredConfig config = newConfig().jsonConfig(jsonConfig().numberReturnType(JsonPathConfig.NumberReturnType.BIG_DECIMAL));
+        RestAssuredConfig config = newConfig().jsonConfig(jsonConfig().numberReturnType(JsonPathConfig.NumberReturnType.BIG_DECIMAL))
+            .redirect(redirectConfig().followRedirects(world.getBoolean(CukesOptions.FOLLOW_REDIRECTS, true)));
         if (!world.getBoolean(CukesOptions.GZIP_SUPPORT, true)) {
             config.decoderConfig(decoderConfig().contentDecoders(DEFLATE));
         }

diff --git a/cukes-rest/src/main/java/lv/ctco/cukes/rest/api/WhenSteps.java b/cukes-rest/src/main/java/lv/ctco/cukes/rest/api/WhenSteps.java
@@ -3,9 +3,11 @@
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import cucumber.api.java.en.When;
+import lv.ctco.cukes.core.internal.context.InflateContext;
 import lv.ctco.cukes.http.facade.HttpResponseFacade;
 
 @Singleton
+@InflateContext
 public class WhenSteps {
 
     @Inject