From 1f490e2108af08575cf7dca5a3adf44f80780acb Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Mon, 18 Mar 2024 12:28:15 +0000
Subject: [PATCH 1/7] set next development version 2.27

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index da7d49fc..e297ce89 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.26.0
+version=2.27-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 5591a12728041e1d779171d0bb2c466c28d27740 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Mon, 18 Mar 2024 16:38:38 +0000
Subject: [PATCH 2/7] feat(junit-platform): add annotations from outer classes
 (fixes #391, via #1019)

---
 .../junitplatform/AllureJunitPlatform.java    | 11 +++-
 .../AllureJunitPlatformTest.java              | 51 +++++++++++++++
 .../junitplatform/features/NestedTests.java   | 62 +++++++++++++++++++
 3 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/NestedTests.java

diff --git a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
index e48ee771..5bd8211d 100644
--- a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
+++ b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
@@ -553,7 +553,16 @@ private void startTestCase(final TestIdentifier testIdentifier) {
 
         result.getLabels().add(getJUnitPlatformUniqueId(testIdentifier));
 
-        testClass.map(AnnotationUtils::getLabels).ifPresent(result.getLabels()::addAll);
+        // add annotations from outer classes (support for @Nested tests in JUnit 5)
+        testClass.ifPresent(clazz -> {
+            Class<?> clazz1 = clazz;
+            do {
+                final Set<Label> labels = AnnotationUtils.getLabels(clazz1);
+                result.getLabels().addAll(labels);
+                clazz1 = clazz1.getDeclaringClass();
+            } while (Objects.nonNull(clazz1));
+        });
+
         testMethod.map(AnnotationUtils::getLabels).ifPresent(result.getLabels()::addAll);
 
         testClass.map(AnnotationUtils::getLinks).ifPresent(result.getLinks()::addAll);
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
index ceccd76b..9e9c1b82 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
@@ -28,6 +28,7 @@
 import io.qameta.allure.junitplatform.features.FailedTests;
 import io.qameta.allure.junitplatform.features.JupiterUniqueIdTest;
 import io.qameta.allure.junitplatform.features.MarkerAnnotationSupport;
+import io.qameta.allure.junitplatform.features.NestedTests;
 import io.qameta.allure.junitplatform.features.OneTest;
 import io.qameta.allure.junitplatform.features.OwnerTest;
 import io.qameta.allure.junitplatform.features.ParallelTests;
@@ -873,4 +874,54 @@ void shouldSetDifferentUuidsInDifferentRuns() {
 
     }
 
+    @Test
+    void shouldSupportNestedClasses() {
+        final AllureResults allureResults = runClasses(NestedTests.class);
+
+        assertThat(allureResults.getTestResults())
+                .extracting(TestResult::getName)
+                .containsExactlyInAnyOrder(
+                        "parentTest()",
+                        "feature1Test()",
+                        "feature2Test()",
+                        "story1Test()"
+                );
+
+        assertThat(allureResults.getTestResults())
+                .filteredOn("name", "parentTest()")
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("epic", "Parent epic"),
+                        tuple("feature", "Parent feature")
+                );
+
+        assertThat(allureResults.getTestResults())
+                .filteredOn("name", "feature1Test()")
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("epic", "Parent epic"),
+                        tuple("feature", "Feature 1")
+                );
+
+        assertThat(allureResults.getTestResults())
+                .filteredOn("name", "feature2Test()")
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("epic", "Parent epic"),
+                        tuple("feature", "Feature 2")
+                );
+
+        assertThat(allureResults.getTestResults())
+                .filteredOn("name", "story1Test()")
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("epic", "Parent epic"),
+                        tuple("feature", "Feature 2"),
+                        tuple("story", "Story 1")
+                );
+    }
 }
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/NestedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/NestedTests.java
new file mode 100644
index 00000000..55069931
--- /dev/null
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/NestedTests.java
@@ -0,0 +1,62 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junitplatform.features;
+
+import io.qameta.allure.Epic;
+import io.qameta.allure.Feature;
+import io.qameta.allure.Story;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+@Epic("Parent epic")
+public class NestedTests {
+
+    @Feature("Parent feature")
+    @Test
+    void parentTest() {
+    }
+
+    @Feature("Feature 1")
+    @Nested
+    class Feature1 {
+
+        @Test
+        void feature1Test() {
+        }
+    }
+
+    @Feature("Feature 2")
+    @Nested
+    class Feature2 {
+
+        @Test
+        void feature2Test() {
+        }
+
+        @Story("Story 1")
+        @Nested
+        class Story1 {
+
+            @Test
+            void story1Test() {
+            }
+
+        }
+    }
+}

From ed837de9008b36a503ff04995694db433c36bb3a Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Mon, 18 Mar 2024 16:38:55 +0000
Subject: [PATCH 3/7] fix(allure-karate): add history id (fixes #938, via
 #1018)

---
 .../io/qameta/allure/karate/AllureKarate.java | 39 ++++++++++++-------
 .../allure/karate/AllureKarateTest.java       | 32 ++++++++++-----
 2 files changed, 49 insertions(+), 22 deletions(-)

diff --git a/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java b/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java
index a300f0ec..310d6c75 100644
--- a/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java
+++ b/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java
@@ -57,6 +57,7 @@
 import static io.qameta.allure.util.ResultsUtils.createLabel;
 import static io.qameta.allure.util.ResultsUtils.createLink;
 import static io.qameta.allure.util.ResultsUtils.createParameter;
+import static io.qameta.allure.util.ResultsUtils.md5;
 
 /**
  * @author charlie (Dmitry Baev).
@@ -89,19 +90,22 @@ public AllureKarate(final AllureLifecycle lifecycle) {
     public boolean beforeScenario(final ScenarioRuntime sr) {
         final Feature feature = sr.featureRuntime.result.getFeature();
         final String featureName = feature.getName();
-        final String featureNameQualified = feature.getPackageQualifiedName();
+        final String featureNameQualified = feature.getResource().getRelativePath();
         final Scenario scenario = sr.scenario;
-        final String scenarioName = scenario.getName();
 
         final String uuid = UUID.randomUUID().toString();
         sr.magicVariables.put(ALLURE_UUID, uuid);
 
+        final String nameOrLine = getName(scenario, String.valueOf(scenario.getLine()));
+        final String testCaseId = md5(String.format("%s:%s", featureNameQualified, nameOrLine));
+        final String fullName = String.format("%s:%d", featureNameQualified, scenario.getLine());
         final TestResult result = new TestResult()
                 .setUuid(uuid)
-                .setFullName(String.format("%s | %s", featureNameQualified, scenarioName))
-                .setName(scenarioName)
+                .setFullName(fullName)
+                .setName(getName(scenario, fullName))
                 .setDescription(scenario.getDescription())
-                .setTestCaseId(scenario.getUniqueId())
+                .setTestCaseId(testCaseId)
+                .setHistoryId(md5(scenario.getUniqueId()))
                 .setStage(Stage.RUNNING);
 
         final List<String> labels = sr.tags.getTags();
@@ -119,6 +123,15 @@ public boolean beforeScenario(final ScenarioRuntime sr) {
         return true;
     }
 
+    private static String getName(final Scenario scenario, final String defaultValue) {
+        if (Objects.isNull(scenario.getName())) {
+            return defaultValue;
+        }
+        final boolean blank = scenario.getName().chars()
+                .allMatch(Character::isWhitespace);
+        return blank ? defaultValue : scenario.getName().trim();
+    }
+
     @Override
     public void afterScenario(final ScenarioRuntime sr) {
         final String uuid = (String) sr.magicVariables.get(ALLURE_UUID);
@@ -131,9 +144,9 @@ public void afterScenario(final ScenarioRuntime sr) {
         final Status status = !sr.isFailed()
                 ? Status.PASSED
                 : maybeResult
-                .map(ScenarioResult::getError)
-                .flatMap(ResultsUtils::getStatus)
-                .orElse(null);
+                        .map(ScenarioResult::getError)
+                        .flatMap(ResultsUtils::getStatus)
+                        .orElse(null);
 
         final StatusDetails statusDetails = maybeResult
                 .map(ScenarioResult::getError)
@@ -193,9 +206,9 @@ public void afterStep(final StepResult result,
         final Status status = !stepResult.isFailed()
                 ? Status.PASSED
                 : Optional.of(stepResult)
-                .map(Result::getError)
-                .flatMap(ResultsUtils::getStatus)
-                .orElse(null);
+                        .map(Result::getError)
+                        .flatMap(ResultsUtils::getStatus)
+                        .orElse(null);
 
         final StatusDetails statusDetails = Optional.of(stepResult)
                 .map(Result::getError)
@@ -209,8 +222,8 @@ public void afterStep(final StepResult result,
         lifecycle.stopStep(uuid);
 
         if (stepResult.isFailed()
-                && sr.engine.getConfig().getDriverOptions() != null
-                && (Boolean) sr.engine.getConfig().getDriverOptions().get("screenshotOnFailure")
+            && sr.engine.getConfig().getDriverOptions() != null
+            && (Boolean) sr.engine.getConfig().getDriverOptions().get("screenshotOnFailure")
         ) {
             addToStepsAndTcUuids(uuid, lifecycle.getCurrentTestCase().get());
             addToStepAndUuids(uuid, step);
diff --git a/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java b/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java
index 21fba0ec..a1cf77b3 100644
--- a/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java
+++ b/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java
@@ -28,6 +28,7 @@
 
 import static io.qameta.allure.model.Status.BROKEN;
 import static io.qameta.allure.model.Status.PASSED;
+import static io.qameta.allure.util.ResultsUtils.md5;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
 
@@ -46,11 +47,11 @@ void shouldCreateNameAndFullName() {
                 .containsExactlyInAnyOrder(
                         tuple(
                                 "Some api* request # comment 1",
-                                "testdata.description-and-name | Some api* request # comment 1"
+                                "testdata/description-and-name.feature:3"
                         ),
                         tuple(
-                                "",
-                                "testdata.description-and-name | "
+                                "testdata/description-and-name.feature:8",
+                                "testdata/description-and-name.feature:8"
                         )
                 );
     }
@@ -135,8 +136,8 @@ void shouldCreateTestCaseIdAndName() {
         assertThat(results.getTestResults())
                 .extracting(TestResult::getTestCaseId, TestResult::getTestCaseName)
                 .containsExactlyInAnyOrder(
-                        tuple("testdata.description-and-name_1", null),
-                        tuple("testdata.description-and-name_2", null)
+                        tuple(md5("testdata/description-and-name.feature:Some api* request # comment 1"), null),
+                        tuple(md5("testdata/description-and-name.feature:8"), null)
                 );
     }
 
@@ -147,9 +148,9 @@ void shouldCreateTestCaseIdAndNamesOfParametrizedTest() {
         assertThat(results.getTestResults())
                 .extracting(TestResult::getName, TestResult::getTestCaseId)
                 .containsExactlyInAnyOrder(
-                        tuple("/login should return 200", "testdata.parametrized-test_1_1"),
-                        tuple("/user should return 301", "testdata.parametrized-test_1_2"),
-                        tuple("/pages should return 404", "testdata.parametrized-test_1_3")
+                        tuple("/login should return 200", md5("testdata/parametrized-test.feature:/login should return 200")),
+                        tuple("/user should return 301", md5("testdata/parametrized-test.feature:/user should return 301")),
+                        tuple("/pages should return 404", md5("testdata/parametrized-test.feature:/pages should return 404"))
                 );
     }
 
@@ -164,7 +165,20 @@ void shouldCreateParamsForParametrizedTest() {
                 .containsExactlyInAnyOrder(
                         tuple("path", "login"),
                         tuple("status", "200")
-        );
+                );
+    }
+
+    @Test
+    void shouldCreateHistoryIdAndNamesOfParametrizedTest() {
+        final AllureResults results = runApi("classpath:testdata/parametrized-test.feature");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, TestResult::getHistoryId)
+                .containsExactlyInAnyOrder(
+                        tuple("/login should return 200", md5("testdata.parametrized-test_1_1")),
+                        tuple("/user should return 301", md5("testdata.parametrized-test_1_2")),
+                        tuple("/pages should return 404", md5("testdata.parametrized-test_1_3"))
+                );
     }
 
     @Test

From 6ff650ceaea205a825494f71d9704d2f1ee799ec Mon Sep 17 00:00:00 2001
From: Anton Filichkin <41286257+antonfilichkin@users.noreply.github.com>
Date: Fri, 22 Mar 2024 11:53:55 +0200
Subject: [PATCH 4/7] feat(rest-assured): add support for headers blacklist
 (via #1007)

---
 .../allure/restassured/AllureRestAssured.java | 20 ++++--
 .../restassured/AllureRestAssuredTest.java    | 64 ++++++++++++++++---
 2 files changed, 70 insertions(+), 14 deletions(-)

diff --git a/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java b/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java
index 49b4c203..9e166c30 100644
--- a/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java
+++ b/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java
@@ -28,8 +28,11 @@
 import io.restassured.specification.FilterableResponseSpecification;
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
+import java.util.TreeSet;
 
 import static io.qameta.allure.attachment.http.HttpRequestAttachment.Builder.create;
 import static io.qameta.allure.attachment.http.HttpResponseAttachment.Builder.create;
@@ -40,6 +43,8 @@
  */
 public class AllureRestAssured implements OrderedFilter {
 
+    private static final String HIDDEN_PLACEHOLDER = "[ BLACKLISTED ]";
+
     private String requestTemplatePath = "http-request.ftl";
     private String responseTemplatePath = "http-response.ftl";
     private String requestAttachmentName = "Request";
@@ -89,10 +94,14 @@ public Response filter(final FilterableRequestSpecification requestSpec,
                            final FilterContext filterContext) {
         final Prettifier prettifier = new Prettifier();
         final String url = requestSpec.getURI();
+
+        final Set<String> hiddenHeaders = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
+        hiddenHeaders.addAll(Objects.requireNonNull(requestSpec.getConfig().getLogConfig().blacklistedHeaders()));
+
         final HttpRequestAttachment.Builder requestAttachmentBuilder = create(requestAttachmentName, url)
                 .setMethod(requestSpec.getMethod())
-                .setHeaders(toMapConverter(requestSpec.getHeaders()))
-                .setCookies(toMapConverter(requestSpec.getCookies()));
+                .setHeaders(toMapConverter(requestSpec.getHeaders(), hiddenHeaders))
+                .setCookies(toMapConverter(requestSpec.getCookies(), new HashSet<>()));
 
         if (Objects.nonNull(requestSpec.getBody())) {
             requestAttachmentBuilder.setBody(prettifier.getPrettifiedBodyIfPossible(requestSpec));
@@ -116,7 +125,7 @@ public Response filter(final FilterableRequestSpecification requestSpec,
 
         final HttpResponseAttachment responseAttachment = create(attachmentName)
                 .setResponseCode(response.getStatusCode())
-                .setHeaders(toMapConverter(response.getHeaders()))
+                .setHeaders(toMapConverter(response.getHeaders(), hiddenHeaders))
                 .setBody(prettifier.getPrettifiedBodyIfPossible(response, response.getBody()))
                 .build();
 
@@ -128,9 +137,10 @@ public Response filter(final FilterableRequestSpecification requestSpec,
         return response;
     }
 
-    private static Map<String, String> toMapConverter(final Iterable<? extends NameAndValue> items) {
+    private static Map<String, String> toMapConverter(final Iterable<? extends NameAndValue> items,
+                                                      final Set<String> toHide) {
         final Map<String, String> result = new HashMap<>();
-        items.forEach(h -> result.put(h.getName(), h.getValue()));
+        items.forEach(h -> result.put(h.getName(), toHide.contains(h.getName()) ? HIDDEN_PLACEHOLDER : h.getValue()));
         return result;
     }
 
diff --git a/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java b/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java
index 1a58504c..61e2b4e8 100644
--- a/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java
+++ b/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java
@@ -24,7 +24,11 @@
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.test.AllureResults;
 import io.restassured.RestAssured;
+import io.restassured.config.LogConfig;
+import io.restassured.config.RestAssuredConfig;
 import io.restassured.http.ContentType;
+import io.restassured.specification.RequestSpecification;
+import java.nio.charset.StandardCharsets;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -32,9 +36,9 @@
 import org.junit.jupiter.params.provider.ArgumentsProvider;
 import org.junit.jupiter.params.provider.ArgumentsSource;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -55,10 +59,27 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
     }
 }
 
+class HiddenHeadersArgumentProvider implements ArgumentsProvider {
+    @Override
+    public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
+
+        final String hiddenHeader = "Authorization";
+        final String header = "Accept";
+        final String headerValue = "value";
+
+        final Map<String, String> headers = Map.of(hiddenHeader, headerValue, header, headerValue);
+        final List<String> expectedHeaders = List.of(hiddenHeader + ": [ BLACKLISTED ]", header + ": " + headerValue);
+
+        return Stream.of(
+                arguments(headers, hiddenHeader, expectedHeaders, new AllureRestAssured()),
+                arguments(headers, hiddenHeader.toUpperCase(), expectedHeaders, new AllureRestAssured())
+        );
+    }
+}
+
 /**
  * @author charlie (Dmitry Baev).
  */
-@SuppressWarnings("unchecked")
 class AllureRestAssuredTest {
 
     @ParameterizedTest
@@ -72,7 +93,7 @@ void shouldCreateAttachment(final List<String> attachmentNames, final AllureRest
                 .map(TestResult::getAttachments)
                 .flatMap(Collection::stream)
                 .map(Attachment::getName))
-                .isEqualTo(attachmentNames);
+                .containsExactlyElementsOf(attachmentNames);
     }
 
     @Test
@@ -122,21 +143,46 @@ void shouldCatchAttachmentBody(final List<String> attachmentNames, final AllureR
                 .collect(Collectors.toList());
 
         assertThat(actualAttachments)
-                .flatExtracting(Attachment::getName)
-                .isEqualTo(attachmentNames)
+                .map(Attachment::getName)
+                .containsExactlyElementsOf(attachmentNames)
                 .doesNotContainNull();
 
         assertThat(actualAttachments)
-                .flatExtracting(Attachment::getSource)
-                .containsExactlyInAnyOrderElementsOf(new ArrayList<>(results.getAttachments().keySet()))
+                .map(Attachment::getSource)
+                .containsExactlyInAnyOrderElementsOf(results.getAttachments().keySet())
                 .doesNotContainNull();
     }
 
+    @ParameterizedTest
+    @ArgumentsSource(HiddenHeadersArgumentProvider.class)
+    void shouldHideHeadersInAttachments(final Map<String, String> headers,
+                                        final String hiddenHeader,
+                                        final List<String> expectedValues,
+                                        final AllureRestAssured filter) {
+
+        final ResponseDefinitionBuilder responseBuilder = WireMock.aResponse().withStatus(200);
+        headers.forEach(responseBuilder::withHeader);
+
+        RestAssured.config = new RestAssuredConfig().logConfig(LogConfig.logConfig().blacklistHeaders(List.of(hiddenHeader)));
+        RestAssured.replaceFiltersWith(filter);
+
+        final AllureResults results = executeWithStub(responseBuilder, RestAssured.with().headers(headers));
+
+        assertThat(results.getAttachments().values())
+                .hasSize(2)
+                .map(at -> new String(at, StandardCharsets.UTF_8))
+                .allSatisfy(at -> expectedValues.forEach(ev -> assertThat(at).contains(ev)));
+    }
+
     protected final AllureResults execute() {
         return executeWithStub(WireMock.aResponse().withBody("some body"));
     }
 
     protected final AllureResults executeWithStub(ResponseDefinitionBuilder responseBuilder) {
+        return executeWithStub(responseBuilder, RestAssured.given());
+    }
+
+    protected final AllureResults executeWithStub(ResponseDefinitionBuilder responseBuilder, RequestSpecification spec) {
         final WireMockServer server = new WireMockServer(WireMockConfiguration.options().dynamicPort());
         final int statusCode = responseBuilder.build().getStatus();
 
@@ -146,13 +192,13 @@ protected final AllureResults executeWithStub(ResponseDefinitionBuilder response
 
             WireMock.stubFor(WireMock.get(WireMock.urlEqualTo("/hello?Allure=Form")).willReturn(responseBuilder));
             try {
-                RestAssured.given()
-                    .contentType(ContentType.URLENC)
+                spec.contentType(ContentType.URLENC)
                     .formParams("Allure", "Form")
                     .get(server.url("/hello")).then().statusCode(statusCode);
             } finally {
                 server.stop();
                 RestAssured.replaceFiltersWith(ImmutableList.of());
+                RestAssured.config = new RestAssuredConfig();
             }
         });
     }

From c2268cb5659c1e236d1751cd80755c00280fd093 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Tue, 26 Mar 2024 13:45:54 +0400
Subject: [PATCH 5/7] fix jbehave runtime api (via #1022)

---
 .../allure/jbehave5/AllureJbehave5.java       |  7 ++-
 .../allure/jbehave5/AllureJbehave5Test.java   | 47 ++++++++++++++++++-
 .../jbehave5/samples/RuntimeApiSteps.java     | 34 ++++++++++++++
 .../test/resources/stories/runtimeapi.story   |  3 ++
 4 files changed, 88 insertions(+), 3 deletions(-)
 create mode 100644 allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/RuntimeApiSteps.java
 create mode 100644 allure-jbehave5/src/test/resources/stories/runtimeapi.story

diff --git a/allure-jbehave5/src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java b/allure-jbehave5/src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java
index 266fbf62..5ef296db 100644
--- a/allure-jbehave5/src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java
+++ b/allure-jbehave5/src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java
@@ -24,6 +24,7 @@
 import io.qameta.allure.model.StatusDetails;
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.model.TestResult;
+import io.qameta.allure.util.ResultsUtils;
 import org.jbehave.core.failures.UUIDExceptionWrapper;
 import org.jbehave.core.model.ExamplesTable;
 import org.jbehave.core.model.Scenario;
@@ -227,13 +228,15 @@ protected void startTestCase(final String uuid,
                 .map(entry -> createParameter(entry.getKey(), entry.getValue()))
                 .collect(Collectors.toList());
 
-        final List<Label> labels = Arrays.asList(
+        final List<Label> labels = new ArrayList<>(Arrays.asList(
                 createStoryLabel(story.getName()),
                 createHostLabel(),
                 createThreadLabel(),
                 createFrameworkLabel("jbehave"),
                 createLanguageLabel("java")
-        );
+        ));
+
+        labels.addAll(ResultsUtils.getProvidedLabels());
 
         final String historyId = getHistoryId(fullName, parameters);
 
diff --git a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java
index 387f9455..54bff8ab 100644
--- a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java
+++ b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java
@@ -17,7 +17,10 @@
 
 import io.qameta.allure.Issue;
 import io.qameta.allure.jbehave5.samples.BrokenStorySteps;
+import io.qameta.allure.jbehave5.samples.RuntimeApiSteps;
 import io.qameta.allure.jbehave5.samples.SimpleStorySteps;
+import io.qameta.allure.model.Attachment;
+import io.qameta.allure.model.Label;
 import io.qameta.allure.model.Parameter;
 import io.qameta.allure.model.Stage;
 import io.qameta.allure.model.Status;
@@ -259,6 +262,47 @@ void shouldNotFailIfGivenStoriesSpecified() {
 
     }
 
+    @Test
+    void shouldSupportRuntimeApiInSteps() {
+        final AllureResults results = runStories("stories/runtimeapi.story");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactly(tuple("Runtime API", Status.PASSED));
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "Runtime API")
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("jbehave-test-label", "some-value")
+                );
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "Runtime API")
+                .flatExtracting(TestResult::getSteps)
+                .filteredOn("name", "Given runtime api")
+                .flatExtracting(StepResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactlyInAnyOrder("sub step 1", "sub step 2");
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "Runtime API")
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue)
+                .containsExactlyInAnyOrder(
+                        tuple("test param", "param value")
+                );
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "Runtime API")
+                .flatExtracting(TestResult::getSteps)
+                .filteredOn("name", "Given runtime api")
+                .flatExtracting(StepResult::getAttachments)
+                .extracting(Attachment::getName)
+                .containsExactlyInAnyOrder("some attachment");
+    }
+
     private AllureResults runStories(final String... storyResources) {
         return RunUtils.runTests(lifecycle -> {
             final Embedder embedder = new Embedder();
@@ -283,7 +327,8 @@ private AllureResults runStories(final String... storyResources) {
             final InjectableStepsFactory stepsFactory = new InstanceStepsFactory(
                     embedder.configuration(),
                     new SimpleStorySteps(),
-                    new BrokenStorySteps()
+                    new BrokenStorySteps(),
+                    new RuntimeApiSteps()
             );
             embedder.useStepsFactory(stepsFactory);
             embedder.runStoriesAsPaths(Arrays.asList(storyResources));
diff --git a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/RuntimeApiSteps.java b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/RuntimeApiSteps.java
new file mode 100644
index 00000000..9711b4ca
--- /dev/null
+++ b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/RuntimeApiSteps.java
@@ -0,0 +1,34 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.jbehave5.samples;
+
+import io.qameta.allure.Allure;
+import org.jbehave.core.annotations.Given;
+
+public class RuntimeApiSteps {
+
+    @Given("runtime api")
+    public void given() {
+        Allure.label("jbehave-test-label", "some-value");
+        Allure.parameter("test param", "param value");
+        Allure.step("sub step 1");
+        Allure.step("sub step 2", () -> {
+        });
+
+        Allure.addAttachment("some attachment", "some content");
+    }
+
+}
diff --git a/allure-jbehave5/src/test/resources/stories/runtimeapi.story b/allure-jbehave5/src/test/resources/stories/runtimeapi.story
new file mode 100644
index 00000000..305c5ae1
--- /dev/null
+++ b/allure-jbehave5/src/test/resources/stories/runtimeapi.story
@@ -0,0 +1,3 @@
+Scenario: Runtime API
+
+Given runtime api

From 852a7baecb0193e2fdf45642d69443bb40856c71 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Wed, 3 Apr 2024 14:37:33 +0100
Subject: [PATCH 6/7] fix(jbehave5): enable step & attachment aspects (via
 #1026)

---
 allure-jbehave5/src/main/resources/META-INF/aop-ajc.xml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 allure-jbehave5/src/main/resources/META-INF/aop-ajc.xml

diff --git a/allure-jbehave5/src/main/resources/META-INF/aop-ajc.xml b/allure-jbehave5/src/main/resources/META-INF/aop-ajc.xml
new file mode 100644
index 00000000..09e38300
--- /dev/null
+++ b/allure-jbehave5/src/main/resources/META-INF/aop-ajc.xml
@@ -0,0 +1,7 @@
+<aspectj>
+    <weaver options="-warn:none -Xlint:ignore"/>
+    <aspects>
+        <aspect name="io.qameta.allure.aspects.StepsAspects"/>
+        <aspect name="io.qameta.allure.aspects.AttachmentsAspects"/>
+    </aspects>
+</aspectj>

From 397ea0a7cd1c15208e75abaac56fafcee3534889 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Mon, 8 Apr 2024 15:19:05 +0000
Subject: [PATCH 7/7] release 2.27.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index e297ce89..c5f5a795 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.27-SNAPSHOT
+version=2.27.0
 
 org.gradle.daemon=true
 org.gradle.parallel=true