add createRun tests

vilmibm · vilmibm · commit ba46362a7f16 · 2020-07-21T17:19:59.000-05:00
diff --git a/pkg/cmd/gist/create/create.go b/pkg/cmd/gist/create/create.go
@@ -6,7 +6,6 @@ import (
 	"io"
 	"io/ioutil"
 	"net/http"
-	"os"
 	"path"
 	"strings"
 
@@ -93,7 +92,7 @@ func createRun(opts *CreateOptions) error {
 		fileArgs = []string{"-"}
 	}
 
-	files, err := processFiles(os.Stdin, fileArgs)
+	files, err := processFiles(opts.IO.In, fileArgs)
 	if err != nil {
 		return fmt.Errorf("failed to collect files for posting: %w", err)
 	}
diff --git a/pkg/cmd/gist/create/create_test.go b/pkg/cmd/gist/create/create_test.go
@@ -2,6 +2,7 @@ package create
 
 import (
 	"bytes"
+	"encoding/json"
 	"io/ioutil"
 	"net/http"
 	"strings"
@@ -14,40 +15,6 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-// func TestGistCreate(t *testing.T) {
-// 	initBlankContext("", "OWNER/REPO", "trunk")
-
-// 	http := initFakeHTTP()
-// 	http.Register(httpmock.REST("POST", "gists"), httpmock.StringResponse(`
-// 	{
-// 		"html_url": "https://gist.github.com/aa5a315d61ae9438b18d"
-// 	}
-// 	`))
-
-// 	output, err := RunCommand(`gist create "../test/fixtures/gistCreate.json" -d "Gist description" --public`)
-// 	assert.NoError(t, err)
-
-// 	bodyBytes, _ := ioutil.ReadAll(http.Requests[0].Body)
-// 	reqBody := make(map[string]interface{})
-// 	err = json.Unmarshal(bodyBytes, &reqBody)
-// 	if err != nil {
-// 		t.Fatalf("error decoding JSON: %v", err)
-// 	}
-
-// 	expectParams := map[string]interface{}{
-// 		"description": "Gist description",
-// 		"files": map[string]interface{}{
-// 			"gistCreate.json": map[string]interface{}{
-// 				"content": "{}",
-// 			},
-// 		},
-// 		"public": true,
-// 	}
-
-// 	assert.Equal(t, expectParams, reqBody)
-// 	assert.Equal(t, "https://gist.github.com/aa5a315d61ae9438b18d\n", output.String())
-// }
-
 func Test_processFiles(t *testing.T) {
 	fakeStdin := strings.NewReader("hey cool how is it going")
 	files, err := processFiles(ioutil.NopCloser(fakeStdin), []string{"-"})
@@ -169,50 +136,121 @@ func TestNewCmdCreate(t *testing.T) {
 	}
 }
 
+func testIOWithStdin(stdinContent string) *iostreams.IOStreams {
+	tio, stdin, _, _ := iostreams.Test()
+	stdin.WriteString(stdinContent)
+	return tio
+}
+
 func testIO() *iostreams.IOStreams {
 	tio, _, _, _ := iostreams.Test()
 	return tio
 }
 
 func Test_createRun(t *testing.T) {
 	tests := []struct {
-		name    string
-		opts    *CreateOptions
-		want    func(t *testing.T)
-		wantErr bool
+		name       string
+		opts       *CreateOptions
+		wantOut    string
+		wantParams map[string]interface{}
+		wantErr    bool
 	}{
-		// TODO stdin passed as -
-		// TODO stdin as |
-		// TODO multiple files
-		// TODO description
-		// TODO public
 		{
-			name: "basic",
+			name: "public",
 			opts: &CreateOptions{
 				IO:        testIO(),
-				Filenames: []string{"-"},
-				HttpClient: func() (*http.Client, error) {
-					reg := &httpmock.Registry{}
-					reg.Register(httpmock.REST("POST", "gists"), httpmock.StringResponse(`
- 	          {
- 	          	"html_url": "https://gist.github.com/aa5a315d61ae9438b18d"
- 	          }`))
-
-					return &http.Client{Transport: reg}, nil
+				Public:    true,
+				Filenames: []string{"../../../../test/fixtures/gistCreate.json"},
+			},
+			wantOut: "https://gist.github.com/aa5a315d61ae9438b18d\n",
+			wantErr: false,
+			wantParams: map[string]interface{}{
+				"public": true,
+				"files": map[string]interface{}{
+					"gistCreate.json": map[string]interface{}{
+						"content": "{}",
+					},
 				},
 			},
-			want: func(t *testing.T) {
-
+		},
+		{
+			name: "with description",
+			opts: &CreateOptions{
+				IO:          testIO(),
+				Description: "an incredibly interesting gist",
+				Filenames:   []string{"../../../../test/fixtures/gistCreate.json"},
+			},
+			wantOut: "https://gist.github.com/aa5a315d61ae9438b18d\n",
+			wantErr: false,
+			wantParams: map[string]interface{}{
+				"description": "an incredibly interesting gist",
+				"files": map[string]interface{}{
+					"gistCreate.json": map[string]interface{}{
+						"content": "{}",
+					},
+				},
+			},
+		},
+		{
+			name: "multiple files",
+			opts: &CreateOptions{
+				IO:        testIOWithStdin("cool stdin content"),
+				Filenames: []string{"../../../../test/fixtures/gistCreate.json", "-"},
 			},
+			wantOut: "https://gist.github.com/aa5a315d61ae9438b18d\n",
 			wantErr: false,
+			wantParams: map[string]interface{}{
+				"files": map[string]interface{}{
+					"gistCreate.json": map[string]interface{}{
+						"content": "{}",
+					},
+					"gistfile1.txt": map[string]interface{}{
+						"content": "cool stdin content",
+					},
+				},
+			},
+		},
+		{
+			name: "stdin arg",
+			opts: &CreateOptions{
+				IO:        testIOWithStdin("cool stdin content"),
+				Filenames: []string{"-"},
+			},
+			wantOut: "https://gist.github.com/aa5a315d61ae9438b18d\n",
+			wantErr: false,
+			wantParams: map[string]interface{}{
+				"files": map[string]interface{}{
+					"gistfile0.txt": map[string]interface{}{
+						"content": "cool stdin content",
+					},
+				},
+			},
 		},
 	}
 	for _, tt := range tests {
+		reg := &httpmock.Registry{}
+		reg.Register(httpmock.REST("POST", "gists"), httpmock.StringResponse(`
+			{ "html_url": "https://gist.github.com/aa5a315d61ae9438b18d"}`))
+
+		mockClient := func() (*http.Client, error) {
+			return &http.Client{Transport: reg}, nil
+		}
+
+		tt.opts.HttpClient = mockClient
+
 		t.Run(tt.name, func(t *testing.T) {
 			if err := createRun(tt.opts); (err != nil) != tt.wantErr {
 				t.Errorf("createRun() error = %v, wantErr %v", err, tt.wantErr)
 			}
-			tt.want(t)
+			bodyBytes, _ := ioutil.ReadAll(reg.Requests[0].Body)
+			reqBody := make(map[string]interface{})
+			err := json.Unmarshal(bodyBytes, &reqBody)
+			if err != nil {
+				t.Fatalf("error decoding JSON: %v", err)
+			}
+			assert.Equal(t, tt.wantOut, tt.opts.IO.Out.(*bytes.Buffer).String())
+			assert.Equal(t, tt.wantParams, reqBody)
+			reg.Verify(t)
 		})
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ import (`
`6`	`6`	`"io"`
`7`	`7`	`"io/ioutil"`
`8`	`8`	`"net/http"`
`9`		`- "os"`
`10`	`9`	`"path"`
`11`	`10`	`"strings"`
`12`	`11`
`@@ -93,7 +92,7 @@ func createRun(opts *CreateOptions) error {`
`93`	`92`	`fileArgs = []string{"-"}`
`94`	`93`	`}`
`95`	`94`
`96`		`- files, err := processFiles(os.Stdin, fileArgs)`
	`95`	`+ files, err := processFiles(opts.IO.In, fileArgs)`
`97`	`96`	`if err != nil {`
`98`	`97`	`return fmt.Errorf("failed to collect files for posting: %w", err)`
`99`	`98`	`}`