Merge branch 'main' of https://github.com/allure-framework/allure-java …

…into package-annotations
allure-framework · Jan 23, 2025 · 9f4b498 · 9f4b498
2 parents ea39035 + 5dc185e
commit 9f4b498
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 1 deletion.
diff --git a/allure-grpc/build.gradle.kts b/allure-grpc/build.gradle.kts
@@ -9,7 +9,7 @@ description = "Allure gRPC Integration"
 val agent: Configuration by configurations.creating
 
 val grpcVersion = "1.57.2"
-val protobufVersion = "4.27.2"
+val protobufVersion = "4.27.3"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

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
@@ -173,6 +173,10 @@ public boolean beforeStep(final Step step,
             return true;
         }
 
+        if (step.getText().startsWith("call") || step.getText().startsWith("callonce")) {
+            return true;
+        }
+
         final String uuid = parentUuid + "-" + step.getIndex();
         final io.qameta.allure.model.StepResult stepResult = new io.qameta.allure.model.StepResult()
                 .setName(step.getText());
@@ -191,6 +195,10 @@ public void afterStep(final StepResult result,
         }
 
         final Step step = result.getStep();
+        if (step.getText().startsWith("call") || step.getText().startsWith("callonce")) {
+            return;
+        }
+
         final String uuid = parentUuid + "-" + step.getIndex();
 
         final Result stepResult = result.getResult();

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
@@ -322,6 +322,16 @@ void shouldCreateAttachments() {
                 .isGreaterThan(Long.parseLong(firstAttachmentDateCreated));
     }
 
+    @Test
+    void shouldSkipCallAndCallOnceStepsInBeforeStep() {
+        final AllureResults results = runApi("classpath:testdata/call-callonce.feature");
+
+        assertThat(results.getTestResults())
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
+                .doesNotContain("call", "callonce");
+    }
+
     @Test
     void buildTest() {
         Runner.builder()

diff --git a/allure-karate/src/test/resources/testdata/call-callonce.feature b/allure-karate/src/test/resources/testdata/call-callonce.feature
@@ -0,0 +1,13 @@
+Feature: Call & Call once Feature
+  This feature calls another feature and demonstrates Allure reporting issue.
+
+  @smoke
+  Scenario: Main Scenario with a call
+    Given url 'https://jsonplaceholder.typicode.com'
+    When method GET
+    Then status 200
+
+    * call read('classpath:testdata/apiResponse.feature')
+    * callonce read('classpath:testdata/api.feature')
+
+    Then print 'Main scenario completed.'