grim/convey

Fix bad copy and paste mistake.
inject
2017-10-13, Eric Fritz
0207b7e17dcc
Parents fa4c9211acd1
Children 2a18f98cc26d
Fix bad copy and paste mistake.
2 files changed, 46 insertions(+), 15 deletions(-)
  • +1 -1
    docker/errors.go
  • +45 -14
    docker/export_test.go
    • --- a/docker/errors.go Fri Oct 13 12:06:41 2017 -0500
    +++ b/docker/errors.go Fri Oct 13 12:07:40 2017 -0500
    @@ -32,5 +32,5 @@
    errNoImages = errors.New("no images specified")
    errNoSourceTag = errors.New("no source tag specified")
    errNoDestinationTags = errors.New("no destination tags specified")
    - errNoFilesInject = errors.New("no environment files specified")
    + errNoFilesEnvironment = errors.New("no environment files specified")
    )
    --- a/docker/export_test.go Fri Oct 13 12:06:41 2017 -0500
    +++ b/docker/export_test.go Fri Oct 13 12:07:40 2017 -0500
    @@ -18,19 +18,50 @@
    package docker
    import (
    - "errors"
    + . "github.com/onsi/gomega"
    +
    + "github.com/aphistic/sweet"
    + "github.com/go-yaml/yaml"
    +
    + cYaml "bitbucket.org/rw_grim/convey/yaml"
    )
    -var (
    - errNoDockerFile = errors.New("no dockerfile specified")
    - errNoTag = errors.New("no tag specified")
    - errWildcardWithDestination = errors.New("file list contains a wildcard with a destination")
    - errNoFiles = errors.New("no files specified")
    - errNoServer = errors.New("no server specified")
    - errNoUsername = errors.New("no username specified")
    - errNoImage = errors.New("no image specified")
    - errNoImages = errors.New("no images specified")
    - errNoSourceTag = errors.New("no source tag specified")
    - errNoDestinationTags = errors.New("no destination tags specified")
    - errNoFilesEnvironment = errors.New("no environment files specified")
    -)
    +func (s *dockerSuite) TestExport(t sweet.T) {
    + e := &Export{Files: cYaml.StringOrSlice{"foo"}}
    + Expect(e.Valid()).To(BeNil())
    +}
    +
    +func (s *dockerSuite) TestExportFilesRequired(t sweet.T) {
    + e := &Export{}
    + Expect(e.Valid()).To(MatchError(errNoFiles))
    +}
    +
    +func (s *dockerSuite) TestExportFilesDoesNotAllowWildcardWithDestination(t sweet.T) {
    + e := Export{
    + Files: cYaml.StringOrSlice{"*:/foo"},
    + }
    +
    + Expect(e.Valid()).To(MatchError(errWildcardWithDestination))
    +}
    +
    +func (s *dockerSuite) TestExportUnmarshalString(t sweet.T) {
    + data := `files: filename`
    +
    + exp := Export{}
    + err := yaml.Unmarshal([]byte(data), &exp)
    +
    + Expect(err).To(BeNil())
    + Expect(exp.Files).To(Equal(cYaml.StringOrSlice{"filename"}))
    +}
    +
    +func (s *dockerSuite) TestExportUnmarshalStringSlice(t sweet.T) {
    + data := `files:
    + - filename1
    + - filename2`
    +
    + exp := Export{}
    + err := yaml.Unmarshal([]byte(data), &exp)
    +
    + Expect(err).To(BeNil())
    + Expect(exp.Files).To(Equal(cYaml.StringOrSlice{"filename1", "filename2"}))
    +}