diff --git a/pkg/cmd/project/item-list/item_list_test.go b/pkg/cmd/project/item-list/item_list_test.go index 58d4beeeb..e3f10e655 100644 --- a/pkg/cmd/project/item-list/item_list_test.go +++ b/pkg/cmd/project/item-list/item_list_test.go @@ -164,6 +164,7 @@ func TestRunList_User_tty(t *testing.T) { { "id": "draft issue ID", "content": map[string]interface{}{ + "id": "draft issue ID", "title": "draft issue", "__typename": "DraftIssue", }, @@ -273,6 +274,7 @@ func TestRunList_User(t *testing.T) { { "id": "draft issue ID", "content": map[string]interface{}{ + "id": "draft issue ID", "title": "draft issue", "__typename": "DraftIssue", }, @@ -379,6 +381,7 @@ func TestRunList_Org(t *testing.T) { { "id": "draft issue ID", "content": map[string]interface{}{ + "id": "draft issue ID", "title": "draft issue", "__typename": "DraftIssue", }, @@ -475,6 +478,7 @@ func TestRunList_Me(t *testing.T) { { "id": "draft issue ID", "content": map[string]interface{}{ + "id": "draft issue ID", "title": "draft issue", "__typename": "DraftIssue", }, @@ -581,6 +585,7 @@ func TestRunList_JSON(t *testing.T) { { "id": "draft issue ID", "content": map[string]interface{}{ + "id": "draft issue ID", "title": "draft issue", "__typename": "DraftIssue", }, @@ -610,6 +615,6 @@ func TestRunList_JSON(t *testing.T) { assert.NoError(t, err) assert.JSONEq( t, - `{"items":[{"content":{"type":"Issue","body":"","title":"an issue","number":1,"repository":"cli/go-gh","url":""},"id":"issue ID"},{"content":{"type":"PullRequest","body":"","title":"a pull request","number":2,"repository":"cli/go-gh","url":""},"id":"pull request ID"},{"content":{"type":"DraftIssue","body":"","title":"draft issue"},"id":"draft issue ID"}],"totalCount":3}`, + `{"items":[{"content":{"type":"Issue","body":"","title":"an issue","number":1,"repository":"cli/go-gh","url":""},"id":"issue ID"},{"content":{"type":"PullRequest","body":"","title":"a pull request","number":2,"repository":"cli/go-gh","url":""},"id":"pull request ID"},{"content":{"type":"DraftIssue","body":"","title":"draft issue","id":"draft issue ID"},"id":"draft issue ID"}],"totalCount":3}`, stdout.String()) } diff --git a/pkg/cmd/project/shared/queries/export_data_test.go b/pkg/cmd/project/shared/queries/export_data_test.go index 976839d43..adfdce63f 100644 --- a/pkg/cmd/project/shared/queries/export_data_test.go +++ b/pkg/cmd/project/shared/queries/export_data_test.go @@ -259,6 +259,7 @@ func TestJSONProjectDetailedItems(t *testing.T) { Content: ProjectItemContent{ TypeName: "DraftIssue", DraftIssue: DraftIssue{ + ID: "draftIssueId", Title: "Pull Request title", Body: "a body", }, @@ -270,7 +271,7 @@ func TestJSONProjectDetailedItems(t *testing.T) { assert.NoError(t, err) assert.JSONEq( t, - `{"items":[{"content":{"type":"Issue","body":"a body","title":"Issue title","number":1,"repository":"cli/go-gh","url":"issue-url"},"id":"issueId"},{"content":{"type":"PullRequest","body":"a body","title":"Pull Request title","number":2,"repository":"cli/go-gh","url":"pr-url"},"id":"pullRequestId"},{"content":{"type":"DraftIssue","body":"a body","title":"Pull Request title"},"id":"draftIssueId"}],"totalCount":5}`, + `{"items":[{"content":{"type":"Issue","body":"a body","title":"Issue title","number":1,"repository":"cli/go-gh","url":"issue-url"},"id":"issueId"},{"content":{"type":"PullRequest","body":"a body","title":"Pull Request title","number":2,"repository":"cli/go-gh","url":"pr-url"},"id":"pullRequestId"},{"content":{"type":"DraftIssue","body":"a body","title":"Pull Request title","id":"draftIssueId"},"id":"draftIssueId"}],"totalCount":5}`, string(out)) } @@ -300,6 +301,7 @@ func TestJSONProjectItem_DraftIssue_ProjectV2ItemFieldIterationValue(t *testing. Content: ProjectItemContent{ TypeName: "DraftIssue", DraftIssue: DraftIssue{ + ID: "draftIssueId", Title: "Pull Request title", Body: "a body", }, @@ -319,7 +321,7 @@ func TestJSONProjectItem_DraftIssue_ProjectV2ItemFieldIterationValue(t *testing. assert.NoError(t, err) assert.JSONEq( t, - `{"items":[{"sprint":{"title":"Iteration Title","startDate":"","duration":0},"content":{"type":"DraftIssue","body":"a body","title":"Pull Request title"},"id":"draftIssueId"}],"totalCount":5}`, + `{"items":[{"sprint":{"title":"Iteration Title","startDate":"","duration":0},"content":{"type":"DraftIssue","body":"a body","title":"Pull Request title","id":"draftIssueId"},"id":"draftIssueId"}],"totalCount":5}`, string(out)) } @@ -338,6 +340,7 @@ func TestJSONProjectItem_DraftIssue_ProjectV2ItemFieldMilestoneValue(t *testing. Content: ProjectItemContent{ TypeName: "DraftIssue", DraftIssue: DraftIssue{ + ID: "draftIssueId", Title: "Pull Request title", Body: "a body", }, @@ -357,7 +360,7 @@ func TestJSONProjectItem_DraftIssue_ProjectV2ItemFieldMilestoneValue(t *testing. assert.NoError(t, err) assert.JSONEq( t, - `{"items":[{"milestone":{"title":"Milestone Title","dueOn":"","description":""},"content":{"type":"DraftIssue","body":"a body","title":"Pull Request title"},"id":"draftIssueId"}],"totalCount":5}`, + `{"items":[{"milestone":{"title":"Milestone Title","dueOn":"","description":""},"content":{"type":"DraftIssue","body":"a body","title":"Pull Request title","id":"draftIssueId"},"id":"draftIssueId"}],"totalCount":5}`, string(out)) } diff --git a/pkg/cmd/project/shared/queries/queries.go b/pkg/cmd/project/shared/queries/queries.go index e54a3fb17..080a43097 100644 --- a/pkg/cmd/project/shared/queries/queries.go +++ b/pkg/cmd/project/shared/queries/queries.go @@ -400,6 +400,7 @@ func (p ProjectItem) DetailedItem() exportable { switch p.Type() { case "DraftIssue": return DraftIssue{ + ID: p.Content.DraftIssue.ID, Body: p.Body(), Title: p.Title(), }