From 06744e8d2c96b754fd5dfc476ddabeb8926131e6 Mon Sep 17 00:00:00 2001 From: Daniel Lipovetsky <3445370+dlipovetsky@users.noreply.github.com> Date: Mon, 18 Jan 2021 12:36:02 -0800 Subject: [PATCH] outline: Do not omit an empty `nodes` field when marshalling to JSON (#762) --- ginkgo/outline/_testdata/alias_test.go.json | 2 +- ginkgo/outline/_testdata/focused_test.go.json | 2 +- ginkgo/outline/_testdata/mixed_test.go.json | 2 +- ginkgo/outline/_testdata/nestedfocused_test.go.json | 2 +- ginkgo/outline/_testdata/nodot_test.go.json | 2 +- ginkgo/outline/_testdata/normal_test.go.json | 2 +- ginkgo/outline/_testdata/pending_test.go.json | 2 +- ginkgo/outline/ginkgo.go | 3 ++- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ginkgo/outline/_testdata/alias_test.go.json b/ginkgo/outline/_testdata/alias_test.go.json index 44248147b..804159935 100644 --- a/ginkgo/outline/_testdata/alias_test.go.json +++ b/ginkgo/outline/_testdata/alias_test.go.json @@ -1 +1 @@ -[{"name":"Describe","text":"NodotFixture","start":131,"end":786,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Describe","text":"normal","start":176,"end":309,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":216,"end":305,"spec":true,"focused":false,"pending":false,"nodes":[{"name":"By","text":"normal","start":251,"end":273,"spec":false,"focused":false,"pending":false},{"name":"By","text":"normal","start":277,"end":299,"spec":false,"focused":false,"pending":false}]}]},{"name":"Context","text":"normal","start":312,"end":392,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":351,"end":388,"spec":true,"focused":false,"pending":false}]},{"name":"When","text":"normal","start":395,"end":472,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":431,"end":468,"spec":true,"focused":false,"pending":false}]},{"name":"It","text":"normal","start":475,"end":511,"spec":true,"focused":false,"pending":false},{"name":"Specify","text":"normal","start":514,"end":555,"spec":true,"focused":false,"pending":false},{"name":"Measure","text":"normal","start":558,"end":625,"spec":true,"focused":false,"pending":false},{"name":"DescribeTable","text":"normal","start":628,"end":704,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Entry","text":"normal","start":676,"end":700,"spec":true,"focused":false,"pending":false}]},{"name":"DescribeTable","text":"normal","start":707,"end":783,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Entry","text":"normal","start":755,"end":779,"spec":true,"focused":false,"pending":false}]}]}] +[{"name":"Describe","text":"NodotFixture","start":131,"end":786,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Describe","text":"normal","start":176,"end":309,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":216,"end":305,"spec":true,"focused":false,"pending":false,"nodes":[{"name":"By","text":"normal","start":251,"end":273,"spec":false,"focused":false,"pending":false,"nodes":[]},{"name":"By","text":"normal","start":277,"end":299,"spec":false,"focused":false,"pending":false,"nodes":[]}]}]},{"name":"Context","text":"normal","start":312,"end":392,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":351,"end":388,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"When","text":"normal","start":395,"end":472,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":431,"end":468,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"It","text":"normal","start":475,"end":511,"spec":true,"focused":false,"pending":false,"nodes":[]},{"name":"Specify","text":"normal","start":514,"end":555,"spec":true,"focused":false,"pending":false,"nodes":[]},{"name":"Measure","text":"normal","start":558,"end":625,"spec":true,"focused":false,"pending":false,"nodes":[]},{"name":"DescribeTable","text":"normal","start":628,"end":704,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Entry","text":"normal","start":676,"end":700,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"DescribeTable","text":"normal","start":707,"end":783,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Entry","text":"normal","start":755,"end":779,"spec":true,"focused":false,"pending":false,"nodes":[]}]}]}] diff --git a/ginkgo/outline/_testdata/focused_test.go.json b/ginkgo/outline/_testdata/focused_test.go.json index 101e6d799..8892803d0 100644 --- a/ginkgo/outline/_testdata/focused_test.go.json +++ b/ginkgo/outline/_testdata/focused_test.go.json @@ -1 +1 @@ -[{"name":"Describe","text":"unfocused","start":116,"end":624,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"FDescribe","text":"focused","start":148,"end":245,"spec":false,"focused":true,"pending":false,"nodes":[{"name":"It","text":"focused","start":180,"end":241,"spec":true,"focused":true,"pending":false,"nodes":[{"name":"By","text":"focused","start":206,"end":219,"spec":false,"focused":true,"pending":false},{"name":"By","text":"focused","start":223,"end":236,"spec":false,"focused":true,"pending":false}]}]},{"name":"FContext","text":"focused","start":248,"end":311,"spec":false,"focused":true,"pending":false,"nodes":[{"name":"It","text":"focused","start":279,"end":307,"spec":true,"focused":true,"pending":false}]},{"name":"FWhen","text":"focused","start":314,"end":374,"spec":false,"focused":true,"pending":false,"nodes":[{"name":"It","text":"focused","start":342,"end":370,"spec":true,"focused":true,"pending":false}]},{"name":"FIt","text":"focused","start":377,"end":405,"spec":true,"focused":true,"pending":false},{"name":"FSpecify","text":"focused","start":408,"end":441,"spec":true,"focused":true,"pending":false},{"name":"FMeasure","text":"focused","start":444,"end":493,"spec":true,"focused":true,"pending":false},{"name":"FDescribeTable","text":"focused","start":496,"end":557,"spec":false,"focused":true,"pending":false,"nodes":[{"name":"Entry","text":"focused","start":537,"end":553,"spec":true,"focused":true,"pending":false}]},{"name":"DescribeTable","text":"focused","start":560,"end":621,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"FEntry","text":"focused","start":600,"end":617,"spec":true,"focused":true,"pending":false}]}]}] +[{"name":"Describe","text":"unfocused","start":116,"end":624,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"FDescribe","text":"focused","start":148,"end":245,"spec":false,"focused":true,"pending":false,"nodes":[{"name":"It","text":"focused","start":180,"end":241,"spec":true,"focused":true,"pending":false,"nodes":[{"name":"By","text":"focused","start":206,"end":219,"spec":false,"focused":true,"pending":false,"nodes":[]},{"name":"By","text":"focused","start":223,"end":236,"spec":false,"focused":true,"pending":false,"nodes":[]}]}]},{"name":"FContext","text":"focused","start":248,"end":311,"spec":false,"focused":true,"pending":false,"nodes":[{"name":"It","text":"focused","start":279,"end":307,"spec":true,"focused":true,"pending":false,"nodes":[]}]},{"name":"FWhen","text":"focused","start":314,"end":374,"spec":false,"focused":true,"pending":false,"nodes":[{"name":"It","text":"focused","start":342,"end":370,"spec":true,"focused":true,"pending":false,"nodes":[]}]},{"name":"FIt","text":"focused","start":377,"end":405,"spec":true,"focused":true,"pending":false,"nodes":[]},{"name":"FSpecify","text":"focused","start":408,"end":441,"spec":true,"focused":true,"pending":false,"nodes":[]},{"name":"FMeasure","text":"focused","start":444,"end":493,"spec":true,"focused":true,"pending":false,"nodes":[]},{"name":"FDescribeTable","text":"focused","start":496,"end":557,"spec":false,"focused":true,"pending":false,"nodes":[{"name":"Entry","text":"focused","start":537,"end":553,"spec":true,"focused":true,"pending":false,"nodes":[]}]},{"name":"DescribeTable","text":"focused","start":560,"end":621,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"FEntry","text":"focused","start":600,"end":617,"spec":true,"focused":true,"pending":false,"nodes":[]}]}]}] diff --git a/ginkgo/outline/_testdata/mixed_test.go.json b/ginkgo/outline/_testdata/mixed_test.go.json index 9db2e1271..6effd5076 100644 --- a/ginkgo/outline/_testdata/mixed_test.go.json +++ b/ginkgo/outline/_testdata/mixed_test.go.json @@ -1 +1 @@ -[{"name":"FDescribe","text":"unfocused","start":71,"end":582,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"FContext","text":"unfocused","start":104,"end":203,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"unfocused","start":137,"end":167,"spec":true,"focused":false,"pending":false},{"name":"FIt","text":"focused","start":170,"end":199,"spec":true,"focused":true,"pending":false}]},{"name":"Context","text":"unfocused","start":206,"end":304,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"FIt","text":"focused","start":238,"end":267,"spec":true,"focused":true,"pending":false},{"name":"It","text":"unfocused","start":270,"end":300,"spec":true,"focused":false,"pending":false}]},{"name":"FContext","text":"focused","start":307,"end":401,"spec":false,"focused":true,"pending":false,"nodes":[{"name":"It","text":"focused","start":338,"end":366,"spec":true,"focused":true,"pending":false},{"name":"It","text":"focused","start":369,"end":397,"spec":true,"focused":true,"pending":false}]},{"name":"PContext","text":"unfocused","start":404,"end":579,"spec":false,"focused":false,"pending":true,"nodes":[{"name":"FIt","text":"unfocused","start":437,"end":505,"spec":true,"focused":false,"pending":true,"nodes":[{"name":"By","text":"unfocused","start":466,"end":481,"spec":false,"focused":false,"pending":true},{"name":"By","text":"unfocused","start":485,"end":500,"spec":false,"focused":false,"pending":true}]},{"name":"It","text":"unfocused","start":508,"end":575,"spec":true,"focused":false,"pending":true,"nodes":[{"name":"By","text":"unfocused","start":536,"end":551,"spec":false,"focused":false,"pending":true},{"name":"By","text":"unfocused","start":555,"end":570,"spec":false,"focused":false,"pending":true}]}]}]}] +[{"name":"FDescribe","text":"unfocused","start":71,"end":582,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"FContext","text":"unfocused","start":104,"end":203,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"unfocused","start":137,"end":167,"spec":true,"focused":false,"pending":false,"nodes":[]},{"name":"FIt","text":"focused","start":170,"end":199,"spec":true,"focused":true,"pending":false,"nodes":[]}]},{"name":"Context","text":"unfocused","start":206,"end":304,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"FIt","text":"focused","start":238,"end":267,"spec":true,"focused":true,"pending":false,"nodes":[]},{"name":"It","text":"unfocused","start":270,"end":300,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"FContext","text":"focused","start":307,"end":401,"spec":false,"focused":true,"pending":false,"nodes":[{"name":"It","text":"focused","start":338,"end":366,"spec":true,"focused":true,"pending":false,"nodes":[]},{"name":"It","text":"focused","start":369,"end":397,"spec":true,"focused":true,"pending":false,"nodes":[]}]},{"name":"PContext","text":"unfocused","start":404,"end":579,"spec":false,"focused":false,"pending":true,"nodes":[{"name":"FIt","text":"unfocused","start":437,"end":505,"spec":true,"focused":false,"pending":true,"nodes":[{"name":"By","text":"unfocused","start":466,"end":481,"spec":false,"focused":false,"pending":true,"nodes":[]},{"name":"By","text":"unfocused","start":485,"end":500,"spec":false,"focused":false,"pending":true,"nodes":[]}]},{"name":"It","text":"unfocused","start":508,"end":575,"spec":true,"focused":false,"pending":true,"nodes":[{"name":"By","text":"unfocused","start":536,"end":551,"spec":false,"focused":false,"pending":true,"nodes":[]},{"name":"By","text":"unfocused","start":555,"end":570,"spec":false,"focused":false,"pending":true,"nodes":[]}]}]}]}] diff --git a/ginkgo/outline/_testdata/nestedfocused_test.go.json b/ginkgo/outline/_testdata/nestedfocused_test.go.json index 86e0ba4a6..4683c5dee 100644 --- a/ginkgo/outline/_testdata/nestedfocused_test.go.json +++ b/ginkgo/outline/_testdata/nestedfocused_test.go.json @@ -1 +1 @@ -[{"name":"FDescribe","text":"unfocused","start":71,"end":474,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"FContext","text":"unfocused","start":104,"end":273,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"unfocused","start":137,"end":204,"spec":true,"focused":false,"pending":false,"nodes":[{"name":"By","text":"unfocused","start":165,"end":180,"spec":false,"focused":false,"pending":false},{"name":"By","text":"unfocused","start":184,"end":199,"spec":false,"focused":false,"pending":false}]},{"name":"FIt","text":"focused","start":207,"end":269,"spec":true,"focused":true,"pending":false,"nodes":[{"name":"By","text":"focused","start":234,"end":247,"spec":false,"focused":true,"pending":false},{"name":"By","text":"focused","start":251,"end":264,"spec":false,"focused":true,"pending":false}]}]},{"name":"Context","text":"unfocused","start":276,"end":374,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"FIt","text":"focused","start":308,"end":337,"spec":true,"focused":true,"pending":false},{"name":"It","text":"unfocused","start":340,"end":370,"spec":true,"focused":false,"pending":false}]},{"name":"FContext","text":"focused","start":377,"end":471,"spec":false,"focused":true,"pending":false,"nodes":[{"name":"It","text":"focused","start":408,"end":436,"spec":true,"focused":true,"pending":false},{"name":"It","text":"focused","start":439,"end":467,"spec":true,"focused":true,"pending":false}]}]}] +[{"name":"FDescribe","text":"unfocused","start":71,"end":474,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"FContext","text":"unfocused","start":104,"end":273,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"unfocused","start":137,"end":204,"spec":true,"focused":false,"pending":false,"nodes":[{"name":"By","text":"unfocused","start":165,"end":180,"spec":false,"focused":false,"pending":false,"nodes":[]},{"name":"By","text":"unfocused","start":184,"end":199,"spec":false,"focused":false,"pending":false,"nodes":[]}]},{"name":"FIt","text":"focused","start":207,"end":269,"spec":true,"focused":true,"pending":false,"nodes":[{"name":"By","text":"focused","start":234,"end":247,"spec":false,"focused":true,"pending":false,"nodes":[]},{"name":"By","text":"focused","start":251,"end":264,"spec":false,"focused":true,"pending":false,"nodes":[]}]}]},{"name":"Context","text":"unfocused","start":276,"end":374,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"FIt","text":"focused","start":308,"end":337,"spec":true,"focused":true,"pending":false,"nodes":[]},{"name":"It","text":"unfocused","start":340,"end":370,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"FContext","text":"focused","start":377,"end":471,"spec":false,"focused":true,"pending":false,"nodes":[{"name":"It","text":"focused","start":408,"end":436,"spec":true,"focused":true,"pending":false,"nodes":[]},{"name":"It","text":"focused","start":439,"end":467,"spec":true,"focused":true,"pending":false,"nodes":[]}]}]}] diff --git a/ginkgo/outline/_testdata/nodot_test.go.json b/ginkgo/outline/_testdata/nodot_test.go.json index 8ddf7e421..a4df56f29 100644 --- a/ginkgo/outline/_testdata/nodot_test.go.json +++ b/ginkgo/outline/_testdata/nodot_test.go.json @@ -1 +1 @@ -[{"name":"Describe","text":"NodotFixture","start":112,"end":715,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Describe","text":"normal","start":154,"end":274,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":191,"end":270,"spec":true,"focused":false,"pending":false,"nodes":[{"name":"By","text":"normal","start":223,"end":242,"spec":false,"focused":false,"pending":false},{"name":"By","text":"normal","start":246,"end":265,"spec":false,"focused":false,"pending":false}]}]},{"name":"Context","text":"normal","start":277,"end":351,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":313,"end":347,"spec":true,"focused":false,"pending":false}]},{"name":"When","text":"normal","start":354,"end":425,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":387,"end":421,"spec":true,"focused":false,"pending":false}]},{"name":"It","text":"normal","start":428,"end":461,"spec":true,"focused":false,"pending":false},{"name":"Specify","text":"normal","start":464,"end":502,"spec":true,"focused":false,"pending":false},{"name":"Measure","text":"normal","start":505,"end":566,"spec":true,"focused":false,"pending":false},{"name":"DescribeTable","text":"normal","start":569,"end":639,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Entry","text":"normal","start":614,"end":635,"spec":true,"focused":false,"pending":false}]},{"name":"DescribeTable","text":"normal","start":642,"end":712,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Entry","text":"normal","start":687,"end":708,"spec":true,"focused":false,"pending":false}]}]}] +[{"name":"Describe","text":"NodotFixture","start":112,"end":715,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Describe","text":"normal","start":154,"end":274,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":191,"end":270,"spec":true,"focused":false,"pending":false,"nodes":[{"name":"By","text":"normal","start":223,"end":242,"spec":false,"focused":false,"pending":false,"nodes":[]},{"name":"By","text":"normal","start":246,"end":265,"spec":false,"focused":false,"pending":false,"nodes":[]}]}]},{"name":"Context","text":"normal","start":277,"end":351,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":313,"end":347,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"When","text":"normal","start":354,"end":425,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":387,"end":421,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"It","text":"normal","start":428,"end":461,"spec":true,"focused":false,"pending":false,"nodes":[]},{"name":"Specify","text":"normal","start":464,"end":502,"spec":true,"focused":false,"pending":false,"nodes":[]},{"name":"Measure","text":"normal","start":505,"end":566,"spec":true,"focused":false,"pending":false,"nodes":[]},{"name":"DescribeTable","text":"normal","start":569,"end":639,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Entry","text":"normal","start":614,"end":635,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"DescribeTable","text":"normal","start":642,"end":712,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Entry","text":"normal","start":687,"end":708,"spec":true,"focused":false,"pending":false,"nodes":[]}]}]}] diff --git a/ginkgo/outline/_testdata/normal_test.go.json b/ginkgo/outline/_testdata/normal_test.go.json index 89710cd2b..4a0a044cf 100644 --- a/ginkgo/outline/_testdata/normal_test.go.json +++ b/ginkgo/outline/_testdata/normal_test.go.json @@ -1 +1 @@ -[{"name":"Describe","text":"NormalFixture","start":116,"end":605,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Describe","text":"normal","start":152,"end":244,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":182,"end":240,"spec":true,"focused":false,"pending":false,"nodes":[{"name":"By","text":"step 1","start":207,"end":219,"spec":false,"focused":false,"pending":false},{"name":"By","text":"step 2","start":223,"end":235,"spec":false,"focused":false,"pending":false}]}]},{"name":"Context","text":"normal","start":247,"end":307,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":276,"end":303,"spec":true,"focused":false,"pending":false}]},{"name":"When","text":"normal","start":310,"end":367,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":336,"end":363,"spec":true,"focused":false,"pending":false}]},{"name":"It","text":"normal","start":370,"end":396,"spec":true,"focused":false,"pending":false},{"name":"Specify","text":"normal","start":399,"end":430,"spec":true,"focused":false,"pending":false},{"name":"Measure","text":"normal","start":433,"end":480,"spec":true,"focused":false,"pending":false},{"name":"DescribeTable","text":"normal","start":483,"end":541,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Entry","text":"normal","start":522,"end":537,"spec":true,"focused":false,"pending":false}]},{"name":"DescribeTable","text":"normal","start":544,"end":602,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Entry","text":"normal","start":583,"end":598,"spec":true,"focused":false,"pending":false}]}]}] +[{"name":"Describe","text":"NormalFixture","start":116,"end":605,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Describe","text":"normal","start":152,"end":244,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":182,"end":240,"spec":true,"focused":false,"pending":false,"nodes":[{"name":"By","text":"step 1","start":207,"end":219,"spec":false,"focused":false,"pending":false,"nodes":[]},{"name":"By","text":"step 2","start":223,"end":235,"spec":false,"focused":false,"pending":false,"nodes":[]}]}]},{"name":"Context","text":"normal","start":247,"end":307,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":276,"end":303,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"When","text":"normal","start":310,"end":367,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":336,"end":363,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"It","text":"normal","start":370,"end":396,"spec":true,"focused":false,"pending":false,"nodes":[]},{"name":"Specify","text":"normal","start":399,"end":430,"spec":true,"focused":false,"pending":false,"nodes":[]},{"name":"Measure","text":"normal","start":433,"end":480,"spec":true,"focused":false,"pending":false,"nodes":[]},{"name":"DescribeTable","text":"normal","start":483,"end":541,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Entry","text":"normal","start":522,"end":537,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"DescribeTable","text":"normal","start":544,"end":602,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Entry","text":"normal","start":583,"end":598,"spec":true,"focused":false,"pending":false,"nodes":[]}]}]}] diff --git a/ginkgo/outline/_testdata/pending_test.go.json b/ginkgo/outline/_testdata/pending_test.go.json index dec6d7309..5e59a063b 100644 --- a/ginkgo/outline/_testdata/pending_test.go.json +++ b/ginkgo/outline/_testdata/pending_test.go.json @@ -1 +1 @@ -[{"name":"Describe","text":"PendingFixture","start":116,"end":629,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"PDescribe","text":"pending","start":153,"end":250,"spec":false,"focused":false,"pending":true,"nodes":[{"name":"It","text":"pending","start":185,"end":246,"spec":true,"focused":false,"pending":true,"nodes":[{"name":"By","text":"pending","start":211,"end":224,"spec":false,"focused":false,"pending":true},{"name":"By","text":"pending","start":228,"end":241,"spec":false,"focused":false,"pending":true}]}]},{"name":"PContext","text":"pending","start":253,"end":316,"spec":false,"focused":false,"pending":true,"nodes":[{"name":"It","text":"pending","start":284,"end":312,"spec":true,"focused":false,"pending":true}]},{"name":"PWhen","text":"pending","start":319,"end":379,"spec":false,"focused":false,"pending":true,"nodes":[{"name":"It","text":"pending","start":347,"end":375,"spec":true,"focused":false,"pending":true}]},{"name":"PIt","text":"pending","start":382,"end":410,"spec":true,"focused":false,"pending":true},{"name":"PSpecify","text":"pending","start":413,"end":446,"spec":true,"focused":false,"pending":true},{"name":"PMeasure","text":"pending","start":449,"end":498,"spec":true,"focused":false,"pending":true},{"name":"PDescribeTable","text":"pending","start":501,"end":562,"spec":false,"focused":false,"pending":true,"nodes":[{"name":"Entry","text":"pending","start":542,"end":558,"spec":true,"focused":false,"pending":true}]},{"name":"DescribeTable","text":"pending","start":565,"end":626,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"PEntry","text":"pending","start":605,"end":622,"spec":true,"focused":false,"pending":true}]}]}] +[{"name":"Describe","text":"PendingFixture","start":116,"end":629,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"PDescribe","text":"pending","start":153,"end":250,"spec":false,"focused":false,"pending":true,"nodes":[{"name":"It","text":"pending","start":185,"end":246,"spec":true,"focused":false,"pending":true,"nodes":[{"name":"By","text":"pending","start":211,"end":224,"spec":false,"focused":false,"pending":true,"nodes":[]},{"name":"By","text":"pending","start":228,"end":241,"spec":false,"focused":false,"pending":true,"nodes":[]}]}]},{"name":"PContext","text":"pending","start":253,"end":316,"spec":false,"focused":false,"pending":true,"nodes":[{"name":"It","text":"pending","start":284,"end":312,"spec":true,"focused":false,"pending":true,"nodes":[]}]},{"name":"PWhen","text":"pending","start":319,"end":379,"spec":false,"focused":false,"pending":true,"nodes":[{"name":"It","text":"pending","start":347,"end":375,"spec":true,"focused":false,"pending":true,"nodes":[]}]},{"name":"PIt","text":"pending","start":382,"end":410,"spec":true,"focused":false,"pending":true,"nodes":[]},{"name":"PSpecify","text":"pending","start":413,"end":446,"spec":true,"focused":false,"pending":true,"nodes":[]},{"name":"PMeasure","text":"pending","start":449,"end":498,"spec":true,"focused":false,"pending":true,"nodes":[]},{"name":"PDescribeTable","text":"pending","start":501,"end":562,"spec":false,"focused":false,"pending":true,"nodes":[{"name":"Entry","text":"pending","start":542,"end":558,"spec":true,"focused":false,"pending":true,"nodes":[]}]},{"name":"DescribeTable","text":"pending","start":565,"end":626,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"PEntry","text":"pending","start":605,"end":622,"spec":true,"focused":false,"pending":true,"nodes":[]}]}]}] diff --git a/ginkgo/outline/ginkgo.go b/ginkgo/outline/ginkgo.go index 8fddcca24..a0c2f805e 100644 --- a/ginkgo/outline/ginkgo.go +++ b/ginkgo/outline/ginkgo.go @@ -33,7 +33,7 @@ type ginkgoMetadata struct { // ginkgoNode is used to construct the outline as a tree type ginkgoNode struct { ginkgoMetadata - Nodes []*ginkgoNode `json:"nodes,omitempty"` + Nodes []*ginkgoNode `json:"nodes"` } type walkFunc func(n *ginkgoNode) @@ -135,6 +135,7 @@ func ginkgoNodeFromCallExpr(ce *ast.CallExpr, ginkgoPackageName, tablePackageNam n.Name = identName n.Start = ce.Pos() n.End = ce.End() + n.Nodes = make([]*ginkgoNode, 0) switch identName { case "It", "Measure", "Specify": n.Spec = true