* Use standard JSON flags for project command Deprecates the --format flag and adds the standard JSON flags to properly filter, template, and write JSON. * Add format flags cmdutil Resolves PR feedback * Remove unnecessary fields from JSON format flags * Add standard format help to remaining commands * Add JSON format regression tests Also fixed a number of `project` commands that didn't format the right object as JSON. * Resolve PR feedback
541 lines
12 KiB
Go
541 lines
12 KiB
Go
package itemadd
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/cli/cli/v2/pkg/cmd/project/shared/queries"
|
|
"github.com/cli/cli/v2/pkg/cmdutil"
|
|
"github.com/cli/cli/v2/pkg/iostreams"
|
|
"github.com/google/shlex"
|
|
"github.com/stretchr/testify/assert"
|
|
"gopkg.in/h2non/gock.v1"
|
|
)
|
|
|
|
func TestNewCmdaddItem(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
cli string
|
|
wants addItemOpts
|
|
wantsErr bool
|
|
wantsErrMsg string
|
|
wantsExporter bool
|
|
}{
|
|
{
|
|
name: "missing-url",
|
|
cli: "",
|
|
wantsErr: true,
|
|
wantsErrMsg: "required flag(s) \"url\" not set",
|
|
},
|
|
{
|
|
name: "not-a-number",
|
|
cli: "x --url github.com/cli/cli",
|
|
wantsErr: true,
|
|
wantsErrMsg: "invalid number: x",
|
|
},
|
|
{
|
|
name: "url",
|
|
cli: "--url github.com/cli/cli",
|
|
wants: addItemOpts{
|
|
itemURL: "github.com/cli/cli",
|
|
},
|
|
},
|
|
{
|
|
name: "number",
|
|
cli: "123 --url github.com/cli/cli",
|
|
wants: addItemOpts{
|
|
number: 123,
|
|
itemURL: "github.com/cli/cli",
|
|
},
|
|
},
|
|
{
|
|
name: "owner",
|
|
cli: "--owner monalisa --url github.com/cli/cli",
|
|
wants: addItemOpts{
|
|
owner: "monalisa",
|
|
itemURL: "github.com/cli/cli",
|
|
},
|
|
},
|
|
{
|
|
name: "json",
|
|
cli: "--format json --url github.com/cli/cli",
|
|
wants: addItemOpts{
|
|
itemURL: "github.com/cli/cli",
|
|
},
|
|
wantsExporter: true,
|
|
},
|
|
}
|
|
|
|
t.Setenv("GH_TOKEN", "auth-token")
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
ios, _, _, _ := iostreams.Test()
|
|
f := &cmdutil.Factory{
|
|
IOStreams: ios,
|
|
}
|
|
|
|
argv, err := shlex.Split(tt.cli)
|
|
assert.NoError(t, err)
|
|
|
|
var gotOpts addItemOpts
|
|
cmd := NewCmdAddItem(f, func(config addItemConfig) error {
|
|
gotOpts = config.opts
|
|
return nil
|
|
})
|
|
|
|
cmd.SetArgs(argv)
|
|
_, err = cmd.ExecuteC()
|
|
if tt.wantsErr {
|
|
assert.Error(t, err)
|
|
assert.Equal(t, tt.wantsErrMsg, err.Error())
|
|
return
|
|
}
|
|
assert.NoError(t, err)
|
|
|
|
assert.Equal(t, tt.wants.number, gotOpts.number)
|
|
assert.Equal(t, tt.wants.owner, gotOpts.owner)
|
|
assert.Equal(t, tt.wants.itemURL, gotOpts.itemURL)
|
|
assert.Equal(t, tt.wantsExporter, gotOpts.exporter != nil)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestRunAddItem_User(t *testing.T) {
|
|
defer gock.Off()
|
|
gock.Observe(gock.DumpRequest)
|
|
|
|
// get user ID
|
|
gock.New("https://api.github.com").
|
|
Post("/graphql").
|
|
MatchType("json").
|
|
JSON(map[string]interface{}{
|
|
"query": "query UserOrgOwner.*",
|
|
"variables": map[string]interface{}{
|
|
"login": "monalisa",
|
|
},
|
|
}).
|
|
Reply(200).
|
|
JSON(map[string]interface{}{
|
|
"data": map[string]interface{}{
|
|
"user": map[string]interface{}{
|
|
"id": "an ID",
|
|
},
|
|
},
|
|
"errors": []interface{}{
|
|
map[string]interface{}{
|
|
"type": "NOT_FOUND",
|
|
"path": []string{"organization"},
|
|
},
|
|
},
|
|
})
|
|
|
|
// get project ID
|
|
gock.New("https://api.github.com").
|
|
Post("/graphql").
|
|
MatchType("json").
|
|
JSON(map[string]interface{}{
|
|
"query": "query UserProject.*",
|
|
"variables": map[string]interface{}{
|
|
"login": "monalisa",
|
|
"number": 1,
|
|
"firstItems": 0,
|
|
"afterItems": nil,
|
|
"firstFields": 0,
|
|
"afterFields": nil,
|
|
},
|
|
}).
|
|
Reply(200).
|
|
JSON(map[string]interface{}{
|
|
"data": map[string]interface{}{
|
|
"user": map[string]interface{}{
|
|
"projectV2": map[string]interface{}{
|
|
"id": "an ID",
|
|
},
|
|
},
|
|
},
|
|
})
|
|
|
|
// get item ID
|
|
gock.New("https://api.github.com").
|
|
Post("/graphql").
|
|
MatchType("json").
|
|
JSON(map[string]interface{}{
|
|
"query": "query GetIssueOrPullRequest.*",
|
|
"variables": map[string]interface{}{
|
|
"url": "https://github.com/cli/go-gh/issues/1",
|
|
},
|
|
}).
|
|
Reply(200).
|
|
JSON(map[string]interface{}{
|
|
"data": map[string]interface{}{
|
|
"resource": map[string]interface{}{
|
|
"id": "item ID",
|
|
"__typename": "Issue",
|
|
},
|
|
},
|
|
})
|
|
|
|
// create item
|
|
gock.New("https://api.github.com").
|
|
Post("/graphql").
|
|
BodyString(`{"query":"mutation AddItem.*","variables":{"input":{"projectId":"an ID","contentId":"item ID"}}}`).
|
|
Reply(200).
|
|
JSON(map[string]interface{}{
|
|
"data": map[string]interface{}{
|
|
"addProjectV2ItemById": map[string]interface{}{
|
|
"item": map[string]interface{}{
|
|
"id": "item ID",
|
|
},
|
|
},
|
|
},
|
|
})
|
|
|
|
client := queries.NewTestClient()
|
|
|
|
ios, _, stdout, _ := iostreams.Test()
|
|
ios.SetStdoutTTY(true)
|
|
config := addItemConfig{
|
|
opts: addItemOpts{
|
|
owner: "monalisa",
|
|
number: 1,
|
|
itemURL: "https://github.com/cli/go-gh/issues/1",
|
|
},
|
|
client: client,
|
|
io: ios,
|
|
}
|
|
|
|
err := runAddItem(config)
|
|
assert.NoError(t, err)
|
|
assert.Equal(
|
|
t,
|
|
"Added item\n",
|
|
stdout.String())
|
|
}
|
|
|
|
func TestRunAddItem_Org(t *testing.T) {
|
|
defer gock.Off()
|
|
gock.Observe(gock.DumpRequest)
|
|
// get org ID
|
|
gock.New("https://api.github.com").
|
|
Post("/graphql").
|
|
MatchType("json").
|
|
JSON(map[string]interface{}{
|
|
"query": "query UserOrgOwner.*",
|
|
"variables": map[string]interface{}{
|
|
"login": "github",
|
|
},
|
|
}).
|
|
Reply(200).
|
|
JSON(map[string]interface{}{
|
|
"data": map[string]interface{}{
|
|
"organization": map[string]interface{}{
|
|
"id": "an ID",
|
|
},
|
|
},
|
|
"errors": []interface{}{
|
|
map[string]interface{}{
|
|
"type": "NOT_FOUND",
|
|
"path": []string{"user"},
|
|
},
|
|
},
|
|
})
|
|
|
|
// get project ID
|
|
gock.New("https://api.github.com").
|
|
Post("/graphql").
|
|
MatchType("json").
|
|
JSON(map[string]interface{}{
|
|
"query": "query OrgProject.*",
|
|
"variables": map[string]interface{}{
|
|
"login": "github",
|
|
"number": 1,
|
|
"firstItems": 0,
|
|
"afterItems": nil,
|
|
"firstFields": 0,
|
|
"afterFields": nil,
|
|
},
|
|
}).
|
|
Reply(200).
|
|
JSON(map[string]interface{}{
|
|
"data": map[string]interface{}{
|
|
"organization": map[string]interface{}{
|
|
"projectV2": map[string]interface{}{
|
|
"id": "an ID",
|
|
},
|
|
},
|
|
},
|
|
})
|
|
|
|
// get item ID
|
|
gock.New("https://api.github.com").
|
|
Post("/graphql").
|
|
MatchType("json").
|
|
JSON(map[string]interface{}{
|
|
"query": "query GetIssueOrPullRequest.*",
|
|
"variables": map[string]interface{}{
|
|
"url": "https://github.com/cli/go-gh/issues/1",
|
|
},
|
|
}).
|
|
Reply(200).
|
|
JSON(map[string]interface{}{
|
|
"data": map[string]interface{}{
|
|
"resource": map[string]interface{}{
|
|
"id": "item ID",
|
|
"__typename": "Issue",
|
|
},
|
|
},
|
|
})
|
|
|
|
// create item
|
|
gock.New("https://api.github.com").
|
|
Post("/graphql").
|
|
BodyString(`{"query":"mutation AddItem.*","variables":{"input":{"projectId":"an ID","contentId":"item ID"}}}`).
|
|
Reply(200).
|
|
JSON(map[string]interface{}{
|
|
"data": map[string]interface{}{
|
|
"addProjectV2ItemById": map[string]interface{}{
|
|
"item": map[string]interface{}{
|
|
"id": "item ID",
|
|
},
|
|
},
|
|
},
|
|
})
|
|
|
|
client := queries.NewTestClient()
|
|
|
|
ios, _, stdout, _ := iostreams.Test()
|
|
ios.SetStdoutTTY(true)
|
|
config := addItemConfig{
|
|
opts: addItemOpts{
|
|
owner: "github",
|
|
number: 1,
|
|
itemURL: "https://github.com/cli/go-gh/issues/1",
|
|
},
|
|
client: client,
|
|
io: ios,
|
|
}
|
|
|
|
err := runAddItem(config)
|
|
assert.NoError(t, err)
|
|
assert.Equal(
|
|
t,
|
|
"Added item\n",
|
|
stdout.String())
|
|
}
|
|
|
|
func TestRunAddItem_Me(t *testing.T) {
|
|
defer gock.Off()
|
|
gock.Observe(gock.DumpRequest)
|
|
// get viewer ID
|
|
gock.New("https://api.github.com").
|
|
Post("/graphql").
|
|
MatchType("json").
|
|
JSON(map[string]interface{}{
|
|
"query": "query ViewerOwner.*",
|
|
}).
|
|
Reply(200).
|
|
JSON(map[string]interface{}{
|
|
"data": map[string]interface{}{
|
|
"viewer": map[string]interface{}{
|
|
"id": "an ID",
|
|
},
|
|
},
|
|
})
|
|
|
|
// get project ID
|
|
gock.New("https://api.github.com").
|
|
Post("/graphql").
|
|
MatchType("json").
|
|
JSON(map[string]interface{}{
|
|
"query": "query ViewerProject.*",
|
|
"variables": map[string]interface{}{
|
|
"number": 1,
|
|
"firstItems": 0,
|
|
"afterItems": nil,
|
|
"firstFields": 0,
|
|
"afterFields": nil,
|
|
},
|
|
}).
|
|
Reply(200).
|
|
JSON(map[string]interface{}{
|
|
"data": map[string]interface{}{
|
|
"viewer": map[string]interface{}{
|
|
"projectV2": map[string]interface{}{
|
|
"id": "an ID",
|
|
},
|
|
},
|
|
},
|
|
})
|
|
|
|
// get item ID
|
|
gock.New("https://api.github.com").
|
|
Post("/graphql").
|
|
MatchType("json").
|
|
JSON(map[string]interface{}{
|
|
"query": "query GetIssueOrPullRequest.*",
|
|
"variables": map[string]interface{}{
|
|
"url": "https://github.com/cli/go-gh/pull/1",
|
|
},
|
|
}).
|
|
Reply(200).
|
|
JSON(map[string]interface{}{
|
|
"data": map[string]interface{}{
|
|
"resource": map[string]interface{}{
|
|
"id": "item ID",
|
|
"__typename": "PullRequest",
|
|
},
|
|
},
|
|
})
|
|
|
|
// create item
|
|
gock.New("https://api.github.com").
|
|
Post("/graphql").
|
|
BodyString(`{"query":"mutation AddItem.*","variables":{"input":{"projectId":"an ID","contentId":"item ID"}}}`).
|
|
Reply(200).
|
|
JSON(map[string]interface{}{
|
|
"data": map[string]interface{}{
|
|
"addProjectV2ItemById": map[string]interface{}{
|
|
"item": map[string]interface{}{
|
|
"id": "item ID",
|
|
},
|
|
},
|
|
},
|
|
})
|
|
|
|
client := queries.NewTestClient()
|
|
|
|
ios, _, stdout, _ := iostreams.Test()
|
|
ios.SetStdoutTTY(true)
|
|
config := addItemConfig{
|
|
opts: addItemOpts{
|
|
owner: "@me",
|
|
number: 1,
|
|
itemURL: "https://github.com/cli/go-gh/pull/1",
|
|
},
|
|
client: client,
|
|
io: ios,
|
|
}
|
|
|
|
err := runAddItem(config)
|
|
assert.NoError(t, err)
|
|
assert.Equal(
|
|
t,
|
|
"Added item\n",
|
|
stdout.String())
|
|
}
|
|
|
|
func TestRunAddItem_JSON(t *testing.T) {
|
|
defer gock.Off()
|
|
gock.Observe(gock.DumpRequest)
|
|
|
|
// get user ID
|
|
gock.New("https://api.github.com").
|
|
Post("/graphql").
|
|
MatchType("json").
|
|
JSON(map[string]interface{}{
|
|
"query": "query UserOrgOwner.*",
|
|
"variables": map[string]interface{}{
|
|
"login": "monalisa",
|
|
},
|
|
}).
|
|
Reply(200).
|
|
JSON(map[string]interface{}{
|
|
"data": map[string]interface{}{
|
|
"user": map[string]interface{}{
|
|
"id": "an ID",
|
|
},
|
|
},
|
|
"errors": []interface{}{
|
|
map[string]interface{}{
|
|
"type": "NOT_FOUND",
|
|
"path": []string{"organization"},
|
|
},
|
|
},
|
|
})
|
|
|
|
// get project ID
|
|
gock.New("https://api.github.com").
|
|
Post("/graphql").
|
|
MatchType("json").
|
|
JSON(map[string]interface{}{
|
|
"query": "query UserProject.*",
|
|
"variables": map[string]interface{}{
|
|
"login": "monalisa",
|
|
"number": 1,
|
|
"firstItems": 0,
|
|
"afterItems": nil,
|
|
"firstFields": 0,
|
|
"afterFields": nil,
|
|
},
|
|
}).
|
|
Reply(200).
|
|
JSON(map[string]interface{}{
|
|
"data": map[string]interface{}{
|
|
"user": map[string]interface{}{
|
|
"projectV2": map[string]interface{}{
|
|
"id": "an ID",
|
|
},
|
|
},
|
|
},
|
|
})
|
|
|
|
// get item ID
|
|
gock.New("https://api.github.com").
|
|
Post("/graphql").
|
|
MatchType("json").
|
|
JSON(map[string]interface{}{
|
|
"query": "query GetIssueOrPullRequest.*",
|
|
"variables": map[string]interface{}{
|
|
"url": "https://github.com/cli/go-gh/issues/1",
|
|
},
|
|
}).
|
|
Reply(200).
|
|
JSON(map[string]interface{}{
|
|
"data": map[string]interface{}{
|
|
"resource": map[string]interface{}{
|
|
"id": "item ID",
|
|
"__typename": "Issue",
|
|
},
|
|
},
|
|
})
|
|
|
|
// create item
|
|
gock.New("https://api.github.com").
|
|
Post("/graphql").
|
|
BodyString(`{"query":"mutation AddItem.*","variables":{"input":{"projectId":"an ID","contentId":"item ID"}}}`).
|
|
Reply(200).
|
|
JSON(map[string]interface{}{
|
|
"data": map[string]interface{}{
|
|
"addProjectV2ItemById": map[string]interface{}{
|
|
"item": map[string]interface{}{
|
|
"id": "item ID",
|
|
"content": map[string]interface{}{
|
|
"__typename": "Issue",
|
|
"title": "a title",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
})
|
|
|
|
client := queries.NewTestClient()
|
|
|
|
ios, _, stdout, _ := iostreams.Test()
|
|
config := addItemConfig{
|
|
opts: addItemOpts{
|
|
owner: "monalisa",
|
|
number: 1,
|
|
itemURL: "https://github.com/cli/go-gh/issues/1",
|
|
exporter: cmdutil.NewJSONExporter(),
|
|
},
|
|
client: client,
|
|
io: ios,
|
|
}
|
|
|
|
err := runAddItem(config)
|
|
assert.NoError(t, err)
|
|
assert.JSONEq(
|
|
t,
|
|
`{"id":"item ID","title":"a title","body":"","type":"Issue"}`,
|
|
stdout.String())
|
|
}
|