From 13dea3e35dffcb408d61e47aacc99b8953cfdab0 Mon Sep 17 00:00:00 2001 From: William Martin Date: Tue, 23 Jul 2024 13:33:39 +0200 Subject: [PATCH 1/3] Add test for release view json export fields --- pkg/cmd/release/view/view_test.go | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkg/cmd/release/view/view_test.go b/pkg/cmd/release/view/view_test.go index c8b837923..9e071f1aa 100644 --- a/pkg/cmd/release/view/view_test.go +++ b/pkg/cmd/release/view/view_test.go @@ -14,11 +14,33 @@ import ( "github.com/cli/cli/v2/pkg/cmdutil" "github.com/cli/cli/v2/pkg/httpmock" "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/jsonfieldstest" "github.com/google/shlex" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) +func TestJSONFields(t *testing.T) { + jsonfieldstest.ExpectCommandToSupportJSONFields(t, NewCmdView, []string{ + "apiUrl", + "author", + "assets", + "body", + "createdAt", + "id", + "isDraft", + "isPrerelease", + "name", + "publishedAt", + "tagName", + "tarballUrl", + "targetCommitish", + "uploadUrl", + "url", + "zipballUrl", + }) +} + func Test_NewCmdView(t *testing.T) { tests := []struct { name string From 99ff84bdd9b64889dc02af8e6ea0d54b3c6f27ce Mon Sep 17 00:00:00 2001 From: William Martin Date: Tue, 23 Jul 2024 13:34:11 +0200 Subject: [PATCH 2/3] Alphabetise release json fields --- pkg/cmd/release/shared/fetch.go | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkg/cmd/release/shared/fetch.go b/pkg/cmd/release/shared/fetch.go index 84a9a369b..05a5fed1d 100644 --- a/pkg/cmd/release/shared/fetch.go +++ b/pkg/cmd/release/shared/fetch.go @@ -21,22 +21,22 @@ import ( ) var ReleaseFields = []string{ - "url", "apiUrl", - "uploadUrl", - "tarballUrl", - "zipballUrl", - "id", - "tagName", - "name", - "body", - "isDraft", - "isPrerelease", - "createdAt", - "publishedAt", - "targetCommitish", "author", "assets", + "body", + "createdAt", + "id", + "isDraft", + "isPrerelease", + "name", + "publishedAt", + "tagName", + "tarballUrl", + "targetCommitish", + "uploadUrl", + "url", + "zipballUrl", } type Release struct { From c13d161271977562afcc1647efa2b5b849fe0cad Mon Sep 17 00:00:00 2001 From: William Martin Date: Tue, 23 Jul 2024 13:36:44 +0200 Subject: [PATCH 3/3] Export databaseId for releases --- pkg/cmd/release/shared/fetch.go | 1 + pkg/cmd/release/view/view_test.go | 1 + 2 files changed, 2 insertions(+) diff --git a/pkg/cmd/release/shared/fetch.go b/pkg/cmd/release/shared/fetch.go index 05a5fed1d..c9cf7a6a4 100644 --- a/pkg/cmd/release/shared/fetch.go +++ b/pkg/cmd/release/shared/fetch.go @@ -26,6 +26,7 @@ var ReleaseFields = []string{ "assets", "body", "createdAt", + "databaseId", "id", "isDraft", "isPrerelease", diff --git a/pkg/cmd/release/view/view_test.go b/pkg/cmd/release/view/view_test.go index 9e071f1aa..629c0728d 100644 --- a/pkg/cmd/release/view/view_test.go +++ b/pkg/cmd/release/view/view_test.go @@ -27,6 +27,7 @@ func TestJSONFields(t *testing.T) { "assets", "body", "createdAt", + "databaseId", "id", "isDraft", "isPrerelease",