From 995365c04a19b1f919df3e54583c2c22aab0050e Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Sat, 14 Jan 2017 19:52:39 -0200 Subject: [PATCH] fixed tests --- pipeline/build/name_test.go | 4 +++- pipeline/defaults/defaults_test.go | 22 ++++++++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/pipeline/build/name_test.go b/pipeline/build/name_test.go index 62cdc644d..86f654212 100644 --- a/pipeline/build/name_test.go +++ b/pipeline/build/name_test.go @@ -20,7 +20,6 @@ func TestNameFor(t *testing.T) { assert := assert.New(t) var config = &config.ProjectConfig{ - BinaryName: "test", Archive: config.ArchiveConfig{ NameTemplate: "{{.BinaryName}}_{{.Os}}_{{.Arch}}_{{.Version}}", Replacements: map[string]string{ @@ -28,6 +27,9 @@ func TestNameFor(t *testing.T) { "amd64": "x86_64", }, }, + Build: config.BuildConfig{ + BinaryName: "test", + }, } var ctx = &context.Context{ Config: config, diff --git a/pipeline/defaults/defaults_test.go b/pipeline/defaults/defaults_test.go index 0ecd88b73..77d3f9eb6 100644 --- a/pipeline/defaults/defaults_test.go +++ b/pipeline/defaults/defaults_test.go @@ -18,19 +18,19 @@ func TestFillBasicData(t *testing.T) { assert.NoError(Pipe{}.Run(ctx)) - assert.Equal("goreleaser/releaser", config.Repo) - assert.Equal("releaser", config.BinaryName) + assert.Equal("goreleaser/releaser", config.Release.Repo) + assert.Equal("releaser", config.Build.BinaryName) assert.Equal("main.go", config.Build.Main) assert.Equal("tar.gz", config.Archive.Format) - assert.Contains(config.Build.Oses, "darwin") - assert.Contains(config.Build.Oses, "linux") - assert.Contains(config.Build.Arches, "386") - assert.Contains(config.Build.Arches, "amd64") + assert.Contains(config.Build.Goos, "darwin") + assert.Contains(config.Build.Goos, "linux") + assert.Contains(config.Build.Goarch, "386") + assert.Contains(config.Build.Goarch, "amd64") assert.NotEmpty( config.Archive.Replacements, config.Archive.NameTemplate, config.Build.Ldflags, - config.Files, + config.Archive.Files, ) } @@ -38,8 +38,10 @@ func TestFilesFilled(t *testing.T) { assert := assert.New(t) var config = &config.ProjectConfig{ - Files: []string{ - "README.md", + Archive: config.ArchiveConfig{ + Files: []string{ + "README.md", + }, }, } var ctx = &context.Context{ @@ -47,7 +49,7 @@ func TestFilesFilled(t *testing.T) { } assert.NoError(Pipe{}.Run(ctx)) - assert.Len(config.Files, 1) + assert.Len(config.Archive.Files, 1) } func TestAcceptFiles(t *testing.T) {