diff options
Diffstat (limited to 'internal/api/client/accounts')
| -rw-r--r-- | internal/api/client/accounts/accountupdate_test.go | 6 | ||||
| -rw-r--r-- | internal/api/client/accounts/lists_test.go | 7 | ||||
| -rw-r--r-- | internal/api/client/accounts/search_test.go | 7 |
3 files changed, 9 insertions, 11 deletions
diff --git a/internal/api/client/accounts/accountupdate_test.go b/internal/api/client/accounts/accountupdate_test.go index 01d12ab27..835989037 100644 --- a/internal/api/client/accounts/accountupdate_test.go +++ b/internal/api/client/accounts/accountupdate_test.go @@ -90,16 +90,16 @@ func (suite *AccountUpdateTestSuite) updateAccount( return nil, err } - errs := gtserror.MultiError{} + errs := gtserror.NewMultiError(2) // Check expected code + body. if resultCode := recorder.Code; expectedHTTPStatus != resultCode { - errs = append(errs, fmt.Sprintf("expected %d got %d", expectedHTTPStatus, resultCode)) + errs.Appendf("expected %d got %d", expectedHTTPStatus, resultCode) } // If we got an expected body, return early. if expectedBody != "" && string(b) != expectedBody { - errs = append(errs, fmt.Sprintf("expected %s got %s", expectedBody, string(b))) + errs.Appendf("expected %s got %s", expectedBody, string(b)) } if err := errs.Combine(); err != nil { diff --git a/internal/api/client/accounts/lists_test.go b/internal/api/client/accounts/lists_test.go index 6984d6ef8..637babc35 100644 --- a/internal/api/client/accounts/lists_test.go +++ b/internal/api/client/accounts/lists_test.go @@ -19,7 +19,6 @@ package accounts_test import ( "encoding/json" - "fmt" "io" "net/http" "net/http/httptest" @@ -63,16 +62,16 @@ func (suite *ListsTestSuite) getLists(targetAccountID string, expectedHTTPStatus suite.FailNow(err.Error()) } - errs := gtserror.MultiError{} + errs := gtserror.NewMultiError(2) // Check expected code + body. if resultCode := recorder.Code; expectedHTTPStatus != resultCode { - errs = append(errs, fmt.Sprintf("expected %d got %d", expectedHTTPStatus, resultCode)) + errs.Appendf("expected %d got %d", expectedHTTPStatus, resultCode) } // If we got an expected body, return early. if expectedBody != "" && string(b) != expectedBody { - errs = append(errs, fmt.Sprintf("expected %s got %s", expectedBody, string(b))) + errs.Appendf("expected %s got %s", expectedBody, string(b)) } if err := errs.Combine(); err != nil { diff --git a/internal/api/client/accounts/search_test.go b/internal/api/client/accounts/search_test.go index 7d778f090..119900331 100644 --- a/internal/api/client/accounts/search_test.go +++ b/internal/api/client/accounts/search_test.go @@ -19,7 +19,6 @@ package accounts_test import ( "encoding/json" - "fmt" "io" "net/http" "net/http/httptest" @@ -99,16 +98,16 @@ func (suite *AccountSearchTestSuite) getSearch( suite.FailNow(err.Error()) } - errs := gtserror.MultiError{} + errs := gtserror.NewMultiError(2) // Check expected code + body. if resultCode := recorder.Code; expectedHTTPStatus != resultCode { - errs = append(errs, fmt.Sprintf("expected %d got %d", expectedHTTPStatus, resultCode)) + errs.Appendf("expected %d got %d", expectedHTTPStatus, resultCode) } // If we got an expected body, return early. if expectedBody != "" && string(b) != expectedBody { - errs = append(errs, fmt.Sprintf("expected %s got %s", expectedBody, string(b))) + errs.Appendf("expected %s got %s", expectedBody, string(b)) } if err := errs.Combine(); err != nil { |