diff --git a/.golangci.yaml b/.golangci.yaml index e81fdf507..83d6c2b68 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -14,6 +14,7 @@ linters: - tagliatelle - misspell - depguard + - testifylint linters-settings: staticcheck: checks: diff --git a/internal/artifact/artifact_test.go b/internal/artifact/artifact_test.go index 45647362f..7942730d7 100644 --- a/internal/artifact/artifact_test.go +++ b/internal/artifact/artifact_test.go @@ -117,7 +117,7 @@ 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) @@ -125,10 +125,10 @@ func TestFilter(t *testing.T) { 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) @@ -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) { diff --git a/internal/builders/golang/build_test.go b/internal/builders/golang/build_test.go index 19f39a197..3cd7914f9 100644 --- a/internal/builders/golang/build_test.go +++ b/internal/builders/golang/build_test.go @@ -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) { @@ -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) { @@ -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) { @@ -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) }) } diff --git a/internal/client/gitea_test.go b/internal/client/gitea_test.go index 145dae663..f1f96690f 100644 --- a/internal/client/gitea_test.go +++ b/internal/client/gitea_test.go @@ -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} } @@ -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) { @@ -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() { diff --git a/internal/client/github_test.go b/internal/client/github_test.go index ab4f84797..a28f307e9 100644 --- a/internal/client/github_test.go +++ b/internal/client/github_test.go @@ -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) diff --git a/internal/commitauthor/author_test.go b/internal/commitauthor/author_test.go index 3a0e0047b..714447734 100644 --- a/internal/commitauthor/author_test.go +++ b/internal/commitauthor/author_test.go @@ -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", + })) }) } diff --git a/internal/gio/copy_test.go b/internal/gio/copy_test.go index a5ccf9112..9ab513cfb 100644 --- a/internal/gio/copy_test.go +++ b/internal/gio/copy_test.go @@ -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) diff --git a/internal/middleware/errhandler/error_test.go b/internal/middleware/errhandler/error_test.go index 700b62a8b..a51f27df2 100644 --- a/internal/middleware/errhandler/error_test.go +++ b/internal/middleware/errhandler/error_test.go @@ -1,7 +1,6 @@ package errhandler import ( - "errors" "fmt" "testing" @@ -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) } diff --git a/internal/pipe/announce/announce_test.go b/internal/pipe/announce/announce_test.go index 270b61181..ec2f3c0ba 100644 --- a/internal/pipe/announce/announce_test.go +++ b/internal/pipe/announce/announce_test.go @@ -1,7 +1,6 @@ package announce import ( - "errors" "testing" "github.com/goreleaser/goreleaser/internal/skips" @@ -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) } diff --git a/internal/pipe/blob/blob_test.go b/internal/pipe/blob/blob_test.go index a5fa496a9..ccc0eea8b 100644 --- a/internal/pipe/blob/blob_test.go +++ b/internal/pipe/blob/blob_test.go @@ -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) { diff --git a/internal/pipe/build/build_test.go b/internal/pipe/build/build_test.go index f1e90f0a0..95b63c4bc 100644 --- a/internal/pipe/build/build_test.go +++ b/internal/pipe/build/build_test.go @@ -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) { @@ -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) @@ -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) { @@ -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) { diff --git a/internal/pipe/changelog/changelog_test.go b/internal/pipe/changelog/changelog_test.go index 0cb221387..f51f37506 100644 --- a/internal/pipe/changelog/changelog_test.go +++ b/internal/pipe/changelog/changelog_test.go @@ -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) { @@ -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) { @@ -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) { @@ -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) { @@ -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) { @@ -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) { @@ -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) { @@ -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) { diff --git a/internal/pipe/checksums/checksums_test.go b/internal/pipe/checksums/checksums_test.go index c632d1d91..8edf7f1e6 100644 --- a/internal/pipe/checksums/checksums_test.go +++ b/internal/pipe/checksums/checksums_test.go @@ -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) { @@ -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 }) diff --git a/internal/pipe/chocolatey/chocolatey_test.go b/internal/pipe/chocolatey/chocolatey_test.go index 461d8eb90..aee3bf297 100644 --- a/internal/pipe/chocolatey/chocolatey_test.go +++ b/internal/pipe/chocolatey/chocolatey_test.go @@ -326,7 +326,7 @@ 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]) } @@ -334,7 +334,7 @@ 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]) } diff --git a/internal/pipe/discord/discord_test.go b/internal/pipe/discord/discord_test.go index 18de13146..17f50f981 100644 --- a/internal/pipe/discord/discord_test.go +++ b/internal/pipe/discord/discord_test.go @@ -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) { diff --git a/internal/pipe/docker/docker_test.go b/internal/pipe/docker/docker_test.go index 4c011281e..e33b898b8 100644 --- a/internal/pipe/docker/docker_test.go +++ b/internal/pipe/docker/docker_test.go @@ -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) } } } diff --git a/internal/pipe/linkedin/linkedin_test.go b/internal/pipe/linkedin/linkedin_test.go index f782bca5b..847b54034 100644 --- a/internal/pipe/linkedin/linkedin_test.go +++ b/internal/pipe/linkedin/linkedin_test.go @@ -10,13 +10,13 @@ import ( ) func TestStringer(t *testing.T) { - require.Equal(t, Pipe{}.String(), "linkedin") + require.Equal(t, "linkedin", Pipe{}.String()) } func TestDefault(t *testing.T) { ctx := testctx.New() require.NoError(t, Pipe{}.Default(ctx)) - require.Equal(t, ctx.Config.Announce.LinkedIn.MessageTemplate, defaultMessageTemplate) + require.Equal(t, defaultMessageTemplate, ctx.Config.Announce.LinkedIn.MessageTemplate) } func TestAnnounceDisabled(t *testing.T) { diff --git a/internal/pipe/mastodon/mastodon_test.go b/internal/pipe/mastodon/mastodon_test.go index 91ce3bced..903a98a6e 100644 --- a/internal/pipe/mastodon/mastodon_test.go +++ b/internal/pipe/mastodon/mastodon_test.go @@ -10,13 +10,13 @@ import ( ) func TestStringer(t *testing.T) { - require.Equal(t, Pipe{}.String(), "mastodon") + require.Equal(t, "mastodon", Pipe{}.String()) } func TestDefault(t *testing.T) { ctx := testctx.New() require.NoError(t, Pipe{}.Default(ctx)) - require.Equal(t, ctx.Config.Announce.Mastodon.MessageTemplate, defaultMessageTemplate) + require.Equal(t, defaultMessageTemplate, ctx.Config.Announce.Mastodon.MessageTemplate) } func TestAnnounceInvalidTemplate(t *testing.T) { diff --git a/internal/pipe/mattermost/mattermost_test.go b/internal/pipe/mattermost/mattermost_test.go index 7d69956e2..bd1d5923a 100644 --- a/internal/pipe/mattermost/mattermost_test.go +++ b/internal/pipe/mattermost/mattermost_test.go @@ -15,13 +15,13 @@ import ( ) func TestStringer(t *testing.T) { - require.Equal(t, Pipe{}.String(), "mattermost") + require.Equal(t, "mattermost", Pipe{}.String()) } func TestDefault(t *testing.T) { ctx := testctx.New() require.NoError(t, Pipe{}.Default(ctx)) - require.Equal(t, ctx.Config.Announce.Mattermost.MessageTemplate, defaultMessageTemplate) + require.Equal(t, defaultMessageTemplate, ctx.Config.Announce.Mattermost.MessageTemplate) } func TestAnnounceInvalidTemplate(t *testing.T) { diff --git a/internal/pipe/nfpm/nfpm_test.go b/internal/pipe/nfpm/nfpm_test.go index 4a9c3b4cb..577d3dd19 100644 --- a/internal/pipe/nfpm/nfpm_test.go +++ b/internal/pipe/nfpm/nfpm_test.go @@ -1256,7 +1256,7 @@ func TestMeta(t *testing.T) { format := pkg.Format() require.NotEmpty(t, format) require.Equal(t, pkg.Name, "foo_1.0.0_linux_"+pkg.Goarch+"-10-20."+format) - require.Equal(t, pkg.ID(), "someid") + require.Equal(t, "someid", pkg.ID()) require.ElementsMatch(t, []string{ "/var/log/foobar", "/usr/share/testfile.txt", diff --git a/internal/pipe/opencollective/opencollective_test.go b/internal/pipe/opencollective/opencollective_test.go index edbd51e95..66fb25c17 100644 --- a/internal/pipe/opencollective/opencollective_test.go +++ b/internal/pipe/opencollective/opencollective_test.go @@ -10,14 +10,14 @@ import ( ) func TestStringer(t *testing.T) { - require.Equal(t, Pipe{}.String(), "opencollective") + require.Equal(t, "opencollective", Pipe{}.String()) } func TestDefault(t *testing.T) { ctx := testctx.New() require.NoError(t, Pipe{}.Default(ctx)) - require.Equal(t, ctx.Config.Announce.OpenCollective.TitleTemplate, defaultTitleTemplate) - require.Equal(t, ctx.Config.Announce.OpenCollective.MessageTemplate, defaultMessageTemplate) + require.Equal(t, defaultTitleTemplate, ctx.Config.Announce.OpenCollective.TitleTemplate) + require.Equal(t, defaultMessageTemplate, ctx.Config.Announce.OpenCollective.MessageTemplate) } func TestAnnounceInvalidTemplate(t *testing.T) { diff --git a/internal/pipe/publish/publish_test.go b/internal/pipe/publish/publish_test.go index eb0798f33..662e63b9d 100644 --- a/internal/pipe/publish/publish_test.go +++ b/internal/pipe/publish/publish_test.go @@ -44,7 +44,7 @@ func TestPublishSuccess(t *testing.T) { require.Error(t, err) merr := &multierror.Error{} require.ErrorAs(t, err, &merr) - require.Equal(t, merr.Len(), 1) + require.Equal(t, 1, merr.Len()) require.True(t, lastStep.ran) } diff --git a/internal/pipe/reddit/reddit_test.go b/internal/pipe/reddit/reddit_test.go index c123071dd..ec679cfba 100644 --- a/internal/pipe/reddit/reddit_test.go +++ b/internal/pipe/reddit/reddit_test.go @@ -10,13 +10,13 @@ import ( ) func TestStringer(t *testing.T) { - require.Equal(t, Pipe{}.String(), "reddit") + require.Equal(t, "reddit", Pipe{}.String()) } func TestDefault(t *testing.T) { ctx := testctx.New() require.NoError(t, Pipe{}.Default(ctx)) - require.Equal(t, ctx.Config.Announce.Reddit.TitleTemplate, defaultTitleTemplate) + require.Equal(t, defaultTitleTemplate, ctx.Config.Announce.Reddit.TitleTemplate) } func TestAnnounceInvalidURLTemplate(t *testing.T) { diff --git a/internal/pipe/release/release_test.go b/internal/pipe/release/release_test.go index b044bd894..6aa87babf 100644 --- a/internal/pipe/release/release_test.go +++ b/internal/pipe/release/release_test.go @@ -487,7 +487,7 @@ func TestDefaultPreRelease(t *testing.T) { testctx.WithSemver(1, 0, 0, ""), ) require.NoError(t, Pipe{}.Default(ctx)) - require.Equal(t, false, ctx.PreRelease) + require.False(t, ctx.PreRelease) }) t.Run("auto-rc", func(t *testing.T) { @@ -501,7 +501,7 @@ func TestDefaultPreRelease(t *testing.T) { testctx.WithSemver(1, 0, 0, "rc1"), ) require.NoError(t, Pipe{}.Default(ctx)) - require.Equal(t, true, ctx.PreRelease) + require.True(t, ctx.PreRelease) }) t.Run("auto-rc-github-setup", func(t *testing.T) { @@ -519,7 +519,7 @@ func TestDefaultPreRelease(t *testing.T) { testctx.WithSemver(1, 0, 0, "rc1"), ) require.NoError(t, Pipe{}.Default(ctx)) - require.Equal(t, true, ctx.PreRelease) + require.True(t, ctx.PreRelease) }) } diff --git a/internal/pipe/sign/sign_test.go b/internal/pipe/sign/sign_test.go index c8104fed0..6a159d980 100644 --- a/internal/pipe/sign/sign_test.go +++ b/internal/pipe/sign/sign_test.go @@ -64,10 +64,10 @@ func TestSignDefault(t *testing.T) { setGpg(t, ctx, "") // force empty gpg.program require.NoError(t, Pipe{}.Default(ctx)) - require.Equal(t, ctx.Config.Signs[0].Cmd, "gpg") - require.Equal(t, ctx.Config.Signs[0].Signature, "${artifact}.sig") - require.Equal(t, ctx.Config.Signs[0].Args, []string{"--output", "$signature", "--detach-sig", "$artifact"}) - require.Equal(t, ctx.Config.Signs[0].Artifacts, "none") + require.Equal(t, "gpg", ctx.Config.Signs[0].Cmd) + require.Equal(t, "${artifact}.sig", ctx.Config.Signs[0].Signature) + require.Equal(t, []string{"--output", "$signature", "--detach-sig", "$artifact"}, ctx.Config.Signs[0].Args) + require.Equal(t, "none", ctx.Config.Signs[0].Artifacts) } func TestDefaultGpgFromGitConfig(t *testing.T) { @@ -80,7 +80,7 @@ func TestDefaultGpgFromGitConfig(t *testing.T) { setGpg(t, ctx, "not-really-gpg") require.NoError(t, Pipe{}.Default(ctx)) - require.Equal(t, ctx.Config.Signs[0].Cmd, "not-really-gpg") + require.Equal(t, "not-really-gpg", ctx.Config.Signs[0].Cmd) } func TestSignDisabled(t *testing.T) { diff --git a/internal/pipe/slack/slack_test.go b/internal/pipe/slack/slack_test.go index bbeee3fb9..f64ab4498 100644 --- a/internal/pipe/slack/slack_test.go +++ b/internal/pipe/slack/slack_test.go @@ -13,13 +13,13 @@ import ( ) func TestStringer(t *testing.T) { - require.Equal(t, Pipe{}.String(), "slack") + require.Equal(t, "slack", Pipe{}.String()) } func TestDefault(t *testing.T) { ctx := testctx.New() require.NoError(t, Pipe{}.Default(ctx)) - require.Equal(t, ctx.Config.Announce.Slack.MessageTemplate, defaultMessageTemplate) + require.Equal(t, defaultMessageTemplate, ctx.Config.Announce.Slack.MessageTemplate) } func TestAnnounceInvalidTemplate(t *testing.T) { diff --git a/internal/pipe/teams/teams_test.go b/internal/pipe/teams/teams_test.go index 129075eb5..21d0472c4 100644 --- a/internal/pipe/teams/teams_test.go +++ b/internal/pipe/teams/teams_test.go @@ -10,13 +10,13 @@ import ( ) func TestStringer(t *testing.T) { - require.Equal(t, Pipe{}.String(), "teams") + require.Equal(t, "teams", Pipe{}.String()) } func TestDefault(t *testing.T) { ctx := testctx.New() require.NoError(t, Pipe{}.Default(ctx)) - require.Equal(t, ctx.Config.Announce.Teams.MessageTemplate, defaultMessageTemplate) + require.Equal(t, defaultMessageTemplate, ctx.Config.Announce.Teams.MessageTemplate) } func TestAnnounceInvalidTemplate(t *testing.T) { diff --git a/internal/pipe/telegram/telegram_test.go b/internal/pipe/telegram/telegram_test.go index bb5b9098c..08e9d2df6 100644 --- a/internal/pipe/telegram/telegram_test.go +++ b/internal/pipe/telegram/telegram_test.go @@ -10,27 +10,27 @@ import ( ) func TestStringer(t *testing.T) { - require.Equal(t, Pipe{}.String(), "telegram") + require.Equal(t, "telegram", Pipe{}.String()) } func TestDefault(t *testing.T) { t.Run("empty", func(t *testing.T) { ctx := testctx.New() require.NoError(t, Pipe{}.Default(ctx)) - require.Equal(t, ctx.Config.Announce.Telegram.MessageTemplate, defaultMessageTemplate) - require.Equal(t, ctx.Config.Announce.Telegram.ParseMode, parseModeMarkdown) + require.Equal(t, defaultMessageTemplate, ctx.Config.Announce.Telegram.MessageTemplate) + require.Equal(t, parseModeMarkdown, ctx.Config.Announce.Telegram.ParseMode) }) t.Run("markdownv2 parsemode", func(t *testing.T) { ctx := testctx.New() ctx.Config.Announce.Telegram.ParseMode = parseModeMarkdown require.NoError(t, Pipe{}.Default(ctx)) - require.Equal(t, ctx.Config.Announce.Telegram.ParseMode, parseModeMarkdown) + require.Equal(t, parseModeMarkdown, ctx.Config.Announce.Telegram.ParseMode) }) t.Run("html parsemode", func(t *testing.T) { ctx := testctx.New() ctx.Config.Announce.Telegram.ParseMode = parseModeHTML require.NoError(t, Pipe{}.Default(ctx)) - require.Equal(t, ctx.Config.Announce.Telegram.ParseMode, parseModeHTML) + require.Equal(t, parseModeHTML, ctx.Config.Announce.Telegram.ParseMode) }) } diff --git a/internal/pipe/twitter/twitter_test.go b/internal/pipe/twitter/twitter_test.go index 1973064d9..e693864b9 100644 --- a/internal/pipe/twitter/twitter_test.go +++ b/internal/pipe/twitter/twitter_test.go @@ -10,13 +10,13 @@ import ( ) func TestStringer(t *testing.T) { - require.Equal(t, Pipe{}.String(), "twitter") + require.Equal(t, "twitter", Pipe{}.String()) } func TestDefault(t *testing.T) { ctx := testctx.New() require.NoError(t, Pipe{}.Default(ctx)) - require.Equal(t, ctx.Config.Announce.Twitter.MessageTemplate, defaultMessageTemplate) + require.Equal(t, defaultMessageTemplate, ctx.Config.Announce.Twitter.MessageTemplate) } func TestAnnounceInvalidTemplate(t *testing.T) { diff --git a/internal/pipe/universalbinary/universalbinary_test.go b/internal/pipe/universalbinary/universalbinary_test.go index ea13e613f..2a9bbbd74 100644 --- a/internal/pipe/universalbinary/universalbinary_test.go +++ b/internal/pipe/universalbinary/universalbinary_test.go @@ -267,7 +267,7 @@ func TestRun(t *testing.T) { t.Run("replacing", func(t *testing.T) { require.NoError(t, Pipe{}.Run(ctx1)) - require.Len(t, ctx1.Artifacts.Filter(artifact.ByType(artifact.Binary)).List(), 0) + require.Empty(t, ctx1.Artifacts.Filter(artifact.ByType(artifact.Binary)).List()) unis := ctx1.Artifacts.Filter(artifact.ByType(artifact.UniversalBinary)).List() require.Len(t, unis, 1) checkUniversalBinary(t, unis[0]) diff --git a/internal/pipe/upx/upx_test.go b/internal/pipe/upx/upx_test.go index 970a285ea..6e4e9fe1d 100644 --- a/internal/pipe/upx/upx_test.go +++ b/internal/pipe/upx/upx_test.go @@ -258,12 +258,12 @@ func TestFindBinaries(t *testing.T) { }) t.Run("goamd64", func(t *testing.T) { - require.Len(t, findBinaries(ctx, config.UPX{ + require.Empty(t, findBinaries(ctx, config.UPX{ IDs: []string{"2"}, Goos: []string{"linux"}, Goarch: []string{"amd64"}, Goamd64: []string{"v3"}, - }), 0) + })) require.Len(t, findBinaries(ctx, config.UPX{ IDs: []string{"2"}, Goos: []string{"linux"}, @@ -273,12 +273,12 @@ func TestFindBinaries(t *testing.T) { }) t.Run("goarm", func(t *testing.T) { - require.Len(t, findBinaries(ctx, config.UPX{ + require.Empty(t, findBinaries(ctx, config.UPX{ IDs: []string{"2"}, Goos: []string{"linux"}, Goarch: []string{"arm"}, Goarm: []string{"6"}, - }), 0) + })) require.Len(t, findBinaries(ctx, config.UPX{ IDs: []string{"2"}, Goos: []string{"linux"}, diff --git a/internal/pipe/webhook/webhook_test.go b/internal/pipe/webhook/webhook_test.go index e9f47697d..b0b70207a 100644 --- a/internal/pipe/webhook/webhook_test.go +++ b/internal/pipe/webhook/webhook_test.go @@ -17,7 +17,7 @@ import ( ) func TestStringer(t *testing.T) { - require.Equal(t, Pipe{}.String(), "webhook") + require.Equal(t, "webhook", Pipe{}.String()) } func TestNoEndpoint(t *testing.T) { diff --git a/internal/semerrgroup/sem_test.go b/internal/semerrgroup/sem_test.go index c664ee7bd..68b9ae3eb 100644 --- a/internal/semerrgroup/sem_test.go +++ b/internal/semerrgroup/sem_test.go @@ -26,7 +26,7 @@ func TestSemaphore(t *testing.T) { }) } require.NoError(t, g.Wait()) - require.Equal(t, counter, 10) + require.Equal(t, 10, counter) }) } } @@ -83,7 +83,7 @@ func TestSemaphoreSkipAware(t *testing.T) { }) } require.EqualError(t, g.Wait(), "fake skip") - require.Equal(t, counter, 10) + require.Equal(t, 10, counter) }) } } diff --git a/internal/testlib/skip.go b/internal/testlib/skip.go index 6a8a9459a..72e2acd3c 100644 --- a/internal/testlib/skip.go +++ b/internal/testlib/skip.go @@ -1,7 +1,6 @@ package testlib import ( - "errors" "testing" "github.com/goreleaser/goreleaser/internal/pipe" @@ -11,5 +10,5 @@ import ( // AssertSkipped asserts that a pipe was skipped. func AssertSkipped(t *testing.T, err error) { t.Helper() - require.True(t, errors.As(err, &pipe.ErrSkip{}), "expected a pipe.ErrSkip but got %v", err) + require.ErrorAs(t, err, &pipe.ErrSkip{}, "expected a pipe.ErrSkip but got %v", err) } diff --git a/pkg/archive/gzip/gzip_test.go b/pkg/archive/gzip/gzip_test.go index bf278c17d..f79652787 100644 --- a/pkg/archive/gzip/gzip_test.go +++ b/pkg/archive/gzip/gzip_test.go @@ -37,7 +37,7 @@ func TestGzFile(t *testing.T) { info, err := f.Stat() require.NoError(t, err) - require.Truef(t, info.Size() < 500, "archived file should be smaller than %d", info.Size()) + require.Lessf(t, info.Size(), int64(500), "archived file should be smaller than %d", info.Size()) gzf, err := gzip.NewReader(f) require.NoError(t, err) @@ -75,7 +75,7 @@ func TestGzFileCustomMtime(t *testing.T) { info, err := f.Stat() require.NoError(t, err) - require.Truef(t, info.Size() < 500, "archived file should be smaller than %d", info.Size()) + require.Lessf(t, info.Size(), int64(500), "archived file should be smaller than %d", info.Size()) gzf, err := gzip.NewReader(f) require.NoError(t, err) diff --git a/pkg/archive/tar/tar_test.go b/pkg/archive/tar/tar_test.go index 602eccfac..892c17f59 100644 --- a/pkg/archive/tar/tar_test.go +++ b/pkg/archive/tar/tar_test.go @@ -77,7 +77,7 @@ func TestTarFile(t *testing.T) { info, err := f.Stat() require.NoError(t, err) - require.Truef(t, info.Size() < 10000, "archived file should be smaller than %d", info.Size()) + require.Lessf(t, info.Size(), int64(10000), "archived file should be smaller than %d", info.Size()) var paths []string r := tar.NewReader(f) @@ -93,7 +93,7 @@ func TestTarFile(t *testing.T) { require.True(t, ex, "expected executable permissions, got %s", next.FileInfo().Mode()) } if next.Name == "link.txt" { - require.Equal(t, next.Linkname, "regular.txt") + require.Equal(t, "regular.txt", next.Linkname) } } require.Equal(t, []string{ diff --git a/pkg/archive/targz/targz_test.go b/pkg/archive/targz/targz_test.go index 3bed2241f..24556b3d1 100644 --- a/pkg/archive/targz/targz_test.go +++ b/pkg/archive/targz/targz_test.go @@ -72,7 +72,7 @@ func TestTarGzFile(t *testing.T) { info, err := f.Stat() require.NoError(t, err) - require.Truef(t, info.Size() < 500, "archived file should be smaller than %d", info.Size()) + require.Lessf(t, info.Size(), int64(500), "archived file should be smaller than %d", info.Size()) gzf, err := gzip.NewReader(f) require.NoError(t, err) @@ -92,7 +92,7 @@ func TestTarGzFile(t *testing.T) { require.True(t, ex, "expected executable permissions, got %s", next.FileInfo().Mode()) } if next.Name == "link.txt" { - require.Equal(t, next.Linkname, "regular.txt") + require.Equal(t, "regular.txt", next.Linkname) } } require.Equal(t, []string{ diff --git a/pkg/archive/tarxz/tarxz_test.go b/pkg/archive/tarxz/tarxz_test.go index 534f4ba6b..cd287567b 100644 --- a/pkg/archive/tarxz/tarxz_test.go +++ b/pkg/archive/tarxz/tarxz_test.go @@ -72,7 +72,7 @@ func TestTarXzFile(t *testing.T) { info, err := f.Stat() require.NoError(t, err) - require.Truef(t, info.Size() < 500, "archived file should be smaller than %d", info.Size()) + require.Lessf(t, info.Size(), int64(500), "archived file should be smaller than %d", info.Size()) xzf, err := xz.NewReader(f) require.NoError(t, err) @@ -91,7 +91,7 @@ func TestTarXzFile(t *testing.T) { require.True(t, ex, "expected executable permissions, got %s", next.FileInfo().Mode()) } if next.Name == "link.txt" { - require.Equal(t, next.Linkname, "regular.txt") + require.Equal(t, "regular.txt", next.Linkname) } } require.Equal(t, []string{ diff --git a/pkg/archive/zip/zip_test.go b/pkg/archive/zip/zip_test.go index af4e7baab..5df56e0f6 100644 --- a/pkg/archive/zip/zip_test.go +++ b/pkg/archive/zip/zip_test.go @@ -77,7 +77,7 @@ func TestZipFile(t *testing.T) { info, err := f.Stat() require.NoError(t, err) - require.Truef(t, info.Size() < 1000, "archived file should be smaller than %d", info.Size()) + require.Lessf(t, info.Size(), int64(1000), "archived file should be smaller than %d", info.Size()) r, err := zip.NewReader(f, info.Size()) require.NoError(t, err) @@ -90,14 +90,14 @@ func TestZipFile(t *testing.T) { require.True(t, ex, "expected executable permissions, got %s", zf.Mode()) } if zf.Name == "link.txt" { - require.True(t, zf.FileInfo().Mode()&os.ModeSymlink != 0) + require.NotEqual(t, 0, zf.FileInfo().Mode()&os.ModeSymlink) rc, err := zf.Open() require.NoError(t, err) var link bytes.Buffer _, err = io.Copy(&link, rc) require.NoError(t, err) rc.Close() - require.Equal(t, link.String(), "regular.txt") + require.Equal(t, "regular.txt", link.String()) } } require.Equal(t, []string{