From 547c624def9b0ee02ea14ab20b0f350be98e855d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Oct 2024 13:42:17 +0000
Subject: [PATCH 1/4] build(deps): bump protobufVersion from 4.27.2 to 4.27.3
 (via #1120)

---
 allure-grpc/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-grpc/build.gradle.kts b/allure-grpc/build.gradle.kts
index 54ed3b5d..4bc8d356 100644
--- 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")

From af64da0f016cb9fb48c5c7bb2bff0be990301bff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=9Cmit=20=C3=96zdemir?=
 <38186111+umitozdemirf@users.noreply.github.com>
Date: Fri, 29 Nov 2024 13:32:19 +0300
Subject: [PATCH 2/4] =?UTF-8?q?fix(allure-karate):=20fix=20duplicate=20sce?=
 =?UTF-8?q?narios=20when=20call=20or=20callonce=20keywords=20are=20used=20?=
 =?UTF-8?q?(fixes=C2=A0#1143,=20via=20#1144)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/qameta/allure/karate/AllureKarate.java  |  8 ++++++++
 .../io/qameta/allure/karate/AllureKarateTest.java   | 10 ++++++++++
 .../test/resources/testdata/call-callonce.feature   | 13 +++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 allure-karate/src/test/resources/testdata/call-callonce.feature

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 2c629a9f..6fa4e1cb 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
@@ -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
index a1cf77b3..fedbd276 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
@@ -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
new file mode 100644
index 00000000..e64bbf04
--- /dev/null
+++ 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.'

From be7a0084a2282e0f0cb029a00db9f374b3bc4aca Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Fri, 29 Nov 2024 10:36:30 +0000
Subject: [PATCH 3/4] release 2.29.1

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

diff --git a/gradle.properties b/gradle.properties
index 3d3a262a..2fc00469 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.30-SNAPSHOT
+version=2.29.1
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 5dc185e97f6caa041b3e0e07d5cf648e29280a44 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Fri, 29 Nov 2024 10:36:30 +0000
Subject: [PATCH 4/4] set next development version 2.30

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

diff --git a/gradle.properties b/gradle.properties
index 2fc00469..3d3a262a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.29.1
+version=2.30-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true