diff --git a/pkg/cmd/gist/delete/delete.go b/pkg/cmd/gist/delete/delete.go index af070b10e..ad1e0a48b 100644 --- a/pkg/cmd/gist/delete/delete.go +++ b/pkg/cmd/gist/delete/delete.go @@ -109,7 +109,7 @@ func deleteRun(opts *DeleteOptions) error { } if !opts.Confirmed { - confirmed, err := opts.Prompter.Confirm(fmt.Sprintf("Delete %q gist?", gist.FilenameDescription()), false) + confirmed, err := opts.Prompter.Confirm(fmt.Sprintf("Delete %q gist?", gist.Filename()), false) if err != nil { return err } @@ -119,18 +119,26 @@ func deleteRun(opts *DeleteOptions) error { } apiClient := api.NewClientFromHTTP(client) - if err := deleteGist(apiClient, host, gist, opts); err != nil { + if err := deleteGist(apiClient, host, gist.ID); err != nil { if errors.Is(err, shared.NotFoundErr) { - return fmt.Errorf("unable to delete gist %q: either the gist is not found or it is not owned by you", gist.FilenameDescription()) + return fmt.Errorf("unable to delete gist %q: either the gist is not found or it is not owned by you", gist.Filename()) } return err } + if opts.IO.IsStdoutTTY() { + cs := opts.IO.ColorScheme() + fmt.Fprintf(opts.IO.Out, + "%s Gist %q deleted\n", + cs.SuccessIcon(), + gist.Filename()) + } + return nil } -func deleteGist(apiClient *api.Client, hostname string, gist *shared.Gist, opts *DeleteOptions) error { - path := "gists/" + gist.ID +func deleteGist(apiClient *api.Client, hostname string, gistID string) error { + path := "gists/" + gistID err := apiClient.REST(hostname, "DELETE", path, nil, nil) if err != nil { var httpErr api.HTTPError @@ -139,12 +147,5 @@ func deleteGist(apiClient *api.Client, hostname string, gist *shared.Gist, opts } return err } - if opts.IO.IsStdoutTTY() { - cs := opts.IO.ColorScheme() - fmt.Fprintf(opts.IO.Out, - "%s Gist %q deleted\n", - cs.SuccessIcon(), - gist.FilenameDescription()) - } return nil } diff --git a/pkg/cmd/gist/delete/delete_test.go b/pkg/cmd/gist/delete/delete_test.go index 729f81527..359e73a59 100644 --- a/pkg/cmd/gist/delete/delete_test.go +++ b/pkg/cmd/gist/delete/delete_test.go @@ -117,14 +117,14 @@ func TestNewCmdDelete(t *testing.T) { func Test_deleteRun(t *testing.T) { tests := []struct { - name string - opts *DeleteOptions - cancel bool - httpStubs func(*httpmock.Registry) - mockGistList bool - wantErr bool - wantStdout string - wantStderr string + name string + opts *DeleteOptions + cancel bool + httpStubs func(*httpmock.Registry) + mockPromptGists bool + wantErr bool + wantStdout string + wantStderr string }{ { name: "successfully delete", @@ -133,12 +133,12 @@ func Test_deleteRun(t *testing.T) { }, httpStubs: func(reg *httpmock.Registry) { reg.Register(httpmock.REST("GET", "gists/1234"), - httpmock.JSONResponse(shared.Gist{ID: "1234", Description: "my cool text", Files: map[string]*shared.GistFile{"cool.txt": {Filename: "cool.txt"}}})) + httpmock.JSONResponse(shared.Gist{ID: "1234", Files: map[string]*shared.GistFile{"cool.txt": {Filename: "cool.txt"}}})) reg.Register(httpmock.REST("DELETE", "gists/1234"), httpmock.StatusStringResponse(200, "{}")) }, wantErr: false, - wantStdout: "✓ Gist \"cool.txt my cool text\" deleted\n", + wantStdout: "✓ Gist \"cool.txt\" deleted\n", wantStderr: "", }, { @@ -150,10 +150,10 @@ func Test_deleteRun(t *testing.T) { reg.Register(httpmock.REST("DELETE", "gists/1234"), httpmock.StatusStringResponse(200, "{}")) }, - mockGistList: true, - wantErr: false, - wantStdout: "✓ Gist \"cool.txt my cool text\" deleted\n", - wantStderr: "", + mockPromptGists: true, + wantErr: false, + wantStdout: "✓ Gist \"cool.txt\" deleted\n", + wantStderr: "", }, { name: "successfully delete with --yes", @@ -163,12 +163,12 @@ func Test_deleteRun(t *testing.T) { }, httpStubs: func(reg *httpmock.Registry) { reg.Register(httpmock.REST("GET", "gists/1234"), - httpmock.JSONResponse(shared.Gist{ID: "1234", Description: "my cool text", Files: map[string]*shared.GistFile{"cool.txt": {Filename: "cool.txt"}}})) + httpmock.JSONResponse(shared.Gist{ID: "1234", Files: map[string]*shared.GistFile{"cool.txt": {Filename: "cool.txt"}}})) reg.Register(httpmock.REST("DELETE", "gists/1234"), httpmock.StatusStringResponse(200, "{}")) }, wantErr: false, - wantStdout: "✓ Gist \"cool.txt my cool text\" deleted\n", + wantStdout: "✓ Gist \"cool.txt\" deleted\n", wantStderr: "", }, { @@ -181,10 +181,10 @@ func Test_deleteRun(t *testing.T) { reg.Register(httpmock.REST("DELETE", "gists/1234"), httpmock.StatusStringResponse(200, "{}")) }, - mockGistList: true, - wantErr: false, - wantStdout: "✓ Gist \"cool.txt my cool text\" deleted\n", - wantStderr: "", + mockPromptGists: true, + wantErr: false, + wantStdout: "✓ Gist \"cool.txt\" deleted\n", + wantStderr: "", }, { name: "cancel delete with id", @@ -193,7 +193,7 @@ func Test_deleteRun(t *testing.T) { }, httpStubs: func(reg *httpmock.Registry) { reg.Register(httpmock.REST("GET", "gists/1234"), - httpmock.JSONResponse(shared.Gist{ID: "1234", Description: "my cool text", Files: map[string]*shared.GistFile{"cool.txt": {Filename: "cool.txt"}}})) + httpmock.JSONResponse(shared.Gist{ID: "1234", Files: map[string]*shared.GistFile{"cool.txt": {Filename: "cool.txt"}}})) }, cancel: true, wantErr: true, @@ -207,7 +207,7 @@ func Test_deleteRun(t *testing.T) { }, httpStubs: func(reg *httpmock.Registry) { reg.Register(httpmock.REST("GET", "gists/1234"), - httpmock.JSONResponse(shared.Gist{ID: "1234", Description: "my cool text", Files: map[string]*shared.GistFile{"cool.txt": {Filename: "cool.txt"}}})) + httpmock.JSONResponse(shared.Gist{ID: "1234", Files: map[string]*shared.GistFile{"cool.txt": {Filename: "cool.txt"}}})) }, cancel: true, wantErr: true, @@ -219,10 +219,12 @@ func Test_deleteRun(t *testing.T) { opts: &DeleteOptions{ Selector: "", }, - cancel: true, - wantErr: true, - wantStdout: "", - wantStderr: "", + httpStubs: func(reg *httpmock.Registry) {}, + mockPromptGists: true, + cancel: true, + wantErr: true, + wantStdout: "", + wantStderr: "", }, { name: "not found", @@ -231,52 +233,49 @@ func Test_deleteRun(t *testing.T) { }, httpStubs: func(reg *httpmock.Registry) { reg.Register(httpmock.REST("GET", "gists/1234"), - httpmock.JSONResponse(shared.Gist{ID: "1234", Description: "my cool text", Files: map[string]*shared.GistFile{"cool.txt": {Filename: "cool.txt"}}})) + httpmock.JSONResponse(shared.Gist{ID: "1234", Files: map[string]*shared.GistFile{"cool.txt": {Filename: "cool.txt"}}})) reg.Register(httpmock.REST("DELETE", "gists/1234"), httpmock.StatusStringResponse(404, "{}")) }, wantErr: true, wantStdout: "", - wantStderr: "unable to delete gist \"cool.txt my cool text\": either the gist is not found or it is not owned by you", + wantStderr: "unable to delete gist \"cool.txt\": either the gist is not found or it is not owned by you", }, } for _, tt := range tests { pm := prompter.NewMockPrompter(t) if !tt.opts.Confirmed { - pm.RegisterConfirm("Delete \"cool.txt my cool text\" gist?", func(_ string, _ bool) (bool, error) { + pm.RegisterConfirm("Delete \"cool.txt\" gist?", func(_ string, _ bool) (bool, error) { return !tt.cancel, nil }) } reg := &httpmock.Registry{} - if !tt.cancel { - tt.httpStubs(reg) - if tt.mockGistList { - sixHours, _ := time.ParseDuration("6h") - sixHoursAgo := time.Now().Add(-sixHours) - reg.Register( - httpmock.GraphQL(`query GistList\b`), - httpmock.StringResponse(fmt.Sprintf( - `{ "data": { "viewer": { "gists": { "nodes": [ - { - "name": "1234", - "files": [{ "name": "cool.txt" }], - "description": "my cool text", - "updatedAt": "%s", - "isPublic": true - } - ] } } } }`, - sixHoursAgo.Format(time.RFC3339), - )), - ) - - pm.RegisterSelect("Select a gist", []string{"cool.txt my cool text about 6 hours ago"}, func(_, _ string, opts []string) (int, error) { - return 0, nil - }) - } + tt.httpStubs(reg) + if tt.mockPromptGists { + sixHours, _ := time.ParseDuration("6h") + sixHoursAgo := time.Now().Add(-sixHours) + reg.Register( + httpmock.GraphQL(`query GistList\b`), + httpmock.StringResponse(fmt.Sprintf( + `{ "data": { "viewer": { "gists": { "nodes": [ + { + "name": "1234", + "files": [{ "name": "cool.txt" }], + "updatedAt": "%s", + "isPublic": true + } + ] } } } }`, + sixHoursAgo.Format(time.RFC3339), + )), + ) + pm.RegisterSelect("Select a gist", []string{"cool.txt about 6 hours ago"}, func(_, _ string, _ []string) (int, error) { + return 0, nil + }) } + tt.opts.Prompter = pm tt.opts.HttpClient = func() (*http.Client, error) { diff --git a/pkg/cmd/gist/shared/shared.go b/pkg/cmd/gist/shared/shared.go index 085eec0ab..53b577e4c 100644 --- a/pkg/cmd/gist/shared/shared.go +++ b/pkg/cmd/gist/shared/shared.go @@ -52,10 +52,6 @@ func (g Gist) TruncDescription() string { return text.Truncate(100, text.RemoveExcessiveWhitespace(g.Description)) } -func (g Gist) FilenameDescription() string { - return g.Filename() + " " + g.TruncDescription() -} - var NotFoundErr = errors.New("not found") func GetGist(client *http.Client, hostname, gistID string) (*Gist, error) {