diff --git a/internal/builders/golang/build_test.go b/internal/builders/golang/build_test.go index fb15466b2..42acee1e2 100644 --- a/internal/builders/golang/build_test.go +++ b/internal/builders/golang/build_test.go @@ -999,7 +999,7 @@ func TestProcessFlagsIgnoreEmptyFlags(t *testing.T) { } flags, err := processFlags(ctx, &artifact.Artifact{}, []string{}, source, "") require.NoError(t, err) - require.Len(t, flags, 0) + require.Empty(t, flags) } func TestBuildModTimestamp(t *testing.T) { diff --git a/internal/client/gitea_test.go b/internal/client/gitea_test.go index f377824b3..5e860ee0e 100644 --- a/internal/client/gitea_test.go +++ b/internal/client/gitea_test.go @@ -16,6 +16,7 @@ import ( "github.com/goreleaser/goreleaser/v2/pkg/config" "github.com/goreleaser/goreleaser/v2/pkg/context" "github.com/jarcoal/httpmock" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" ) @@ -626,9 +627,9 @@ func TestGiteaChangelog(t *testing.T) { }, }, }) - require.NoError(t, err) + assert.NoError(t, err) _, err = w.Write(bts) - require.NoError(t, err) + assert.NoError(t, err) } })) defer srv.Close() diff --git a/internal/client/github_test.go b/internal/client/github_test.go index 6b751ae92..d32e9650d 100644 --- a/internal/client/github_test.go +++ b/internal/client/github_test.go @@ -18,6 +18,7 @@ import ( "github.com/goreleaser/goreleaser/v2/internal/testctx" "github.com/goreleaser/goreleaser/v2/internal/testlib" "github.com/goreleaser/goreleaser/v2/pkg/config" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -272,9 +273,9 @@ func TestGitHubChangelog(t *testing.T) { if r.URL.Path == "/repos/someone/something/compare/v1.0.0...v1.1.0" { r, err := os.Open("testdata/github/compare.json") - require.NoError(t, err) + assert.NoError(t, err) _, err = io.Copy(w, r) - require.NoError(t, err) + assert.NoError(t, err) return } if r.URL.Path == "/rate_limit" { @@ -317,9 +318,9 @@ func TestGitHubReleaseNotes(t *testing.T) { if r.URL.Path == "/repos/someone/something/releases/generate-notes" { r, err := os.Open("testdata/github/releasenotes.json") - require.NoError(t, err) + assert.NoError(t, err) _, err = io.Copy(w, r) - require.NoError(t, err) + assert.NoError(t, err) return } if r.URL.Path == "/rate_limit" { @@ -387,9 +388,9 @@ func TestGitHubCloseMilestone(t *testing.T) { if r.URL.Path == "/repos/someone/something/milestones" { r, err := os.Open("testdata/github/milestones.json") - require.NoError(t, err) + assert.NoError(t, err) _, err = io.Copy(w, r) - require.NoError(t, err) + assert.NoError(t, err) return } @@ -434,16 +435,16 @@ func TestGitHubOpenPullRequestCrossRepo(t *testing.T) { if r.URL.Path == "/repos/someone/something/pulls" { got, err := io.ReadAll(r.Body) - require.NoError(t, err) + assert.NoError(t, err) var pr github.NewPullRequest - require.NoError(t, json.Unmarshal(got, &pr)) - require.Equal(t, "main", pr.GetBase()) - require.Equal(t, "someoneelse:something:foo", pr.GetHead()) - require.Equal(t, testPRTemplate+"\n"+prFooter, pr.GetBody()) + assert.NoError(t, json.Unmarshal(got, &pr)) + assert.Equal(t, "main", pr.GetBase()) + assert.Equal(t, "someoneelse:something:foo", pr.GetHead()) + assert.Equal(t, testPRTemplate+"\n"+prFooter, pr.GetBody()) r, err := os.Open("testdata/github/pull.json") - require.NoError(t, err) + assert.NoError(t, err) _, err = io.Copy(w, r) - require.NoError(t, err) + assert.NoError(t, err) return } @@ -493,9 +494,9 @@ func TestGitHubOpenPullRequestHappyPath(t *testing.T) { if r.URL.Path == "/repos/someone/something/pulls" { r, err := os.Open("testdata/github/pull.json") - require.NoError(t, err) + assert.NoError(t, err) _, err = io.Copy(w, r) - require.NoError(t, err) + assert.NoError(t, err) return } @@ -536,17 +537,17 @@ func TestGitHubOpenPullRequestNoBaseBranchDraft(t *testing.T) { if r.URL.Path == "/repos/someone/something/pulls" { got, err := io.ReadAll(r.Body) - require.NoError(t, err) + assert.NoError(t, err) var pr github.NewPullRequest - require.NoError(t, json.Unmarshal(got, &pr)) - require.Equal(t, "main", pr.GetBase()) - require.Equal(t, "someone:something:foo", pr.GetHead()) - require.True(t, pr.GetDraft()) + assert.NoError(t, json.Unmarshal(got, &pr)) + assert.Equal(t, "main", pr.GetBase()) + assert.Equal(t, "someone:something:foo", pr.GetHead()) + assert.True(t, pr.GetDraft()) r, err := os.Open("testdata/github/pull.json") - require.NoError(t, err) + assert.NoError(t, err) _, err = io.Copy(w, r) - require.NoError(t, err) + assert.NoError(t, err) return } @@ -595,9 +596,9 @@ func TestGitHubOpenPullRequestPRExists(t *testing.T) { if r.URL.Path == "/repos/someone/something/pulls" { w.WriteHeader(http.StatusUnprocessableEntity) r, err := os.Open("testdata/github/pull.json") - require.NoError(t, err) + assert.NoError(t, err) _, err = io.Copy(w, r) - require.NoError(t, err) + assert.NoError(t, err) return } @@ -638,9 +639,9 @@ func TestGitHubOpenPullRequestBaseEmpty(t *testing.T) { if r.URL.Path == "/repos/someone/something/pulls" { r, err := os.Open("testdata/github/pull.json") - require.NoError(t, err) + assert.NoError(t, err) _, err = io.Copy(w, r) - require.NoError(t, err) + assert.NoError(t, err) return } @@ -687,9 +688,9 @@ func TestGitHubOpenPullRequestHeadEmpty(t *testing.T) { if r.URL.Path == "/repos/someone/something/pulls" { r, err := os.Open("testdata/github/pull.json") - require.NoError(t, err) + assert.NoError(t, err) _, err = io.Copy(w, r) - require.NoError(t, err) + assert.NoError(t, err) return } diff --git a/internal/client/gitlab_test.go b/internal/client/gitlab_test.go index f04ea5f5c..a3f569c05 100644 --- a/internal/client/gitlab_test.go +++ b/internal/client/gitlab_test.go @@ -15,6 +15,7 @@ import ( "github.com/goreleaser/goreleaser/v2/internal/artifact" "github.com/goreleaser/goreleaser/v2/internal/testctx" "github.com/goreleaser/goreleaser/v2/pkg/config" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/xanzy/go-gitlab" ) @@ -205,14 +206,14 @@ func TestGitLabURLsDownloadTemplate(t *testing.T) { } b, err := io.ReadAll(r.Body) - require.NoError(t, err) + assert.NoError(t, err) reqBody := map[string]interface{}{} err = json.Unmarshal(b, &reqBody) - require.NoError(t, err) + assert.NoError(t, err) url := reqBody["url"].(string) - require.Truef(t, strings.HasSuffix(url, tt.wantURL), "expected %q to end with %q", url, tt.wantURL) + assert.Truef(t, strings.HasSuffix(url, tt.wantURL), "expected %q to end with %q", url, tt.wantURL) })) defer srv.Close() @@ -301,7 +302,7 @@ func TestGitLabCreateReleaseReleaseNotExists(t *testing.T) { return } - require.FailNow(t, "should not reach here") + assert.Empty(t, "should not reach here") })) defer srv.Close() @@ -337,7 +338,7 @@ func TestGitLabCreateReleaseReleaseExists(t *testing.T) { // Check if release exists if r.Method == http.MethodGet { w.WriteHeader(200) - require.NoError(t, json.NewEncoder(w).Encode(map[string]string{ + assert.NoError(t, json.NewEncoder(w).Encode(map[string]string{ "description": "original description", })) return @@ -347,14 +348,14 @@ func TestGitLabCreateReleaseReleaseExists(t *testing.T) { if r.Method == http.MethodPut { createdRelease = true var resBody map[string]string - require.NoError(t, json.NewDecoder(r.Body).Decode(&resBody)) - require.Equal(t, "original description", resBody["description"]) + assert.NoError(t, json.NewDecoder(r.Body).Decode(&resBody)) + assert.Equal(t, "original description", resBody["description"]) w.WriteHeader(http.StatusOK) fmt.Fprint(w, "{}") return } - require.FailNow(t, "should not reach here") + assert.Empty(t, "should not reach here") })) defer srv.Close() @@ -485,9 +486,9 @@ func TestGitLabChangelog(t *testing.T) { srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if strings.HasSuffix(r.URL.Path, "projects/someone/something/repository/compare") { r, err := os.Open("testdata/gitlab/compare.json") - require.NoError(t, err) + assert.NoError(t, err) _, err = io.Copy(w, r) - require.NoError(t, err) + assert.NoError(t, err) return } defer r.Body.Close() @@ -530,19 +531,19 @@ func TestGitLabCreateFile(t *testing.T) { } if strings.HasSuffix(r.URL.Path, "projects/someone/something/repository/files/newfile.txt") { _, err := io.Copy(w, strings.NewReader(`{ "file_path": "newfile.txt", "branch": "somebranch" }`)) - require.NoError(t, err) + assert.NoError(t, err) return } // Handle the test where we detect the branch if strings.HasSuffix(r.URL.Path, "projects/someone/something") { _, err := io.Copy(w, strings.NewReader(`{ "default_branch": "main" }`)) - require.NoError(t, err) + assert.NoError(t, err) return } if strings.HasSuffix(r.URL.Path, "projects/someone/something/repository/files/newfile-in-default.txt") { _, err := io.Copy(w, strings.NewReader(`{ "file_path": "newfile.txt", "branch": "main" }`)) - require.NoError(t, err) + assert.NoError(t, err) return } @@ -554,11 +555,11 @@ func TestGitLabCreateFile(t *testing.T) { if strings.HasSuffix(r.URL.Path, "projects/someone/something/repository/files/newfile-on-new-branch.txt") { if r.Method == "POST" { var resBody map[string]string - require.NoError(t, json.NewDecoder(r.Body).Decode(&resBody)) - require.Equal(t, "master", resBody["start_branch"]) + assert.NoError(t, json.NewDecoder(r.Body).Decode(&resBody)) + assert.Equal(t, "master", resBody["start_branch"]) } _, err := io.Copy(w, strings.NewReader(`{"file_path":"newfile-on-new-branch.txt","branch":"non-existing-branch"}`)) - require.NoError(t, err) + assert.NoError(t, err) return } @@ -570,14 +571,14 @@ func TestGitLabCreateFile(t *testing.T) { } if strings.HasSuffix(r.URL.Path, "projects/123456789/repository/files/newfile-projectID.txt") { _, err := io.Copy(w, strings.NewReader(`{ "file_path": "newfile-projectID.txt", "branch": "main" }`)) - require.NoError(t, err) + assert.NoError(t, err) return } // File of doooom...gets created, but 404s when getting fetched if strings.HasSuffix(r.URL.Path, "projects/someone/something/repository/files/doomed-file-404.txt") { if r.Method == "PUT" { _, err := io.Copy(w, strings.NewReader(`{ "file_path": "doomed-file-404.txt", "branch": "main" }`)) - require.NoError(t, err) + assert.NoError(t, err) } else { w.WriteHeader(http.StatusNotFound) } @@ -651,15 +652,15 @@ func TestGitLabCloseMilestone(t *testing.T) { srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if strings.HasSuffix(r.URL.Path, "projects/someone/something/milestones") { r, err := os.Open("testdata/gitlab/milestones.json") - require.NoError(t, err) + assert.NoError(t, err) _, err = io.Copy(w, r) - require.NoError(t, err) + assert.NoError(t, err) return } else if strings.HasSuffix(r.URL.Path, "projects/someone/something/milestones/12") { r, err := os.Open("testdata/gitlab/milestone.json") - require.NoError(t, err) + assert.NoError(t, err) _, err = io.Copy(w, r) - require.NoError(t, err) + assert.NoError(t, err) return } defer r.Body.Close() @@ -749,22 +750,22 @@ func TestGitLabOpenPullRequestCrossRepo(t *testing.T) { if r.URL.Path == "/api/v4/projects/someone/something" { _, err := io.Copy(w, strings.NewReader(`{ "id": 32156 }`)) - require.NoError(t, err) + assert.NoError(t, err) return } if r.URL.Path == "/api/v4/projects/someoneelse/something/merge_requests" { got, err := io.ReadAll(r.Body) - require.NoError(t, err) + assert.NoError(t, err) var pr gitlab.MergeRequest - require.NoError(t, json.Unmarshal(got, &pr)) - require.Equal(t, "main", pr.TargetBranch) - require.Equal(t, "foo", pr.SourceBranch) - require.Equal(t, "some title", pr.Title) - require.Equal(t, 32156, pr.TargetProjectID) + assert.NoError(t, json.Unmarshal(got, &pr)) + assert.Equal(t, "main", pr.TargetBranch) + assert.Equal(t, "foo", pr.SourceBranch) + assert.Equal(t, "some title", pr.Title) + assert.Equal(t, 32156, pr.TargetProjectID) _, err = io.Copy(w, strings.NewReader(`{"web_url": "https://gitlab.com/someoneelse/something/merge_requests/1"}`)) - require.NoError(t, err) + assert.NoError(t, err) return } @@ -800,22 +801,22 @@ func TestGitLabOpenPullRequestBaseEmpty(t *testing.T) { if r.URL.Path == "/api/v4/projects/someone/something" { _, err := io.Copy(w, strings.NewReader(`{ "default_branch": "main" }`)) - require.NoError(t, err) + assert.NoError(t, err) return } if r.URL.Path == "/api/v4/projects/someone/something/merge_requests" { got, err := io.ReadAll(r.Body) - require.NoError(t, err) + assert.NoError(t, err) var pr gitlab.MergeRequest - require.NoError(t, json.Unmarshal(got, &pr)) - require.Equal(t, "main", pr.TargetBranch) - require.Equal(t, "foo", pr.SourceBranch) - require.Equal(t, "some title", pr.Title) - require.Equal(t, 0, pr.TargetProjectID) + assert.NoError(t, json.Unmarshal(got, &pr)) + assert.Equal(t, "main", pr.TargetBranch) + assert.Equal(t, "foo", pr.SourceBranch) + assert.Equal(t, "some title", pr.Title) + assert.Equal(t, 0, pr.TargetProjectID) _, err = io.Copy(w, strings.NewReader(`{"web_url": "https://gitlab.com/someoneelse/something/merge_requests/1"}`)) - require.NoError(t, err) + assert.NoError(t, err) return } @@ -847,22 +848,22 @@ func TestGitLabOpenPullRequestDraft(t *testing.T) { if r.URL.Path == "/api/v4/projects/someone/something" { _, err := io.Copy(w, strings.NewReader(`{ "default_branch": "main" }`)) - require.NoError(t, err) + assert.NoError(t, err) return } if r.URL.Path == "/api/v4/projects/someone/something/merge_requests" { got, err := io.ReadAll(r.Body) - require.NoError(t, err) + assert.NoError(t, err) var pr gitlab.MergeRequest - require.NoError(t, json.Unmarshal(got, &pr)) - require.Equal(t, "main", pr.TargetBranch) - require.Equal(t, "main", pr.SourceBranch) - require.Equal(t, "Draft: some title", pr.Title) - require.Equal(t, 0, pr.TargetProjectID) + assert.NoError(t, json.Unmarshal(got, &pr)) + assert.Equal(t, "main", pr.TargetBranch) + assert.Equal(t, "main", pr.SourceBranch) + assert.Equal(t, "Draft: some title", pr.Title) + assert.Equal(t, 0, pr.TargetProjectID) _, err = io.Copy(w, strings.NewReader(`{"web_url": "https://gitlab.com/someoneelse/something/merge_requests/1"}`)) - require.NoError(t, err) + assert.NoError(t, err) return } @@ -894,16 +895,16 @@ func TestGitLabOpenPullBaseBranchGiven(t *testing.T) { if r.URL.Path == "/api/v4/projects/someone/something/merge_requests" { got, err := io.ReadAll(r.Body) - require.NoError(t, err) + assert.NoError(t, err) var pr gitlab.MergeRequest - require.NoError(t, json.Unmarshal(got, &pr)) - require.Equal(t, "main", pr.TargetBranch) - require.Equal(t, "foo", pr.SourceBranch) - require.Equal(t, "some title", pr.Title) - require.Equal(t, 0, pr.TargetProjectID) + assert.NoError(t, json.Unmarshal(got, &pr)) + assert.Equal(t, "main", pr.TargetBranch) + assert.Equal(t, "foo", pr.SourceBranch) + assert.Equal(t, "some title", pr.Title) + assert.Equal(t, 0, pr.TargetProjectID) _, err = io.Copy(w, strings.NewReader(`{"web_url": "https://gitlab.com/someoneelse/something/merge_requests/1"}`)) - require.NoError(t, err) + assert.NoError(t, err) return } diff --git a/internal/pipe/blob/blob_test.go b/internal/pipe/blob/blob_test.go index 3e131d1cb..adc9f1648 100644 --- a/internal/pipe/blob/blob_test.go +++ b/internal/pipe/blob/blob_test.go @@ -1,7 +1,7 @@ package blob import ( - "fmt" + "errors" "testing" "github.com/goreleaser/goreleaser/v2/internal/testctx" @@ -28,7 +28,7 @@ func TestErrors(t *testing.T) { "other": "failed to write to bucket: other", } { t.Run(k, func(t *testing.T) { - require.EqualError(t, handleError(fmt.Errorf(k), "someurl"), v) + require.EqualError(t, handleError(errors.New(k), "someurl"), v) }) } } diff --git a/internal/pipe/mattermost/mattermost_test.go b/internal/pipe/mattermost/mattermost_test.go index a42942e5d..b62e6e46d 100644 --- a/internal/pipe/mattermost/mattermost_test.go +++ b/internal/pipe/mattermost/mattermost_test.go @@ -7,6 +7,7 @@ import ( "net/http/httptest" "testing" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/goreleaser/goreleaser/v2/internal/testctx" @@ -68,14 +69,14 @@ func TestPostWebhook(t *testing.T) { body, _ := io.ReadAll(r.Body) err := json.Unmarshal(body, rc) - require.NoError(t, err) - require.Equal(t, defaultColor, rc.Attachments[0].Color) - require.Equal(t, "Honk v1.0.0 is out!", rc.Attachments[0].Title) - require.Equal(t, "Honk v1.0.0 is out! Check it out at https://github.com/honk/honk/releases/tag/v1.0.0", rc.Attachments[0].Text) + assert.NoError(t, err) + assert.Equal(t, defaultColor, rc.Attachments[0].Color) + assert.Equal(t, "Honk v1.0.0 is out!", rc.Attachments[0].Title) + assert.Equal(t, "Honk v1.0.0 is out! Check it out at https://github.com/honk/honk/releases/tag/v1.0.0", rc.Attachments[0].Text) w.WriteHeader(200) _, err = w.Write([]byte{}) - require.NoError(t, err) + assert.NoError(t, err) })) defer ts.Close() diff --git a/internal/pipe/webhook/webhook_test.go b/internal/pipe/webhook/webhook_test.go index b416e4d40..a6972d618 100644 --- a/internal/pipe/webhook/webhook_test.go +++ b/internal/pipe/webhook/webhook_test.go @@ -13,6 +13,7 @@ import ( "github.com/goreleaser/goreleaser/v2/internal/testctx" "github.com/goreleaser/goreleaser/v2/internal/testlib" "github.com/goreleaser/goreleaser/v2/pkg/config" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -67,13 +68,13 @@ func TestAnnounceWebhook(t *testing.T) { defer r.Body.Close() body, err := io.ReadAll(r.Body) - require.NoError(t, err) - require.Equal(t, "webhook-test", string(body)) + assert.NoError(t, err) + assert.Equal(t, "webhook-test", string(body)) w.WriteHeader(http.StatusCreated) w.Header().Set("Content-Type", "application/json") err = json.NewEncoder(w).Encode(responseServer) - require.NoError(t, err) + assert.NoError(t, err) })) defer srv.Close() @@ -98,12 +99,12 @@ func TestAnnounceTLSWebhook(t *testing.T) { srv := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { defer r.Body.Close() body, err := io.ReadAll(r.Body) - require.NoError(t, err) - require.Equal(t, "webhook-test", string(body)) + assert.NoError(t, err) + assert.Equal(t, "webhook-test", string(body)) w.WriteHeader(http.StatusCreated) w.Header().Set("Content-Type", "application/json") err = json.NewEncoder(w).Encode(responseServer) - require.NoError(t, err) + assert.NoError(t, err) })) defer srv.Close() fmt.Println(srv.URL) @@ -131,7 +132,7 @@ func TestAnnounceTLSCheckCertWebhook(t *testing.T) { w.WriteHeader(http.StatusCreated) w.Header().Set("Content-Type", "application/json") err := json.NewEncoder(w).Encode(responseServer) - require.NoError(t, err) + assert.NoError(t, err) })) defer srv.Close() fmt.Println(srv.URL) @@ -157,16 +158,16 @@ func TestAnnounceBasicAuthWebhook(t *testing.T) { defer r.Body.Close() body, err := io.ReadAll(r.Body) - require.NoError(t, err) - require.Equal(t, "webhook-test", string(body)) + assert.NoError(t, err) + assert.Equal(t, "webhook-test", string(body)) auth := r.Header.Get("Authorization") - require.Equal(t, fmt.Sprintf("Basic %s", base64.StdEncoding.EncodeToString([]byte("user:pass"))), auth) + assert.Equal(t, fmt.Sprintf("Basic %s", base64.StdEncoding.EncodeToString([]byte("user:pass"))), auth) w.WriteHeader(http.StatusCreated) w.Header().Set("Content-Type", "application/json") err = json.NewEncoder(w).Encode(responseServer) - require.NoError(t, err) + assert.NoError(t, err) })) defer srv.Close() @@ -194,16 +195,16 @@ func TestAnnounceAdditionalHeadersWebhook(t *testing.T) { defer r.Body.Close() body, err := io.ReadAll(r.Body) - require.NoError(t, err) - require.Equal(t, "webhook-test", string(body)) + assert.NoError(t, err) + assert.Equal(t, "webhook-test", string(body)) customHeader := r.Header.Get("X-Custom-Header") - require.Equal(t, "custom-value", customHeader) + assert.Equal(t, "custom-value", customHeader) w.WriteHeader(http.StatusCreated) w.Header().Set("Content-Type", "application/json") err = json.NewEncoder(w).Encode(responseServer) - require.NoError(t, err) + assert.NoError(t, err) })) defer srv.Close()