really fixed Dynamic DSL problem

[JENKINS-57817]

Author: daspilker

job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/structs/DescribableHelper.groovy

@@ -47,6 +47,9 @@ class DescribableHelper {
             Class type = getTypeForLookup(it)
             type == null ? null : SymbolLookup.get().find(type, name)
         }
+        result = result.findAll { d ->
+            !result.any { other -> d != other && d.type.isAssignableFrom(other.type) }
+        }
         result ?: models.findAll { uncapitalize(it.type) == name }
     }
 

job-dsl-plugin/src/test/groovy/javaposse/jobdsl/plugin/fixtures/SubTrigger.groovy

@@ -1,12 +1,10 @@
 package javaposse.jobdsl.plugin.fixtures
 
 import hudson.Extension
-import hudson.model.Job
-import hudson.triggers.Trigger
 import org.jenkinsci.Symbol
 import org.kohsuke.stapler.DataBoundConstructor
 
-class SubTrigger extends Trigger<Job> {
+class SubTrigger extends FooTrigger {
     @DataBoundConstructor
     SubTrigger() {
     }

job-dsl-plugin/src/test/groovy/javaposse/jobdsl/plugin/structs/DescribableHelperSpec.groovy

@@ -95,6 +95,17 @@ class DescribableHelperSpec extends Specification {
         describableModels != null
         describableModels.size() == 1
         describableModels.first().type == SubTrigger
+
+        when:
+        describableModels = DescribableHelper.findDescribableModels(
+                [DescribableModel.of(FooTrigger), DescribableModel.of(SubTrigger)],
+                'sub'
+        )
+
+        then:
+        describableModels != null
+        describableModels.size() == 1
+        describableModels.first().type == SubTrigger
     }
 
     def 'find descriptors for context without type'() {