[cli-tests] add more tests to improve code coverage

Author: Pavan Kumar

new.go

@@ -78,7 +78,7 @@ Directory Name: `,
 		)
 	}
 
-	fmt.Scanf("%s\n", &cloudCodeDir)
+	fmt.Fscanf(e.In, "%s\n", &cloudCodeDir)
 	cloudCodeDir = strings.TrimSpace(cloudCodeDir)
 	if cloudCodeDir == "" {
 		cloudCodeDir = appName

new_cmd_test.go

@@ -3,13 +3,15 @@ package main
 import (
 	"fmt"
 	"io/ioutil"
+	"net/http"
 	"os"
 	"path/filepath"
 	"regexp"
 	"strings"
 	"testing"
 
 	"github.com/facebookgo/ensure"
+	"github.com/facebookgo/parse"
 )
 
 func newNewCmdHarness(t testing.TB) (*Harness, *newCmd) {
@@ -18,6 +20,69 @@ func newNewCmdHarness(t testing.TB) (*Harness, *newCmd) {
 	return h, &newCmd{}
 }
 
+func TestCloudCodeHelpMessage(t *testing.T) {
+	t.Parallel()
+	h := newHarness(t)
+	defer h.Stop()
+
+	n := &newCmd{}
+	msg := n.cloudCodeHelpMessage(h.env, &app{ApplicationID: "a", MasterKey: "m"})
+	ensure.StringContains(t,
+		msg,
+		fmt.Sprintf(
+			`Your Cloud Code has been created at %s.
+Next, you might want to deploy this code with "parse deploy".
+This includes a "Hello world" cloud function, so once you deploy
+you can test that it works, with:`,
+			h.env.Root,
+		),
+	)
+}
+
+func TestGetCloudCodeDir(t *testing.T) {
+	t.Parallel()
+	h := newHarness(t)
+	h.makeEmptyRoot()
+	defer h.Stop()
+
+	n := &newCmd{}
+	h.env.In = ioutil.NopCloser(strings.NewReader("\n"))
+	name, err := n.getCloudCodeDir(h.env, "myapp", true)
+	ensure.Nil(t, err)
+	ensure.StringContains(t, h.Out.String(), "Now it's time to set up some Cloud Code")
+	ensure.DeepEqual(t, name, "myapp")
+
+	h.Out.Reset()
+	h.env.In = ioutil.NopCloser(strings.NewReader("otherApp\n"))
+	name, err = n.getCloudCodeDir(h.env, "myapp", true)
+	ensure.Nil(t, err)
+	ensure.StringContains(t, h.Out.String(), "Now it's time to set up some Cloud Code")
+	ensure.DeepEqual(t, name, "otherApp")
+
+	_, err = os.Create(filepath.Join(h.env.Root, "otherApp"))
+	ensure.Nil(t, err)
+	h.Out.Reset()
+	h.env.In = ioutil.NopCloser(strings.NewReader("otherApp\n"))
+	name, err = n.getCloudCodeDir(h.env, "myapp", true)
+	ensure.Err(t, err, regexp.MustCompile("already exists"))
+	ensure.StringContains(t, h.Out.String(), "Now it's time to set up some Cloud Code")
+
+	ensure.Nil(t, os.MkdirAll(filepath.Join(h.env.Root, "myapp", "config"), 0755))
+	_, err = os.Create(filepath.Join(h.env.Root, "myapp", "config", "global.json"))
+	ensure.Nil(t, err)
+	h.Out.Reset()
+	h.env.In = ioutil.NopCloser(strings.NewReader("\n"))
+	name, err = n.getCloudCodeDir(h.env, "myapp", true)
+	ensure.Err(t, err, regexp.MustCompile("you already have Cloud Code"))
+	ensure.Nil(t, os.Remove(filepath.Join(h.env.Root, "myapp", "config", "global.json")))
+
+	h.Out.Reset()
+	h.env.In = ioutil.NopCloser(strings.NewReader("\n"))
+	name, err = n.getCloudCodeDir(h.env, "myapp", false)
+	ensure.Nil(t, err)
+	ensure.StringContains(t, h.Out.String(), "folder where we can download the latest")
+}
+
 func TestNewCmdDirs(t *testing.T) {
 	t.Parallel()
 
@@ -104,4 +169,50 @@ func TestShouldCreateNewApp(t *testing.T) {
 	h.env.In = ioutil.NopCloser(strings.NewReader("other"))
 	_, err = n.promptCreateNewApp(h.env, false)
 	ensure.Err(t, err, regexp.MustCompile("are the only valid options"))
+
+	decision, err = n.promptCreateNewApp(h.env, true)
+	ensure.Nil(t, err)
+	ensure.DeepEqual(t, decision, "existing")
+
+	n.createNewApp = true
+	decision, err = n.promptCreateNewApp(h.env, true)
+	ensure.Nil(t, err)
+	ensure.DeepEqual(t, decision, "new")
+}
+
+func TestSetupAndConfigure(t *testing.T) {
+	t.Parallel()
+	h := newHarness(t)
+	h.makeEmptyRoot()
+	defer h.Stop()
+
+	n := &newCmd{}
+	h.env.Type = parseFormat
+	h.env.In = ioutil.NopCloser(strings.NewReader("\n"))
+	code, err := n.setupSample(h.env, "myapp", &parseAppConfig{ApplicationID: "a"}, true, false)
+	ensure.Nil(t, err)
+	ensure.True(t, code)
+
+	ht := transportFunc(func(r *http.Request) (*http.Response, error) {
+		ensure.DeepEqual(t, r.URL.Path, "/1/jsVersions")
+		rows := jsSDKVersion{JS: []string{"1.5.0", "1.6.0"}}
+		return &http.Response{
+			StatusCode: http.StatusOK,
+			Body:       ioutil.NopCloser(strings.NewReader(jsonStr(t, rows))),
+		}, nil
+	})
+	h.env.ParseAPIClient = &ParseAPIClient{apiClient: &parse.Client{Transport: ht}}
+	err = n.configureSample(
+		&addCmd{MakeDefault: true},
+		"yolo",
+		&parseAppConfig{ApplicationID: "a", masterKey: "m"},
+		nil,
+		h.env,
+	)
+	ensure.Nil(t, err)
+
+	d := &defaultCmd{}
+	h.Out.Reset()
+	ensure.Nil(t, d.run(h.env, nil))
+	ensure.DeepEqual(t, h.Out.String(), "Current default app is yolo\n")
 }

update_cmd.go

@@ -41,16 +41,16 @@ func (u *updateCmd) latestVersion(e *env) (string, error) {
 	return res.Version, nil
 }
 
-func (u *updateCmd) updateCLI(e *env) (bool, error) {
+func (u *updateCmd) getDownloadURL(e *env) (string, error) {
 	ostype := runtime.GOOS
 	arch := runtime.GOARCH
 
 	latestVersion, err := u.latestVersion(e)
 	if err != nil {
-		return false, err
+		return "", err
 	}
 	if latestVersion == "" || latestVersion == version {
-		return false, nil
+		return "", nil
 	}
 
 	var downloadURL string
@@ -66,7 +66,17 @@ func (u *updateCmd) updateCLI(e *env) (bool, error) {
 			downloadURL = fmt.Sprintf(downloadURLFormat, latestVersion, linuxDownload)
 		}
 	}
+	return downloadURL, nil
+}
 
+func (u *updateCmd) updateCLI(e *env) (bool, error) {
+	downloadURL, err := u.getDownloadURL(e)
+	if err != nil {
+		return false, err
+	}
+	if downloadURL == "" {
+		return false, nil
+	}
 	exec, err := osext.Executable()
 	if err != nil {
 		return false, stackerr.Wrap(err)

update_cmd_test.go

@@ -33,4 +33,8 @@ func TestLatestVersion(t *testing.T) {
 	latestVersion, err := u.latestVersion(h.env)
 	ensure.Nil(t, err)
 	ensure.DeepEqual(t, latestVersion, "2.0.2")
+
+	downloadURL, err := u.getDownloadURL(h.env)
+	ensure.StringContains(t,
+		downloadURL, "https://github.com/ParsePlatform/parse-cli/releases/download/release_2.0.2")
 }