Refactored tests for commands

Author: moul

pkg/commands/command_test.go

@@ -6,10 +6,13 @@
 package commands
 
 import (
+	"bytes"
 	"os"
 	"testing"
 
+	"github.com/Sirupsen/logrus"
 	"github.com/scaleway/scaleway-cli/pkg/api"
+	"github.com/scaleway/scaleway-cli/pkg/config"
 	"github.com/scaleway/scaleway-cli/vendor/github.com/stretchr/testify/assert"
 )
 
@@ -39,3 +42,34 @@ func TestCommandContext_Getenv(t *testing.T) {
 	assert.Equal(t, ctx.Getenv("HOME"), os.Getenv("HOME"))
 	assert.Equal(t, ctx.Getenv("DONTEXISTS"), "")
 }
+
+func RealAPIContext() *CommandContext {
+	config, err := config.GetConfig()
+	if err != nil {
+		logrus.Warnf("RealAPIContext: failed to call config.GetConfig(): %v", err)
+		return nil
+	}
+
+	apiClient, err := api.NewScalewayAPI(config.ComputeAPI, config.AccountAPI, config.Organization, config.Token)
+	if err != nil {
+		logrus.Warnf("RealAPIContext: failed to call api.NewScalewayAPI(): %v", err)
+		return nil
+	}
+
+	stdout := bytes.Buffer{}
+	stderr := bytes.Buffer{}
+
+	ctx := CommandContext{
+		Streams: Streams{
+			Stdin:  os.Stdin,
+			Stdout: &stdout,
+			Stderr: &stderr,
+		},
+		Env: []string{
+			"HOME" + os.Getenv("HOME"),
+		},
+		RawArgs: []string{},
+		API:     apiClient,
+	}
+	return &ctx
+}

pkg/commands/version_test.go

@@ -8,23 +8,26 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/vendor/github.com/stretchr/testify/assert"
+	. "github.com/smartystreets/goconvey/convey"
 )
 
-func TestToto(t *testing.T) {
-	ctx := ExampleCommandContext()
-	var buf bytes.Buffer
-	ctx.Stdout = &buf
+func TestVersion(t *testing.T) {
+	Convey("Testing Version()", t, func() {
+		ctx := ExampleCommandContext()
+		var buf bytes.Buffer
+		ctx.Stdout = &buf
 
-	args := VersionArgs{}
+		args := VersionArgs{}
+
+		err := Version(ctx, args)
 
-	err := Version(ctx, args)
+		So(err, ShouldBeNil)
+		So(buf.String(), ShouldContainSubstring, "Client version: ")
+		So(buf.String(), ShouldContainSubstring, "Go version (client): ")
+		So(buf.String(), ShouldContainSubstring, "Git commit (client): ")
+		So(buf.String(), ShouldContainSubstring, "OS/Arch (client): ")
 
-	assert.Nil(t, err)
-	assert.Contains(t, buf.String(), "Client version: ")
-	assert.Contains(t, buf.String(), "Go version (client): ")
-	assert.Contains(t, buf.String(), "Git commit (client): ")
-	assert.Contains(t, buf.String(), "OS/Arch (client): ")
+	})
 }
 
 func ExampleVersion() {