diff --git a/ginkgo/outline/_testdata/dsl_core_test.go b/ginkgo/outline/_testdata/dsl_core_test.go new file mode 100644 index 000000000..3003bac7a --- /dev/null +++ b/ginkgo/outline/_testdata/dsl_core_test.go @@ -0,0 +1,14 @@ +package example_test + +import ( + . "github.com/onsi/ginkgo/v2/dsl/core" +) + +var _ = Describe("DslCoreFixture", func() { + Describe("dslcore", func() { + It("dslcore", func() { + By("step 1") + By("step 2") + }) + }) +}) diff --git a/ginkgo/outline/_testdata/dsl_core_test.go.csv b/ginkgo/outline/_testdata/dsl_core_test.go.csv new file mode 100644 index 000000000..addc675cf --- /dev/null +++ b/ginkgo/outline/_testdata/dsl_core_test.go.csv @@ -0,0 +1,6 @@ +Name,Text,Start,End,Spec,Focused,Pending +Describe,DslCoreFixture,82,216,false,false,false +Describe,dslcore,119,213,false,false,false +It,dslcore,150,209,true,false,false +By,step 1,176,188,false,false,false +By,step 2,192,204,false,false,false diff --git a/ginkgo/outline/_testdata/dsl_core_test.go.json b/ginkgo/outline/_testdata/dsl_core_test.go.json new file mode 100644 index 000000000..245a877d6 --- /dev/null +++ b/ginkgo/outline/_testdata/dsl_core_test.go.json @@ -0,0 +1 @@ +[{"name":"Describe","text":"DslCoreFixture","start":82,"end":216,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Describe","text":"dslcore","start":119,"end":213,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"dslcore","start":150,"end":209,"spec":true,"focused":false,"pending":false,"nodes":[{"name":"By","text":"step 1","start":176,"end":188,"spec":false,"focused":false,"pending":false,"nodes":[]},{"name":"By","text":"step 2","start":192,"end":204,"spec":false,"focused":false,"pending":false,"nodes":[]}]}]}]}] diff --git a/ginkgo/outline/import.go b/ginkgo/outline/import.go index 4328ab391..67ec5ab75 100644 --- a/ginkgo/outline/import.go +++ b/ginkgo/outline/import.go @@ -47,7 +47,7 @@ func packageNameForImport(f *ast.File, path string) *string { // or nil otherwise. func importSpec(f *ast.File, path string) *ast.ImportSpec { for _, s := range f.Imports { - if importPath(s) == path { + if strings.HasPrefix(importPath(s), path) { return s } } diff --git a/ginkgo/outline/outline_test.go b/ginkgo/outline/outline_test.go index 4501aff3a..05e2a2090 100644 --- a/ginkgo/outline/outline_test.go +++ b/ginkgo/outline/outline_test.go @@ -59,6 +59,7 @@ var _ = DescribeTable("Validate outline from file with", Entry("mixed focused containers and specs", "mixed_test.go", "mixed_test.go.json", "mixed_test.go.csv"), Entry("specs used to verify position", "position_test.go", "position_test.go.json", "position_test.go.csv"), Entry("suite setup", "suite_test.go", "suite_test.go.json", "suite_test.go.csv"), + Entry("core dsl import", "dsl_core_test.go", "dsl_core_test.go.json", "dsl_core_test.go.csv"), ) var _ = Describe("Validate position", func() {