summaryrefslogtreecommitdiff
path: root/testrig/util.go
diff options
context:
space:
mode:
authorLibravatar tobi <31960611+tsmethurst@users.noreply.github.com>2021-09-11 13:19:06 +0200
committerLibravatar GitHub <noreply@github.com>2021-09-11 13:19:06 +0200
commit9dc2255a8fab8ef0bc4b9f417c6131e4c468cb9c (patch)
treeae528bf14a3475bbea264ff26e5ffded3dfadf8a /testrig/util.go
parentTest both dbs (#205) (diff)
downloadgotosocial-9dc2255a8fab8ef0bc4b9f417c6131e4c468cb9c.tar.xz
kim is a reply guy (#208)
* bun debug * bun trace logging hooks * more tests * fix up some stuffffff * drop the frontend cache until a proper fix is made * go fmt
Diffstat (limited to 'testrig/util.go')
-rw-r--r--testrig/util.go23
1 files changed, 13 insertions, 10 deletions
diff --git a/testrig/util.go b/testrig/util.go
index 0fb8aa887..0410366e3 100644
--- a/testrig/util.go
+++ b/testrig/util.go
@@ -34,18 +34,21 @@ import (
// req.Header.Set("Content-Type", w.FormDataContentType())
func CreateMultipartFormData(fieldName string, fileName string, extraFields map[string]string) (bytes.Buffer, *multipart.Writer, error) {
var b bytes.Buffer
- var err error
+
w := multipart.NewWriter(&b)
var fw io.Writer
- file, err := os.Open(fileName)
- if err != nil {
- return b, nil, err
- }
- if fw, err = w.CreateFormFile(fieldName, file.Name()); err != nil {
- return b, nil, err
- }
- if _, err = io.Copy(fw, file); err != nil {
- return b, nil, err
+
+ if fileName != "" {
+ file, err := os.Open(fileName)
+ if err != nil {
+ return b, nil, err
+ }
+ if fw, err = w.CreateFormFile(fieldName, file.Name()); err != nil {
+ return b, nil, err
+ }
+ if _, err = io.Copy(fw, file); err != nil {
+ return b, nil, err
+ }
}
for k, v := range extraFields {