summaryrefslogtreecommitdiff
path: root/testrig/util.go
diff options
context:
space:
mode:
authorLibravatar tobi <31960611+tsmethurst@users.noreply.github.com>2023-11-10 17:42:48 +0100
committerLibravatar GitHub <noreply@github.com>2023-11-10 16:42:48 +0000
commitc7ecab9e6fb76bb10da26c803fc5838419642423 (patch)
tree41410d639bdb8b19a93e972a6d05937f82ab4299 /testrig/util.go
parent[bugfix] Don't try to update suspended accounts (#2348) (diff)
downloadgotosocial-c7ecab9e6fb76bb10da26c803fc5838419642423.tar.xz
[chore/bugfix/horror] Allow `expires_in` and poll choices to be parsed from strings (#2346)
Diffstat (limited to 'testrig/util.go')
-rw-r--r--testrig/util.go14
1 files changed, 6 insertions, 8 deletions
diff --git a/testrig/util.go b/testrig/util.go
index 8ffc1b8ea..c2360dc9e 100644
--- a/testrig/util.go
+++ b/testrig/util.go
@@ -85,7 +85,7 @@ func StartTimelines(state *state.State, filter *visibility.Filter, converter *ty
// The returned *multipart.Writer w can be used to set the content type of the request, like so:
//
// req.Header.Set("Content-Type", w.FormDataContentType())
-func CreateMultipartFormData(fieldName string, fileName string, extraFields map[string]string) (bytes.Buffer, *multipart.Writer, error) {
+func CreateMultipartFormData(fieldName string, fileName string, extraFields map[string][]string) (bytes.Buffer, *multipart.Writer, error) {
var b bytes.Buffer
w := multipart.NewWriter(&b)
@@ -104,13 +104,11 @@ func CreateMultipartFormData(fieldName string, fileName string, extraFields map[
}
}
- for k, v := range extraFields {
- f, err := w.CreateFormField(k)
- if err != nil {
- return b, nil, err
- }
- if _, err := io.Copy(f, bytes.NewBufferString(v)); err != nil {
- return b, nil, err
+ for k, vs := range extraFields {
+ for _, v := range vs {
+ if err := w.WriteField(k, v); err != nil {
+ return b, nil, err
+ }
}
}