add test for list workspaces

Author: NautiluX

.mockery.yml

@@ -10,6 +10,6 @@ require-template-schema-exists: true
 template: testify
 template-schema: '{{.Template}}.schema.json'
 packages:
-  github.com/codesphere-cloud/cs-go/pkg/cs:
+  github.com/codesphere-cloud/cs-go/cmd:
     interfaces:
       Client:

Makefile

@@ -9,7 +9,7 @@ format:
 lint:
 	golangci-lint run
 
-test: update-mocks
+test:
 	go test ./...
 
 generate:

cmd/client.go

@@ -0,0 +1,33 @@
+package cmd
+
+//go:generate mockery
+
+import (
+	"context"
+	"fmt"
+	"net/url"
+
+	"github.com/codesphere-cloud/cs-go/api"
+	"github.com/codesphere-cloud/cs-go/pkg/cs"
+)
+
+type Client interface {
+	ListTeams() ([]api.Team, error)
+	ListWorkspaces(teamId int) ([]api.Workspace, error)
+}
+
+func NewClient(opts GlobalOptions) (Client, error) {
+	token, err := cs.GetApiToken()
+	if err != nil {
+		return nil, fmt.Errorf("failed to get API token: %e", err)
+	}
+	apiUrl, err := url.Parse(opts.GetApiUrl())
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse URL '%s': %e", opts.GetApiUrl(), err)
+	}
+	client := api.NewClient(context.Background(), api.Configuration{
+		BaseUrl: apiUrl,
+		Token:   token,
+	})
+	return client, nil
+}

cmd/list-teams.go

@@ -12,10 +12,10 @@ import (
 
 type ListTeamsCmd struct {
 	cmd  *cobra.Command
-	opts cs.GlobalOptions
+	opts GlobalOptions
 }
 
-func addListTeamsCmd(p *cobra.Command, opts cs.GlobalOptions) {
+func addListTeamsCmd(p *cobra.Command, opts GlobalOptions) {
 	l := ListTeamsCmd{
 		cmd: &cobra.Command{
 			Use:   "teams",
@@ -34,7 +34,7 @@ $ cs list teams
 }
 
 func (l *ListTeamsCmd) RunE(_ *cobra.Command, args []string) (err error) {
-	client, err := cs.NewClient(l.opts)
+	client, err := NewClient(l.opts)
 	if err != nil {
 		return fmt.Errorf("failed to create Codesphere client: %e", err)
 	}

cmd/list-workspaces.go

@@ -4,24 +4,23 @@ import (
 	"fmt"
 
 	"github.com/codesphere-cloud/cs-go/api"
-	"github.com/codesphere-cloud/cs-go/pkg/cs"
 	"github.com/codesphere-cloud/cs-go/pkg/out"
 	"github.com/jedib0t/go-pretty/v6/table"
 
 	"github.com/spf13/cobra"
 )
 
 type ListWorkspacesCmd struct {
+	Opts ListWorkspacesOptions
 	cmd  *cobra.Command
-	opts ListWorkspacesOptions
 }
 
 type ListWorkspacesOptions struct {
-	cs.GlobalOptions
+	GlobalOptions
 	TeamId *int
 }
 
-func addListWorkspacesCmd(p *cobra.Command, opts cs.GlobalOptions) {
+func addListWorkspacesCmd(p *cobra.Command, opts GlobalOptions) {
 	l := ListWorkspacesCmd{
 		cmd: &cobra.Command{
 			Use:   "workspaces",
@@ -33,34 +32,26 @@ List all workspaces:
 $ cs list workspaces --team-id <team-id>
 			`,
 		},
-		opts: ListWorkspacesOptions{GlobalOptions: opts},
+		Opts: ListWorkspacesOptions{GlobalOptions: opts},
 	}
 	l.cmd.RunE = l.RunE
 	l.parseLogCmdFlags()
 	p.AddCommand(l.cmd)
 }
 
 func (l *ListWorkspacesCmd) parseLogCmdFlags() {
-	l.opts.TeamId = l.cmd.Flags().IntP("team-id", "t", -1, "ID of team to query")
+	l.Opts.TeamId = l.cmd.Flags().IntP("team-id", "t", -1, "ID of team to query")
 }
 
 func (l *ListWorkspacesCmd) RunE(_ *cobra.Command, args []string) (err error) {
-	client, err := cs.NewClient(l.opts.GlobalOptions)
+	client, err := NewClient(l.Opts.GlobalOptions)
 	if err != nil {
 		return fmt.Errorf("failed to create Codesphere client: %e", err)
 	}
 
-	teams, err := l.getTeamIds(client)
+	workspaces, err := l.ListWorkspaces(client)
 	if err != nil {
-		return fmt.Errorf("failed to get teams: %e", err)
-	}
-	workspaces := []api.Workspace{}
-	for _, team := range teams {
-		teamWorkspaces, err := client.ListWorkspaces(team)
-		if err != nil {
-			return fmt.Errorf("failed to list workspaces: %e", err)
-		}
-		workspaces = append(workspaces, teamWorkspaces...)
+		return fmt.Errorf("failed to list workspaces: %e", err)
 	}
 
 	t := out.GetTableWriter()
@@ -77,9 +68,25 @@ func (l *ListWorkspacesCmd) RunE(_ *cobra.Command, args []string) (err error) {
 	return nil
 }
 
-func (l *ListWorkspacesCmd) getTeamIds(client cs.Client) (teams []int, err error) {
-	if l.opts.TeamId != nil && *l.opts.TeamId >= 0 {
-		teams = append(teams, *l.opts.TeamId)
+func (l *ListWorkspacesCmd) ListWorkspaces(client Client) ([]api.Workspace, error) {
+	teams, err := l.getTeamIds(client)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get teams: %e", err)
+	}
+	workspaces := []api.Workspace{}
+	for _, team := range teams {
+		teamWorkspaces, err := client.ListWorkspaces(team)
+		if err != nil {
+			return nil, fmt.Errorf("failed to list workspaces: %e", err)
+		}
+		workspaces = append(workspaces, teamWorkspaces...)
+	}
+	return workspaces, nil
+}
+
+func (l *ListWorkspacesCmd) getTeamIds(client Client) (teams []int, err error) {
+	if l.Opts.TeamId != nil && *l.Opts.TeamId >= 0 {
+		teams = append(teams, *l.Opts.TeamId)
 		return
 	}
 	var allTeams []api.Team

cmd/list-workspaces_test.go

@@ -0,0 +1,48 @@
+package cmd_test
+
+import (
+	"testing"
+
+	"github.com/codesphere-cloud/cs-go/api"
+	"github.com/codesphere-cloud/cs-go/cmd"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestListWorkspaces(t *testing.T) {
+	l := newListWorkspacesCmdWithTeam(0)
+	client := NewMockClient(t)
+	client.EXPECT().ListWorkspaces(0).Return([]api.Workspace{}, nil)
+
+	w, err := l.ListWorkspaces(client)
+	assert.Equal(t, w, []api.Workspace{}, "should return empty list of workspaces")
+	assert.Nil(t, err, "should be nil")
+}
+
+func TestListWorkspacesAllTeams(t *testing.T) {
+	l := newListWorkspacesCmd()
+	client := NewMockClient(t)
+	client.EXPECT().ListTeams().Return([]api.Team{{Id: 0}, {Id: 1}}, nil)
+
+	expectedWorkspaces := []api.Workspace{
+		{Id: 0, Name: "fakeForTeam0"},
+		{Id: 1, Name: "fakeForTeam1"},
+	}
+	client.EXPECT().ListWorkspaces(0).Return([]api.Workspace{expectedWorkspaces[0]}, nil)
+	client.EXPECT().ListWorkspaces(1).Return([]api.Workspace{expectedWorkspaces[1]}, nil)
+
+	w, err := l.ListWorkspaces(client)
+	assert.Equal(t, w, expectedWorkspaces, "should return both workspaces")
+	assert.Nil(t, err, "should be nil")
+}
+
+func newListWorkspacesCmdWithTeam(teamId int) cmd.ListWorkspacesCmd {
+	return cmd.ListWorkspacesCmd{
+		Opts: cmd.ListWorkspacesOptions{
+			TeamId: &teamId,
+		},
+	}
+}
+
+func newListWorkspacesCmd() cmd.ListWorkspacesCmd {
+	return cmd.ListWorkspacesCmd{}
+}

cmd/list.go

@@ -1,15 +1,14 @@
 package cmd
 
 import (
-	"github.com/codesphere-cloud/cs-go/pkg/cs"
 	"github.com/spf13/cobra"
 )
 
 type ListCmd struct {
 	cmd *cobra.Command
 }
 
-func addListCmd(rootCmd *cobra.Command, opts cs.GlobalOptions) {
+func addListCmd(rootCmd *cobra.Command, opts GlobalOptions) {
 	l := ListCmd{
 		cmd: &cobra.Command{
 			Use:   "list",

cmd/log.go

@@ -21,7 +21,7 @@ import (
 type LogCmd struct {
 	cmd   *cobra.Command
 	scope LogCmdScope
-	opts  cs.GlobalOptions
+	opts  GlobalOptions
 }
 
 type LogCmdScope struct {
@@ -49,7 +49,7 @@ type SSE struct {
 	data  string
 }
 
-func addLogCmd(rootCmd *cobra.Command, opts cs.GlobalOptions) {
+func addLogCmd(rootCmd *cobra.Command, opts GlobalOptions) {
 	logCmd := LogCmd{
 		cmd: &cobra.Command{
 			Use:   "log",