Skip to content

Commit

Permalink
test: run testifylint -fix (#4483)
Browse files Browse the repository at this point in the history
fix a bunch of tests

---------

Signed-off-by: Carlos Alexandro Becker <caarlos0@users.noreply.github.com>
  • Loading branch information
caarlos0 committed Dec 17, 2023
1 parent 522ab11 commit ccd8c55
Show file tree
Hide file tree
Showing 39 changed files with 104 additions and 106 deletions.
1 change: 1 addition & 0 deletions .golangci.yaml
Expand Up @@ -14,6 +14,7 @@ linters:
- tagliatelle
- misspell
- depguard
- testifylint
linters-settings:
staticcheck:
checks:
Expand Down
8 changes: 4 additions & 4 deletions internal/artifact/artifact_test.go
Expand Up @@ -117,18 +117,18 @@ func TestFilter(t *testing.T) {
require.Len(t, artifacts.Filter(ByGoos("darwin")).items, 2)

require.Len(t, artifacts.Filter(ByGoarch("amd64")).items, 4)
require.Len(t, artifacts.Filter(ByGoarch("386")).items, 0)
require.Empty(t, artifacts.Filter(ByGoarch("386")).items)

require.Len(t, artifacts.Filter(ByGoamd64("v1")).items, 1)
require.Len(t, artifacts.Filter(ByGoamd64("v2")).items, 1)
require.Len(t, artifacts.Filter(ByGoamd64("v3")).items, 1)
require.Len(t, artifacts.Filter(ByGoamd64("v4")).items, 1)

require.Len(t, artifacts.Filter(ByGoarm("6")).items, 1)
require.Len(t, artifacts.Filter(ByGoarm("7")).items, 0)
require.Empty(t, artifacts.Filter(ByGoarm("7")).items)

require.Len(t, artifacts.Filter(ByType(Checksum)).items, 2)
require.Len(t, artifacts.Filter(ByType(Binary)).items, 0)
require.Empty(t, artifacts.Filter(ByType(Binary)).items)

require.Len(t, artifacts.Filter(OnlyReplacingUnibins).items, 9)
require.Len(t, artifacts.Filter(And(OnlyReplacingUnibins, ByGoos("darwin"))).items, 1)
Expand Down Expand Up @@ -492,7 +492,7 @@ func TestByExts(t *testing.T) {
require.Len(t, artifacts.Filter(ByExt("deb")).items, 2)
require.Len(t, artifacts.Filter(ByExt("rpm")).items, 1)
require.Len(t, artifacts.Filter(ByExt("rpm", "deb")).items, 3)
require.Len(t, artifacts.Filter(ByExt("foo")).items, 0)
require.Empty(t, artifacts.Filter(ByExt("foo")).items)
}

func TestByFormats(t *testing.T) {
Expand Down
16 changes: 8 additions & 8 deletions internal/builders/golang/build_test.go
Expand Up @@ -1265,13 +1265,13 @@ func TestOverrides(t *testing.T) {
},
)
require.NoError(t, err)
require.Equal(t, dets, config.BuildDetails{
require.Equal(t, config.BuildDetails{
Ldflags: []string{"overridden"},
Gcflags: []string{"gcflag1"},
Asmflags: []string{"asm1"},
Tags: []string{"tag1"},
Env: []string{},
})
}, dets)
})

t.Run("with template", func(t *testing.T) {
Expand All @@ -1297,11 +1297,11 @@ func TestOverrides(t *testing.T) {
},
)
require.NoError(t, err)
require.Equal(t, dets, config.BuildDetails{
require.Equal(t, config.BuildDetails{
Ldflags: []string{"overridden"},
Asmflags: []string{"asm1"},
Env: []string{},
})
}, dets)
})

t.Run("with invalid template", func(t *testing.T) {
Expand Down Expand Up @@ -1345,10 +1345,10 @@ func TestOverrides(t *testing.T) {
},
)
require.NoError(t, err)
require.Equal(t, dets, config.BuildDetails{
require.Equal(t, config.BuildDetails{
Ldflags: []string{"overridden"},
Env: []string{},
})
}, dets)
})

t.Run("with gomips", func(t *testing.T) {
Expand All @@ -1375,10 +1375,10 @@ func TestOverrides(t *testing.T) {
},
)
require.NoError(t, err)
require.Equal(t, dets, config.BuildDetails{
require.Equal(t, config.BuildDetails{
Ldflags: []string{"overridden"},
Env: []string{},
})
}, dets)
})
}

Expand Down
6 changes: 3 additions & 3 deletions internal/client/gitea_test.go
Expand Up @@ -186,7 +186,7 @@ func (s *GiteaReleasesTestSuite) SetupTest() {
s.releaseURL = fmt.Sprintf("%v/%v", s.releasesURL, s.releaseID)
httpmock.RegisterResponder("GET", fmt.Sprintf("%s/api/v1/version", s.url), httpmock.NewStringResponder(200, "{\"version\":\"1.12.0\"}"))
newClient, err := gitea.NewClient(s.url)
require.NoError(s.T(), err)
s.Require().NoError(err)
s.client = &giteaClient{client: newClient}
}

Expand Down Expand Up @@ -320,7 +320,7 @@ func (s *GiteaupdateReleaseSuite) TestGiteaCreateFile() {
path := "file.txt"
message := "add hello world"
err := s.client.CreateFile(s.ctx, author, repo, content, path, message)
require.Nil(t, err)
require.NoError(t, err)
}

func TestGiteaupdateReleaseSuite(t *testing.T) {
Expand Down Expand Up @@ -442,7 +442,7 @@ func (s *GiteaUploadSuite) SetupTest() {

func (s *GiteaUploadSuite) TearDownTest() {
s.GiteaReleasesTestSuite.TearDownTest()
require.NoError(s.T(), s.file.Close())
s.Require().NoError(s.file.Close())
}

func (s *GiteaUploadSuite) TestErrorParsingReleaseID() {
Expand Down
2 changes: 1 addition & 1 deletion internal/client/github_test.go
Expand Up @@ -533,7 +533,7 @@ func TestGitHubOpenPullRequestNoBaseBranchDraft(t *testing.T) {
require.NoError(t, json.Unmarshal(got, &pr))
require.Equal(t, "main", pr.GetBase())
require.Equal(t, "someone:something:foo", pr.GetHead())
require.Equal(t, true, pr.GetDraft())
require.True(t, pr.GetDraft())

r, err := os.Open("testdata/github/pull.json")
require.NoError(t, err)
Expand Down
20 changes: 10 additions & 10 deletions internal/commitauthor/author_test.go
Expand Up @@ -46,27 +46,27 @@ func TestGet(t *testing.T) {

func TestDefault(t *testing.T) {
t.Run("empty", func(t *testing.T) {
require.Equal(t, Default(config.CommitAuthor{}), config.CommitAuthor{
require.Equal(t, config.CommitAuthor{
Name: defaultName,
Email: defaultEmail,
})
}, Default(config.CommitAuthor{}))
})

t.Run("no name", func(t *testing.T) {
require.Equal(t, Default(config.CommitAuthor{
Email: "a",
}), config.CommitAuthor{
require.Equal(t, config.CommitAuthor{
Name: defaultName,
Email: "a",
})
}, Default(config.CommitAuthor{
Email: "a",
}))
})

t.Run("no email", func(t *testing.T) {
require.Equal(t, Default(config.CommitAuthor{
Name: "a",
}), config.CommitAuthor{
require.Equal(t, config.CommitAuthor{
Name: "a",
Email: defaultEmail,
})
}, Default(config.CommitAuthor{
Name: "a",
}))
})
}
2 changes: 1 addition & 1 deletion internal/gio/copy_test.go
Expand Up @@ -26,7 +26,7 @@ func TestCopySymlink(t *testing.T) {

fi, err := os.Lstat(c)
require.NoError(t, err)
require.True(t, fi.Mode()&os.ModeSymlink != 0)
require.NotEqual(t, 0, fi.Mode()&os.ModeSymlink)

l, err := os.Readlink(c)
require.NoError(t, err)
Expand Down
3 changes: 1 addition & 2 deletions internal/middleware/errhandler/error_test.go
@@ -1,7 +1,6 @@
package errhandler

import (
"errors"
"fmt"
"testing"

Expand Down Expand Up @@ -53,6 +52,6 @@ func TestErrorMemo(t *testing.T) {

err := memo.Error()
merr := &multierror.Error{}
require.True(t, errors.As(err, &merr), "must be a multierror")
require.ErrorAs(t, err, &merr, "must be a multierror")
require.Len(t, merr.Errors, 1)
}
3 changes: 1 addition & 2 deletions internal/pipe/announce/announce_test.go
@@ -1,7 +1,6 @@
package announce

import (
"errors"
"testing"

"github.com/goreleaser/goreleaser/internal/skips"
Expand Down Expand Up @@ -30,7 +29,7 @@ func TestAnnounce(t *testing.T) {
err := Pipe{}.Run(ctx)
require.Error(t, err)
merr := &multierror.Error{}
require.True(t, errors.As(err, &merr), "must be a multierror")
require.ErrorAs(t, err, &merr, "must be a multierror")
require.Len(t, merr.Errors, 2)
}

Expand Down
2 changes: 1 addition & 1 deletion internal/pipe/blob/blob_test.go
Expand Up @@ -112,7 +112,7 @@ func TestDefaultsWithProvider(t *testing.T) {
},
},
})
require.Nil(t, Pipe{}.Default(ctx))
require.NoError(t, Pipe{}.Default(ctx))
}

func TestURL(t *testing.T) {
Expand Down
12 changes: 6 additions & 6 deletions internal/pipe/build/build_test.go
Expand Up @@ -112,9 +112,9 @@ func TestRunPipe(t *testing.T) {
},
}, testctx.WithCurrentTag("2.4.5"))
require.NoError(t, Pipe{}.Run(ctx))
require.Equal(t, ctx.Artifacts.List(), []*artifact.Artifact{{
require.Equal(t, []*artifact.Artifact{{
Name: "testing",
}})
}}, ctx.Artifacts.List())
}

func TestRunFullPipe(t *testing.T) {
Expand Down Expand Up @@ -152,9 +152,9 @@ func TestRunFullPipe(t *testing.T) {
ctx := testctx.NewWithCfg(config, testctx.WithCurrentTag("2.4.5"))
require.NoError(t, Pipe{}.Default(ctx))
require.NoError(t, Pipe{}.Run(ctx))
require.Equal(t, ctx.Artifacts.List(), []*artifact.Artifact{{
require.Equal(t, []*artifact.Artifact{{
Name: "testing",
}})
}}, ctx.Artifacts.List())
require.FileExists(t, post)
require.FileExists(t, pre)
require.FileExists(t, postOS)
Expand Down Expand Up @@ -410,7 +410,7 @@ func TestDefaultFillSingleBuild(t *testing.T) {
})
require.NoError(t, Pipe{}.Default(ctx))
require.Len(t, ctx.Config.Builds, 1)
require.Equal(t, ctx.Config.Builds[0].Binary, "foo")
require.Equal(t, "foo", ctx.Config.Builds[0].Binary)
}

func TestDefaultFailSingleBuild(t *testing.T) {
Expand Down Expand Up @@ -438,7 +438,7 @@ func TestSkipBuild(t *testing.T) {
}
ctx := testctx.NewWithCfg(config, testctx.WithCurrentTag("2.4.5"))
require.NoError(t, Pipe{}.Run(ctx))
require.Len(t, ctx.Artifacts.List(), 0)
require.Empty(t, ctx.Artifacts.List())
}

func TestExtDarwin(t *testing.T) {
Expand Down
16 changes: 8 additions & 8 deletions internal/pipe/changelog/changelog_test.go
Expand Up @@ -455,7 +455,7 @@ func TestChangeLogWithReleaseFooter(t *testing.T) {
require.NoError(t, Pipe{}.Run(ctx))
require.Contains(t, ctx.ReleaseNotes, "## Changelog")
require.Contains(t, ctx.ReleaseNotes, "test footer")
require.Equal(t, rune(ctx.ReleaseNotes[len(ctx.ReleaseNotes)-1]), '\n')
require.Equal(t, '\n', rune(ctx.ReleaseNotes[len(ctx.ReleaseNotes)-1]))
}

func TestChangeLogWithTemplatedReleaseFooter(t *testing.T) {
Expand All @@ -480,7 +480,7 @@ func TestChangeLogWithTemplatedReleaseFooter(t *testing.T) {
require.NoError(t, Pipe{}.Run(ctx))
require.Contains(t, ctx.ReleaseNotes, "## Changelog")
require.Contains(t, ctx.ReleaseNotes, "test footer with tag v0.0.1")
require.Equal(t, rune(ctx.ReleaseNotes[len(ctx.ReleaseNotes)-1]), '\n')
require.Equal(t, '\n', rune(ctx.ReleaseNotes[len(ctx.ReleaseNotes)-1]))
}

func TestChangeLogWithoutReleaseFooter(t *testing.T) {
Expand All @@ -503,7 +503,7 @@ func TestChangeLogWithoutReleaseFooter(t *testing.T) {
ctx := testctx.New(testctx.WithCurrentTag("v0.0.1"), withFirstCommit(t))
require.NoError(t, Pipe{}.Run(ctx))
require.Contains(t, ctx.ReleaseNotes, "## Changelog")
require.Equal(t, rune(ctx.ReleaseNotes[len(ctx.ReleaseNotes)-1]), '\n')
require.Equal(t, '\n', rune(ctx.ReleaseNotes[len(ctx.ReleaseNotes)-1]))
}

func TestGetChangelogGitHub(t *testing.T) {
Expand Down Expand Up @@ -589,7 +589,7 @@ func TestGetChangeloger(t *testing.T) {
t.Run("default", func(t *testing.T) {
c, err := getChangeloger(testctx.New())
require.NoError(t, err)
require.IsType(t, c, gitChangeloger{})
require.IsType(t, gitChangeloger{}, c)
})

t.Run(useGit, func(t *testing.T) {
Expand All @@ -599,7 +599,7 @@ func TestGetChangeloger(t *testing.T) {
},
}))
require.NoError(t, err)
require.IsType(t, c, gitChangeloger{})
require.IsType(t, gitChangeloger{}, c)
})

t.Run(useGitHub, func(t *testing.T) {
Expand All @@ -610,7 +610,7 @@ func TestGetChangeloger(t *testing.T) {
}, testctx.GitHubTokenType)
c, err := getChangeloger(ctx)
require.NoError(t, err)
require.IsType(t, c, &scmChangeloger{})
require.IsType(t, &scmChangeloger{}, c)
})

t.Run(useGitHubNative, func(t *testing.T) {
Expand All @@ -621,7 +621,7 @@ func TestGetChangeloger(t *testing.T) {
}, testctx.GitHubTokenType)
c, err := getChangeloger(ctx)
require.NoError(t, err)
require.IsType(t, c, &githubNativeChangeloger{})
require.IsType(t, &githubNativeChangeloger{}, c)
})

t.Run(useGitHubNative+"-invalid-repo", func(t *testing.T) {
Expand All @@ -646,7 +646,7 @@ func TestGetChangeloger(t *testing.T) {
}, testctx.GitHubTokenType)
c, err := getChangeloger(ctx)
require.NoError(t, err)
require.IsType(t, c, &scmChangeloger{})
require.IsType(t, &scmChangeloger{}, c)
})

t.Run(useGitHub+"-invalid-repo", func(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions internal/pipe/checksums/checksums_test.go
Expand Up @@ -220,7 +220,7 @@ func TestPipeCouldNotOpenChecksumsTxt(t *testing.T) {
func TestPipeWhenNoArtifacts(t *testing.T) {
ctx := testctx.New()
require.NoError(t, Pipe{}.Run(ctx))
require.Len(t, ctx.Artifacts.List(), 0)
require.Empty(t, ctx.Artifacts.List())
}

func TestDefault(t *testing.T) {
Expand Down Expand Up @@ -391,7 +391,7 @@ func TestPipeCheckSumsWithExtraFiles(t *testing.T) {
return nil
}
checkSum, err := artifact.Extra[string](*a, artifactChecksumExtra)
require.Nil(t, err)
require.NoError(t, err)
require.NotEmptyf(t, checkSum, "failed: %v", a.Path)
return nil
})
Expand Down
4 changes: 2 additions & 2 deletions internal/pipe/chocolatey/chocolatey_test.go
Expand Up @@ -326,15 +326,15 @@ func checkPushCmd(tb testing.TB, cmd string, args ...string) {
tb.Helper()
tb.Log("would have run:", cmd, args)
require.Len(tb, args, 6)
require.Equal(tb, cmd, "choco")
require.Equal(tb, "choco", cmd)
require.FileExists(tb, args[5])
}

func checkPackCmd(tb testing.TB, cmd string, args ...string) {
tb.Helper()
tb.Log("would have run:", cmd, args)
require.Len(tb, args, 4)
require.Equal(tb, cmd, "choco")
require.Equal(tb, "choco", cmd)
require.FileExists(tb, args[1])
require.DirExists(tb, args[3])
}
4 changes: 2 additions & 2 deletions internal/pipe/discord/discord_test.go
Expand Up @@ -10,13 +10,13 @@ import (
)

func TestStringer(t *testing.T) {
require.Equal(t, Pipe{}.String(), "discord")
require.Equal(t, "discord", Pipe{}.String())
}

func TestDefault(t *testing.T) {
ctx := testctx.New()
require.NoError(t, Pipe{}.Default(ctx))
require.Equal(t, ctx.Config.Announce.Discord.MessageTemplate, defaultMessageTemplate)
require.Equal(t, defaultMessageTemplate, ctx.Config.Announce.Discord.MessageTemplate)
}

func TestAnnounceInvalidTemplate(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/pipe/docker/docker_test.go
Expand Up @@ -64,7 +64,7 @@ func TestRunPipe(t *testing.T) {
for _, id := range strings.Split(strings.TrimSpace(string(output)), "\n") {
uniqueIDs[id] = id
}
require.Equal(t, 1, len(uniqueIDs))
require.Len(t, uniqueIDs, 1)
}
}
}
Expand Down

0 comments on commit ccd8c55

Please sign in to comment.