Skip to content

Made the request body optional for RestAssuredFilter (fixes #125) #142

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
baev merged 2 commits into from
Sep 28, 2017
Merged

Made the request body optional for RestAssuredFilter (fixes #125) #142

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a05aba2
Allure rest-assured filter doesn't requires body for a request
krasilnikov-dmitriy Sep 1, 2017
c76d923
Merge branch 'master' into issue-125
baev Sep 28, 2017
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
14 changes: 10 additions & 4 deletions allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

import java.util.HashMap;
import java.util.Map;
import java.util.Objects;

import static io.qameta.allure.attachment.http.HttpRequestAttachment.Builder.create;
import static io.qameta.allure.attachment.http.HttpResponseAttachment.Builder.create;
Expand All @@ -29,12 +30,17 @@ public Response filter(final FilterableRequestSpecification requestSpec,
final FilterContext filterContext) {
final Prettifier prettifier = new Prettifier();

final HttpRequestAttachment requestAttachment = create("Request", requestSpec.getURI())
.withBody(prettifier.getPrettifiedBodyIfPossible(requestSpec))

final HttpRequestAttachment.Builder requestAttachmentBuilder = create("Request", requestSpec.getURI())
.withMethod(requestSpec.getMethod())
.withHeaders(toMapConverter(requestSpec.getHeaders()))
.withCookies(toMapConverter(requestSpec.getCookies()))
.build();
.withCookies(toMapConverter(requestSpec.getCookies()));

if (Objects.nonNull(requestSpec.getBody())) {
requestAttachmentBuilder.withBody(prettifier.getPrettifiedBodyIfPossible(requestSpec));
}

final HttpRequestAttachment requestAttachment = requestAttachmentBuilder.build();

new DefaultAttachmentProcessor().addAttachment(
requestAttachment,
Expand Down