Skip to content

Minor test framework enhancements #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sergeytrasko merged 2 commits into from
Oct 25, 2018
Merged

Minor test framework enhancements #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85f2256
--Added new cukes option 'follow_redirects'
Oct 23, 2018
4fbc434
--Added @InflateContext to lv.ctco.cukes.rest.api.MockGivenSteps
Oct 24, 2018
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
2 changes: 2 additions & 0 deletions cukes-core/src/main/java/lv/ctco/cukes/core/CukesOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
2 changes: 2 additions & 0 deletions cukes-http-mock/src/main/java/lv/ctco/cukes/http/mock/api/MockGivenSteps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@
import com.google.inject.Inject;
import com.google.inject.Singleton;
import cucumber.api.java.en.Given;
import lv.ctco.cukes.core.internal.context.InflateContext;
import lv.ctco.cukes.core.internal.resources.ResourceFileReader;
import lv.ctco.cukes.http.mock.facade.HttpMockFacade;

@Singleton
@InflateContext
public class MockGivenSteps {

@Inject
Expand Down
4 changes: 4 additions & 0 deletions cukes-http-mock/src/main/java/lv/ctco/cukes/http/mock/internal/MockClientServerFacade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,8 @@ public void stopAllServers() {
public void resetAllServers() {
// servers.reset();
}

public void shutDownAllServers() {
servers.values().forEach(server -> server.stop(true));
}
}
4 changes: 3 additions & 1 deletion cukes-http/src/main/java/lv/ctco/cukes/http/RestAssuredConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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));
}
Expand Down
2 changes: 2 additions & 0 deletions cukes-rest/src/main/java/lv/ctco/cukes/rest/api/WhenSteps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down