Make @issue repeatable (#1189)

Fixes #1030

Author: Vampire

docs/extensions.adoc

@@ -490,14 +490,7 @@ To indicate that a feature or spec relates to one or more issues in an external
 
 [source,groovy]
 ----
-@Issue("http://my.issues.org/FOO-1")
-class MySpec {
-  @Issue("http://my.issues.org/FOO-2")
-  def "Foo should do bar"() { ... }
-
-  @Issue(["http://my.issues.org/FOO-3", "http://my.issues.org/FOO-4"])
-  def "I have two related issues"() { ... }
-}
+include::{sourcedir}/extension/IssueDocSpec.groovy[tag=example]
 ----
 
 If you have a common prefix URL for all issues in a project, you can use the <<Spock Configuration File>> to set it up

docs/release_notes.adoc

@@ -14,6 +14,8 @@ include::include.adoc[]
 
 - `@ConfineMetaClassChanges` is now repeatable
 
+- `@Issue` is now repeatable
+
 
 == 2.0-M3 (2020-06-11)
 

spock-core/src/main/java/spock/lang/Issue.java

@@ -18,6 +18,7 @@
 
 import org.spockframework.runtime.extension.ExtensionAnnotation;
 import org.spockframework.runtime.extension.builtin.IssueExtension;
+import org.spockframework.util.Beta;
 
 import java.lang.annotation.*;
 
@@ -30,11 +31,22 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE, ElementType.METHOD})
 @ExtensionAnnotation(IssueExtension.class)
+@Repeatable(Issue.Container.class)
 public @interface Issue {
   /**
    * The IDs of the issues that the annotated element relates to.
    *
    * @return the IDs of the issues that the annotated element relates to
    */
   String[] value();
+
+  /**
+   * @since 2.0
+   */
+  @Beta
+  @Retention(RetentionPolicy.RUNTIME)
+  @Target({ElementType.TYPE, ElementType.METHOD})
+  @interface Container {
+    Issue[] value();
+  }
 }

spock-specs/src/test/groovy/org/spockframework/docs/extension/IssueDocSpec.groovy

@@ -0,0 +1,25 @@
+package org.spockframework.docs.extension
+
+import spock.lang.Issue
+import spock.lang.Specification
+
+// tag::example[]
+@Issue("http://my.issues.org/FOO-1")
+class IssueDocSpec extends Specification {
+  @Issue("http://my.issues.org/FOO-2")
+  def "Foo should do bar"() {
+    expect: true
+  }
+
+  @Issue(["http://my.issues.org/FOO-3", "http://my.issues.org/FOO-4"])
+  def "I have two related issues"() {
+    expect: true
+  }
+
+  @Issue(["http://my.issues.org/FOO-5", "http://my.issues.org/FOO-6"])
+  @Issue("http://my.issues.org/FOO-7")
+  def "I have three related issues"() {
+    expect: true
+  }
+}
+// end::example[]

spock-specs/src/test/groovy/org/spockframework/smoke/extension/IssueExtension.groovy

@@ -61,11 +61,65 @@ class IssueExtension extends EmbeddedSpecification {
       url == "http://my.issues.org/FOO-1"
     }
     with(tags[1]) {
-        name == "FOO-2"
-        key == "issue"
-        value == "FOO-2"
-        url == "http://my.issues.org/FOO-2"
-      }
+      name == "FOO-2"
+      key == "issue"
+      value == "FOO-2"
+      url == "http://my.issues.org/FOO-2"
+    }
+  }
+
+  @Issue("http://my.issues.org/FOO-1")
+  @Issue("http://my.issues.org/FOO-2")
+  def "if multiple issue annotations are applied, all of them are converted to a tag"() {
+    def tags = specificationContext.currentFeature.tags
+
+    expect:
+    tags.size() == 2
+    with(tags[0]) {
+      name == "FOO-1"
+      key == "issue"
+      value == "FOO-1"
+      url == "http://my.issues.org/FOO-1"
+    }
+    with(tags[1]) {
+      name == "FOO-2"
+      key == "issue"
+      value == "FOO-2"
+      url == "http://my.issues.org/FOO-2"
+    }
+  }
+
+  @Issue(["http://my.issues.org/FOO-1", "http://my.issues.org/FOO-2"])
+  @Issue(["http://my.issues.org/FOO-3", "http://my.issues.org/FOO-4"])
+  def "if multiple issue annotations with multiple issues are applied, all of them are converted to a tag"() {
+    def tags = specificationContext.currentFeature.tags
+
+    expect:
+    tags.size() == 4
+    with(tags[0]) {
+      name == "FOO-1"
+      key == "issue"
+      value == "FOO-1"
+      url == "http://my.issues.org/FOO-1"
+    }
+    with(tags[1]) {
+      name == "FOO-2"
+      key == "issue"
+      value == "FOO-2"
+      url == "http://my.issues.org/FOO-2"
+    }
+    with(tags[2]) {
+      name == "FOO-3"
+      key == "issue"
+      value == "FOO-3"
+      url == "http://my.issues.org/FOO-3"
+    }
+    with(tags[3]) {
+      name == "FOO-4"
+      key == "issue"
+      value == "FOO-4"
+      url == "http://my.issues.org/FOO-4"
+    }
   }
 
   def "complains if @Issue is used on anything other than a spec or feature"() {