The validation functions to test for the number of passed arguments did not
pluralize `argument(s)`, and used `argument(s)` in all cases.
This patch adds a simple `pluralize()` helper to improve this.
Before this change, `argument(s)` was used in all cases:
$ docker container ls foobar
"docker container ls" accepts no argument(s).
$ docker network create one two
"docker network create" requires exactly 1 argument(s).
$ docker network connect
"docker network connect" requires exactly 2 argument(s).
$ docker volume create one two
"docker volume create" requires at most 1 argument(s).
After this change, `argument(s)` is properly singularized or plurarized:
$ docker container ls foobar
"docker container ls" accepts no arguments.
$ docker network create one two
"docker network create" requires exactly 1 argument.
$ docker network connect
"docker network connect" requires exactly 2 arguments.
$ docker volume create one two
"docker volume create" requires at most 1 argument.
Test cases were updated accordingly.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
112 lines
3.6 KiB
Go
112 lines
3.6 KiB
Go
package image
|
|
|
|
import (
|
|
"fmt"
|
|
"io/ioutil"
|
|
"testing"
|
|
|
|
"github.com/docker/cli/cli/internal/test"
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/pkg/testutil"
|
|
"github.com/docker/docker/pkg/testutil/golden"
|
|
"github.com/pkg/errors"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestNewRemoveCommandAlias(t *testing.T) {
|
|
cmd := newRemoveCommand(test.NewFakeCli(&fakeClient{}))
|
|
assert.True(t, cmd.HasAlias("rmi"))
|
|
assert.True(t, cmd.HasAlias("remove"))
|
|
assert.False(t, cmd.HasAlias("other"))
|
|
}
|
|
|
|
func TestNewRemoveCommandErrors(t *testing.T) {
|
|
testCases := []struct {
|
|
name string
|
|
args []string
|
|
expectedError string
|
|
imageRemoveFunc func(image string, options types.ImageRemoveOptions) ([]types.ImageDeleteResponseItem, error)
|
|
}{
|
|
{
|
|
name: "wrong args",
|
|
expectedError: "requires at least 1 argument.",
|
|
},
|
|
{
|
|
name: "ImageRemove fail",
|
|
args: []string{"arg1"},
|
|
expectedError: "error removing image",
|
|
imageRemoveFunc: func(image string, options types.ImageRemoveOptions) ([]types.ImageDeleteResponseItem, error) {
|
|
assert.False(t, options.Force)
|
|
assert.True(t, options.PruneChildren)
|
|
return []types.ImageDeleteResponseItem{}, errors.Errorf("error removing image")
|
|
},
|
|
},
|
|
}
|
|
for _, tc := range testCases {
|
|
cmd := NewRemoveCommand(test.NewFakeCli(&fakeClient{
|
|
imageRemoveFunc: tc.imageRemoveFunc,
|
|
}))
|
|
cmd.SetOutput(ioutil.Discard)
|
|
cmd.SetArgs(tc.args)
|
|
testutil.ErrorContains(t, cmd.Execute(), tc.expectedError)
|
|
}
|
|
}
|
|
|
|
func TestNewRemoveCommandSuccess(t *testing.T) {
|
|
testCases := []struct {
|
|
name string
|
|
args []string
|
|
imageRemoveFunc func(image string, options types.ImageRemoveOptions) ([]types.ImageDeleteResponseItem, error)
|
|
expectedErrMsg string
|
|
}{
|
|
{
|
|
name: "Image Deleted",
|
|
args: []string{"image1"},
|
|
imageRemoveFunc: func(image string, options types.ImageRemoveOptions) ([]types.ImageDeleteResponseItem, error) {
|
|
assert.Equal(t, "image1", image)
|
|
return []types.ImageDeleteResponseItem{{Deleted: image}}, nil
|
|
},
|
|
},
|
|
{
|
|
name: "Image Deleted with force option",
|
|
args: []string{"-f", "image1"},
|
|
imageRemoveFunc: func(image string, options types.ImageRemoveOptions) ([]types.ImageDeleteResponseItem, error) {
|
|
assert.Equal(t, "image1", image)
|
|
return []types.ImageDeleteResponseItem{}, errors.Errorf("error removing image")
|
|
},
|
|
expectedErrMsg: "error removing image",
|
|
},
|
|
{
|
|
name: "Image Untagged",
|
|
args: []string{"image1"},
|
|
imageRemoveFunc: func(image string, options types.ImageRemoveOptions) ([]types.ImageDeleteResponseItem, error) {
|
|
assert.Equal(t, "image1", image)
|
|
return []types.ImageDeleteResponseItem{{Untagged: image}}, nil
|
|
},
|
|
},
|
|
{
|
|
name: "Image Deleted and Untagged",
|
|
args: []string{"image1", "image2"},
|
|
imageRemoveFunc: func(image string, options types.ImageRemoveOptions) ([]types.ImageDeleteResponseItem, error) {
|
|
if image == "image1" {
|
|
return []types.ImageDeleteResponseItem{{Untagged: image}}, nil
|
|
}
|
|
return []types.ImageDeleteResponseItem{{Deleted: image}}, nil
|
|
},
|
|
},
|
|
}
|
|
for _, tc := range testCases {
|
|
fakeCli := test.NewFakeCli(&fakeClient{imageRemoveFunc: tc.imageRemoveFunc})
|
|
cmd := NewRemoveCommand(fakeCli)
|
|
cmd.SetOutput(ioutil.Discard)
|
|
cmd.SetArgs(tc.args)
|
|
assert.NoError(t, cmd.Execute())
|
|
if tc.expectedErrMsg != "" {
|
|
assert.Equal(t, tc.expectedErrMsg, fakeCli.ErrBuffer().String())
|
|
}
|
|
actual := fakeCli.OutBuffer().String()
|
|
expected := string(golden.Get(t, []byte(actual), fmt.Sprintf("remove-command-success.%s.golden", tc.name))[:])
|
|
testutil.EqualNormalizedString(t, testutil.RemoveSpace, actual, expected)
|
|
}
|
|
}
|