From 686028be9811b9a553ad4ded58ced3c52a11e440 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Thu, 26 Oct 2023 16:40:05 +0100
Subject: [PATCH] fix(spock2): add support for test tags (via #974)

---
 .../io/qameta/allure/spock2/AllureSpock2.java |  7 ++++
 .../allure/spock2/AllureSpock2Test.java       | 14 ++++++++
 .../allure/spock2/samples/SpockTags.groovy    | 32 +++++++++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpockTags.groovy

diff --git a/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java b/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
index c7be6decc..9c973b7de 100644
--- a/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
+++ b/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
@@ -42,6 +42,7 @@
 import org.spockframework.runtime.model.MethodInfo;
 import org.spockframework.runtime.model.MethodKind;
 import org.spockframework.runtime.model.SpecInfo;
+import org.spockframework.runtime.model.TestTag;
 
 import java.lang.reflect.Method;
 import java.security.MessageDigest;
@@ -185,6 +186,12 @@ public void beforeIteration(final IterationInfo iteration) {
             labels.add(createParentSuiteLabel(superSpec.getName()));
         }
 
+        final List<Label> testTags = feature.getTestTags().stream()
+                .map(TestTag::getValue)
+                .map(ResultsUtils::createTagLabel)
+                .collect(Collectors.toList());
+
+        labels.addAll(testTags);
         labels.addAll(featureLabels);
         labels.addAll(specLabels);
         labels.addAll(getProvidedLabels());
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
index 6f1444615..38fa96dc1 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
@@ -39,6 +39,7 @@
 import io.qameta.allure.spock2.samples.OneTest;
 import io.qameta.allure.spock2.samples.ParametersTest;
 import io.qameta.allure.spock2.samples.SpecFixtures;
+import io.qameta.allure.spock2.samples.SpockTags;
 import io.qameta.allure.spock2.samples.StepsAndBlocks;
 import io.qameta.allure.spock2.samples.TestWithAnnotations;
 import io.qameta.allure.spock2.samples.TestWithAnnotationsOnClass;
@@ -219,6 +220,19 @@ void shouldProcessMethodAnnotations() {
                 );
     }
 
+    @Test
+    void shouldProcessSpockTags() {
+        final AllureResults results = runClasses(SpockTags.class);
+        assertThat(results.getTestResults())
+                .hasSize(1)
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("tag", "first"),
+                        tuple("tag", "second")
+                );
+    }
+
     @Test
     void shouldProcessClassAnnotations() {
         final AllureResults results = runClasses(TestWithAnnotationsOnClass.class);
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpockTags.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpockTags.groovy
new file mode 100644
index 000000000..7bcf50ff2
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpockTags.groovy
@@ -0,0 +1,32 @@
+/*
+ *  Copyright 2019 Qameta Software OÜ
+ *
+ *  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.spock2.samples
+
+import spock.lang.Specification
+import spock.lang.Tag
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+class SpockTags extends Specification {
+
+    @Tag("first")
+    @Tag("second")
+    def "someTest"() {
+        expect:
+        true
+    }
+}