Skip to content

Commit 009dd04

Browse files
sanbricioonsi
sanbricio
authored and
onsi
committed
Support DescribeTableSubtree in ginkgo outline
1 parent 5de9c15 commit 009dd04

18 files changed

Lines changed: 152 additions & 11 deletions

‎ginkgo/outline/_testdata/alias_test.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,11 @@ var _ = fooginkgo.Describe("NodotFixture", func() {
4242
func() {},
4343
fooginkgo.Entry("normal"),
4444
)
45+
46+
fooginkgo.DescribeTableSubtree("normal",
47+
func() {
48+
fooginkgo.It("normal", func() {})
49+
},
50+
fooginkgo.Entry("normal"),
51+
)
4552
})

‎ginkgo/outline/_testdata/alias_test.go.csv‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Name,Text,Start,End,Spec,Focused,Pending,Labels
2-
Describe,NodotFixture,81,670,false,false,false,
2+
Describe,NodotFixture,81,798,false,false,false,
33
Describe,normal,126,259,false,false,false,
44
It,normal,166,255,true,false,false,
55
By,normal,201,223,false,false,false,
@@ -14,3 +14,6 @@ DescribeTable,normal,508,586,false,false,false,
1414
Entry,normal,557,582,true,false,false,
1515
DescribeTable,normal,589,667,false,false,false,
1616
Entry,normal,638,663,true,false,false,
17+
DescribeTableSubtree,normal,670,795,false,false,false,
18+
Entry,normal,766,791,true,false,false,
19+
It,normal,725,758,true,false,false,

‎ginkgo/outline/_testdata/alias_test.go.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"name":"Describe","text":"NodotFixture","start":81,"end":670,"spec":false,"focused":false,"pending":false,"labels":[],"nodes":[{"name":"Describe","text":"normal","start":126,"end":259,"spec":false,"focused":false,"pending":false,"labels":[],"nodes":[{"name":"It","text":"normal","start":166,"end":255,"spec":true,"focused":false,"pending":false,"labels":[],"nodes":[{"name":"By","text":"normal","start":201,"end":223,"spec":false,"focused":false,"pending":false,"labels":null,"nodes":[]},{"name":"By","text":"normal","start":227,"end":249,"spec":false,"focused":false,"pending":false,"labels":null,"nodes":[]}]}]},{"name":"Context","text":"normal","start":262,"end":342,"spec":false,"focused":false,"pending":false,"labels":[],"nodes":[{"name":"It","text":"normal","start":301,"end":338,"spec":true,"focused":false,"pending":false,"labels":[],"nodes":[]}]},{"name":"When","text":"normal","start":345,"end":422,"spec":false,"focused":false,"pending":false,"labels":[],"nodes":[{"name":"It","text":"normal","start":381,"end":418,"spec":true,"focused":false,"pending":false,"labels":[],"nodes":[]}]},{"name":"It","text":"normal","start":425,"end":461,"spec":true,"focused":false,"pending":false,"labels":[],"nodes":[]},{"name":"Specify","text":"normal","start":464,"end":505,"spec":true,"focused":false,"pending":false,"labels":[],"nodes":[]},{"name":"DescribeTable","text":"normal","start":508,"end":586,"spec":false,"focused":false,"pending":false,"labels":[],"nodes":[{"name":"Entry","text":"normal","start":557,"end":582,"spec":true,"focused":false,"pending":false,"labels":[],"nodes":[]}]},{"name":"DescribeTable","text":"normal","start":589,"end":667,"spec":false,"focused":false,"pending":false,"labels":[],"nodes":[{"name":"Entry","text":"normal","start":638,"end":663,"spec":true,"focused":false,"pending":false,"labels":[],"nodes":[]}]}]}]
1+
[{"name":"Describe","text":"NodotFixture","start":81,"end":798,"spec":false,"focused":false,"pending":false,"labels":[],"nodes":[{"name":"Describe","text":"normal","start":126,"end":259,"spec":false,"focused":false,"pending":false,"labels":[],"nodes":[{"name":"It","text":"normal","start":166,"end":255,"spec":true,"focused":false,"pending":false,"labels":[],"nodes":[{"name":"By","text":"normal","start":201,"end":223,"spec":false,"focused":false,"pending":false,"labels":null,"nodes":[]},{"name":"By","text":"normal","start":227,"end":249,"spec":false,"focused":false,"pending":false,"labels":null,"nodes":[]}]}]},{"name":"Context","text":"normal","start":262,"end":342,"spec":false,"focused":false,"pending":false,"labels":[],"nodes":[{"name":"It","text":"normal","start":301,"end":338,"spec":true,"focused":false,"pending":false,"labels":[],"nodes":[]}]},{"name":"When","text":"normal","start":345,"end":422,"spec":false,"focused":false,"pending":false,"labels":[],"nodes":[{"name":"It","text":"normal","start":381,"end":418,"spec":true,"focused":false,"pending":false,"labels":[],"nodes":[]}]},{"name":"It","text":"normal","start":425,"end":461,"spec":true,"focused":false,"pending":false,"labels":[],"nodes":[]},{"name":"Specify","text":"normal","start":464,"end":505,"spec":true,"focused":false,"pending":false,"labels":[],"nodes":[]},{"name":"DescribeTable","text":"normal","start":508,"end":586,"spec":false,"focused":false,"pending":false,"labels":[],"nodes":[{"name":"Entry","text":"normal","start":557,"end":582,"spec":true,"focused":false,"pending":false,"labels":[],"nodes":[]}]},{"name":"DescribeTable","text":"normal","start":589,"end":667,"spec":false,"focused":false,"pending":false,"labels":[],"nodes":[{"name":"Entry","text":"normal","start":638,"end":663,"spec":true,"focused":false,"pending":false,"labels":[],"nodes":[]}]},{"name":"DescribeTableSubtree","text":"normal","start":670,"end":795,"spec":false,"focused":false,"pending":false,"labels":[],"nodes":[{"name":"Entry","text":"normal","start":766,"end":791,"spec":true,"focused":false,"pending":false,"labels":[],"nodes":[{"name":"It","text":"normal","start":725,"end":758,"spec":true,"focused":false,"pending":false,"labels":[],"nodes":[]}]}]}]}]

‎ginkgo/outline/_testdata/describe_table_subtree_test.go‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
package example_test
2+
3+
import (
4+
. "github.com/onsi/ginkgo/v2"
5+
. "github.com/onsi/gomega"
6+
)
7+
8+
var _ = Describe("Describe", func() {
9+
DescribeTableSubtree("Subtree", func() {
10+
It("It", func() {
11+
Expect(true).To(BeTrue())
12+
})
13+
},
14+
Entry("EntrySubtree"),
15+
Entry("EntrySubtree2"),
16+
)
17+
DescribeTable("Table", func() {
18+
Expect(true).To(BeTrue())
19+
},
20+
Entry("EntryTable"),
21+
Entry("EntryTable2"),
22+
)
23+
DescribeTableSubtree("MultiSpec", func() {
24+
It("First", func() {})
25+
It("Second", func() {})
26+
Context("Nested", func() {
27+
It("Inner", func() {})
28+
})
29+
},
30+
Entry("EntryMulti"),
31+
)
32+
FDescribeTableSubtree("FocusedSubtree", func() {
33+
It("FocusedIt", func() {})
34+
},
35+
Entry("FocusedEntry"),
36+
)
37+
PDescribeTableSubtree("PendingSubtree", func() {
38+
It("PendingIt", func() {})
39+
},
40+
Entry("PendingEntry"),
41+
)
42+
XDescribeTableSubtree("XPendingSubtree", func() {
43+
It("XPendingIt", func() {})
44+
},
45+
Entry("XPendingEntry"),
46+
)
47+
})

‎ginkgo/outline/_testdata/describe_table_subtree_test.go.csv‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
Name,Text,Start,End,Spec,Focused,Pending,Labels
2+
Describe,Describe,101,923,false,false,false,
3+
DescribeTableSubtree,Subtree,132,284,false,false,false,
4+
Entry,EntrySubtree,233,254,true,false,false,
5+
It,It,175,226,true,false,false,
6+
Entry,EntrySubtree2,258,280,true,false,false,
7+
It,It,175,226,true,false,false,
8+
DescribeTable,Table,286,399,false,false,false,
9+
Entry,EntryTable,352,371,true,false,false,
10+
Entry,EntryTable2,375,395,true,false,false,
11+
DescribeTableSubtree,MultiSpec,401,584,false,false,false,
12+
Entry,EntryMulti,561,580,true,false,false,
13+
It,First,446,468,true,false,false,
14+
It,Second,471,494,true,false,false,
15+
Context,Nested,497,554,false,false,false,
16+
It,Inner,527,549,true,false,false,
17+
FDescribeTableSubtree,FocusedSubtree,586,695,false,true,false,
18+
Entry,FocusedEntry,670,691,true,true,false,
19+
It,FocusedIt,637,663,true,true,false,
20+
PDescribeTableSubtree,PendingSubtree,697,806,false,false,true,
21+
Entry,PendingEntry,781,802,true,false,true,
22+
It,PendingIt,748,774,true,false,true,
23+
XDescribeTableSubtree,XPendingSubtree,808,920,false,false,true,
24+
Entry,XPendingEntry,894,916,true,false,true,
25+
It,XPendingIt,860,887,true,false,true,

‎ginkgo/outline/_testdata/describe_table_subtree_test.go.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[{"name":"Describe","text":"Describe","start":101,"end":923,"spec":false,"focused":false,"pending":false,"labels":[],"nodes":[{"name":"DescribeTableSubtree","text":"Subtree","start":132,"end":284,"spec":false,"focused":false,"pending":false,"labels":[],"nodes":[{"name":"Entry","text":"EntrySubtree","start":233,"end":254,"spec":true,"focused":false,"pending":false,"labels":[],"nodes":[{"name":"It","text":"It","start":175,"end":226,"spec":true,"focused":false,"pending":false,"labels":[],"nodes":[]}]},{"name":"Entry","text":"EntrySubtree2","start":258,"end":280,"spec":true,"focused":false,"pending":false,"labels":[],"nodes":[{"name":"It","text":"It","start":175,"end":226,"spec":true,"focused":false,"pending":false,"labels":[],"nodes":[]}]}]},{"name":"DescribeTable","text":"Table","start":286,"end":399,"spec":false,"focused":false,"pending":false,"labels":[],"nodes":[{"name":"Entry","text":"EntryTable","start":352,"end":371,"spec":true,"focused":false,"pending":false,"labels":[],"nodes":[]},{"name":"Entry","text":"EntryTable2","start":375,"end":395,"spec":true,"focused":false,"pending":false,"labels":[],"nodes":[]}]},{"name":"DescribeTableSubtree","text":"MultiSpec","start":401,"end":584,"spec":false,"focused":false,"pending":false,"labels":[],"nodes":[{"name":"Entry","text":"EntryMulti","start":561,"end":580,"spec":true,"focused":false,"pending":false,"labels":[],"nodes":[{"name":"It","text":"First","start":446,"end":468,"spec":true,"focused":false,"pending":false,"labels":[],"nodes":[]},{"name":"It","text":"Second","start":471,"end":494,"spec":true,"focused":false,"pending":false,"labels":[],"nodes":[]},{"name":"Context","text":"Nested","start":497,"end":554,"spec":false,"focused":false,"pending":false,"labels":[],"nodes":[{"name":"It","text":"Inner","start":527,"end":549,"spec":true,"focused":false,"pending":false,"labels":[],"nodes":[]}]}]}]},{"name":"FDescribeTableSubtree","text":"FocusedSubtree","start":586,"end":695,"spec":false,"focused":true,"pending":false,"labels":[],"nodes":[{"name":"Entry","text":"FocusedEntry","start":670,"end":691,"spec":true,"focused":true,"pending":false,"labels":[],"nodes":[{"name":"It","text":"FocusedIt","start":637,"end":663,"spec":true,"focused":true,"pending":false,"labels":[],"nodes":[]}]}]},{"name":"PDescribeTableSubtree","text":"PendingSubtree","start":697,"end":806,"spec":false,"focused":false,"pending":true,"labels":[],"nodes":[{"name":"Entry","text":"PendingEntry","start":781,"end":802,"spec":true,"focused":false,"pending":true,"labels":[],"nodes":[{"name":"It","text":"PendingIt","start":748,"end":774,"spec":true,"focused":false,"pending":true,"labels":[],"nodes":[]}]}]},{"name":"XDescribeTableSubtree","text":"XPendingSubtree","start":808,"end":920,"spec":false,"focused":false,"pending":true,"labels":[],"nodes":[{"name":"Entry","text":"XPendingEntry","start":894,"end":916,"spec":true,"focused":false,"pending":true,"labels":[],"nodes":[{"name":"It","text":"XPendingIt","start":860,"end":887,"spec":true,"focused":false,"pending":true,"labels":[],"nodes":[]}]}]}]}]

‎ginkgo/outline/_testdata/focused_test.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,11 @@ var _ = Describe("unfocused", func() {
4141
func() {},
4242
FEntry("focused"),
4343
)
44+
45+
FDescribeTableSubtree("focused",
46+
func() {
47+
It("focused", func() {})
48+
},
49+
Entry("focused"),
50+
)
4451
})

‎ginkgo/outline/_testdata/focused_test.go.csv‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Name,Text,Start,End,Spec,Focused,Pending,Labels
2-
Describe,unfocused,73,529,false,false,false,
2+
Describe,unfocused,73,631,false,false,false,
33
FDescribe,focused,105,202,false,true,false,
44
It,focused,137,198,true,true,false,
55
By,focused,163,176,false,true,false,
@@ -14,3 +14,6 @@ FDescribeTable,focused,401,462,false,true,false,
1414
Entry,focused,442,458,true,true,false,
1515
DescribeTable,focused,465,526,false,false,false,
1616
FEntry,focused,505,522,true,true,false,
17+
FDescribeTableSubtree,focused,529,628,false,true,false,
18+
Entry,focused,608,624,true,true,false,
19+
It,focused,576,600,true,true,false,

‎ginkgo/outline/_testdata/focused_test.go.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"name":"Describe","text":"unfocused","start":73,"end":529,"spec":false,"focused":false,"pending":false,"labels":[],"nodes":[{"name":"FDescribe","text":"focused","start":105,"end":202,"spec":false,"focused":true,"pending":false,"labels":[],"nodes":[{"name":"It","text":"focused","start":137,"end":198,"spec":true,"focused":true,"pending":false,"labels":[],"nodes":[{"name":"By","text":"focused","start":163,"end":176,"spec":false,"focused":true,"pending":false,"labels":null,"nodes":[]},{"name":"By","text":"focused","start":180,"end":193,"spec":false,"focused":true,"pending":false,"labels":null,"nodes":[]}]}]},{"name":"FContext","text":"focused","start":205,"end":268,"spec":false,"focused":true,"pending":false,"labels":[],"nodes":[{"name":"It","text":"focused","start":236,"end":264,"spec":true,"focused":true,"pending":false,"labels":[],"nodes":[]}]},{"name":"FWhen","text":"focused","start":271,"end":331,"spec":false,"focused":true,"pending":false,"labels":[],"nodes":[{"name":"It","text":"focused","start":299,"end":327,"spec":true,"focused":true,"pending":false,"labels":[],"nodes":[]}]},{"name":"FIt","text":"focused","start":334,"end":362,"spec":true,"focused":true,"pending":false,"labels":[],"nodes":[]},{"name":"FSpecify","text":"focused","start":365,"end":398,"spec":true,"focused":true,"pending":false,"labels":[],"nodes":[]},{"name":"FDescribeTable","text":"focused","start":401,"end":462,"spec":false,"focused":true,"pending":false,"labels":[],"nodes":[{"name":"Entry","text":"focused","start":442,"end":458,"spec":true,"focused":true,"pending":false,"labels":[],"nodes":[]}]},{"name":"DescribeTable","text":"focused","start":465,"end":526,"spec":false,"focused":false,"pending":false,"labels":[],"nodes":[{"name":"FEntry","text":"focused","start":505,"end":522,"spec":true,"focused":true,"pending":false,"labels":[],"nodes":[]}]}]}]
1+
[{"name":"Describe","text":"unfocused","start":73,"end":631,"spec":false,"focused":false,"pending":false,"labels":[],"nodes":[{"name":"FDescribe","text":"focused","start":105,"end":202,"spec":false,"focused":true,"pending":false,"labels":[],"nodes":[{"name":"It","text":"focused","start":137,"end":198,"spec":true,"focused":true,"pending":false,"labels":[],"nodes":[{"name":"By","text":"focused","start":163,"end":176,"spec":false,"focused":true,"pending":false,"labels":null,"nodes":[]},{"name":"By","text":"focused","start":180,"end":193,"spec":false,"focused":true,"pending":false,"labels":null,"nodes":[]}]}]},{"name":"FContext","text":"focused","start":205,"end":268,"spec":false,"focused":true,"pending":false,"labels":[],"nodes":[{"name":"It","text":"focused","start":236,"end":264,"spec":true,"focused":true,"pending":false,"labels":[],"nodes":[]}]},{"name":"FWhen","text":"focused","start":271,"end":331,"spec":false,"focused":true,"pending":false,"labels":[],"nodes":[{"name":"It","text":"focused","start":299,"end":327,"spec":true,"focused":true,"pending":false,"labels":[],"nodes":[]}]},{"name":"FIt","text":"focused","start":334,"end":362,"spec":true,"focused":true,"pending":false,"labels":[],"nodes":[]},{"name":"FSpecify","text":"focused","start":365,"end":398,"spec":true,"focused":true,"pending":false,"labels":[],"nodes":[]},{"name":"FDescribeTable","text":"focused","start":401,"end":462,"spec":false,"focused":true,"pending":false,"labels":[],"nodes":[{"name":"Entry","text":"focused","start":442,"end":458,"spec":true,"focused":true,"pending":false,"labels":[],"nodes":[]}]},{"name":"DescribeTable","text":"focused","start":465,"end":526,"spec":false,"focused":false,"pending":false,"labels":[],"nodes":[{"name":"FEntry","text":"focused","start":505,"end":522,"spec":true,"focused":true,"pending":false,"labels":[],"nodes":[]}]},{"name":"FDescribeTableSubtree","text":"focused","start":529,"end":628,"spec":false,"focused":true,"pending":false,"labels":[],"nodes":[{"name":"Entry","text":"focused","start":608,"end":624,"spec":true,"focused":true,"pending":false,"labels":[],"nodes":[{"name":"It","text":"focused","start":576,"end":600,"spec":true,"focused":true,"pending":false,"labels":[],"nodes":[]}]}]}]}]

‎ginkgo/outline/_testdata/nodot_test.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,11 @@ var _ = ginkgo.Describe("NodotFixture", func() {
4141
func() {},
4242
ginkgo.Entry("normal"),
4343
)
44+
45+
ginkgo.DescribeTableSubtree("normal",
46+
func() {
47+
ginkgo.It("normal", func() {})
48+
},
49+
ginkgo.Entry("normal"),
50+
)
4451
})

0 commit comments

Comments
 (0)