done

jsjoeio · jsjoeio · commit 169831f4f138 · 2022-05-12T21:50:37.000Z
diff --git a/cli/cliarg/cliarg.go b/cli/cliarg/cliarg.go
@@ -21,7 +21,7 @@ func ExactNamedArg(namedArg string, customErrorMessage string) cobra.PositionalA
 	return func(cmd *cobra.Command, args []string) error {
 		expectedNumOfArgs := 1
 		if len(args) != expectedNumOfArgs {
-			return fmt.Errorf("this command accepts <%s> as an argument, received no arguments. <%s>", namedArg, customErrorMessage)
+			return fmt.Errorf("this command accepts <%s> as an argument, received no arguments. %s", namedArg, customErrorMessage)
 		}
 		return nil
 	}
diff --git a/cli/cliarg/cliflag_test.go b/cli/cliarg/cliflag_test.go
@@ -3,9 +3,10 @@ package cliarg_test
 import (
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/coder/coder/cli/cliarg"
 	"github.com/coder/coder/cli/clitest"
-	"github.com/stretchr/testify/require"
 )
 
 func TestCliarg(t *testing.T) {
diff --git a/cli/delete.go b/cli/delete.go
@@ -1,26 +1,27 @@
 package cli
 
 import (
-	"fmt"
 	"time"
 
 	"github.com/spf13/cobra"
 
+	"github.com/coder/coder/cli/cliarg"
 	"github.com/coder/coder/cli/cliui"
 	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/codersdk"
 )
 
+const DeleteError = "Did you forget to pass a workspace name? Run command with --help to see an example."
+
 // nolint
 func delete() *cobra.Command {
 	return &cobra.Command{
 		Annotations: workspaceCommand,
 		Use:         "delete <workspace>",
 		Short:       "Delete a workspace",
 		Aliases:     []string{"rm"},
-		Args:        cobra.ExactArgs(1),
+		Args:        cliarg.ExactNamedArg("workspace", DeleteError),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			fmt.Println("Delete function is running")
 			client, err := createClient(cmd)
 			if err != nil {
 				return err
diff --git a/cli/delete_test.go b/cli/delete_test.go
@@ -5,41 +5,18 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/coder/coder/cli"
 	"github.com/coder/coder/cli/clitest"
-	"github.com/coder/coder/coderd/coderdtest"
-	"github.com/coder/coder/pty/ptytest"
 )
 
 func TestDelete(t *testing.T) {
 	t.Parallel()
-	t.Run("DeleteWithoutParameter", func(t *testing.T) {
+	t.Run("WithoutParameters", func(t *testing.T) {
 		t.Parallel()
-		// Setup
-		client := coderdtest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-		coderdtest.NewProvisionerDaemon(t, client)
-		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
-		coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
-		_ = coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
-		// When user tries "delete" without a parameter
-		cmd, root := clitest.New(t, "delete", "")
-		clitest.SetupConfig(t, client, root)
-		doneChan := make(chan struct{})
-		pty := ptytest.New(t)
-		cmd.SetIn(pty.Input())
-		cmd.SetOut(pty.Output())
-		go func() {
-			defer close(doneChan)
-			err := cmd.Execute()
-			require.NoError(t, err)
-		}()
-		matches := []string{
-			"hello world",
-		}
-		for i := 0; i < len(matches); i += 1 {
-			match := matches[i]
-			pty.ExpectMatch(match)
-		}
-		<-doneChan
+
+		cmd, _ := clitest.New(t, "delete")
+
+		err := cmd.Execute()
+		require.ErrorContains(t, err, cli.DeleteError)
 	})
 }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ func ExactNamedArg(namedArg string, customErrorMessage string) cobra.PositionalA`
`21`	`21`	`return func(cmd *cobra.Command, args []string) error {`
`22`	`22`	`expectedNumOfArgs := 1`
`23`	`23`	`if len(args) != expectedNumOfArgs {`
`24`		`- return fmt.Errorf("this command accepts <%s> as an argument, received no arguments. <%s>", namedArg, customErrorMessage)`
	`24`	`+ return fmt.Errorf("this command accepts <%s> as an argument, received no arguments. %s", namedArg, customErrorMessage)`
`25`	`25`	`}`
`26`	`26`	`return nil`
`27`	`27`	`}`