diff options
Diffstat (limited to 'internal/api/client/admin')
| -rw-r--r-- | internal/api/client/admin/emojicreate_test.go | 8 | ||||
| -rw-r--r-- | internal/api/client/admin/emojiupdate_test.go | 22 |
2 files changed, 15 insertions, 15 deletions
diff --git a/internal/api/client/admin/emojicreate_test.go b/internal/api/client/admin/emojicreate_test.go index a687fb0af..9e985459b 100644 --- a/internal/api/client/admin/emojicreate_test.go +++ b/internal/api/client/admin/emojicreate_test.go @@ -38,7 +38,7 @@ type EmojiCreateTestSuite struct { func (suite *EmojiCreateTestSuite) TestEmojiCreateNewCategory() { // set up the request requestBody, w, err := testrig.CreateMultipartFormData( - "image", "../../../../testrig/media/rainbow-original.png", + testrig.FileToDataF("image", "../../../../testrig/media/rainbow-original.png"), map[string][]string{ "shortcode": {"new_emoji"}, "category": {"Test Emojis"}, // this category doesn't exist yet @@ -111,7 +111,7 @@ func (suite *EmojiCreateTestSuite) TestEmojiCreateNewCategory() { func (suite *EmojiCreateTestSuite) TestEmojiCreateExistingCategory() { // set up the request requestBody, w, err := testrig.CreateMultipartFormData( - "image", "../../../../testrig/media/rainbow-original.png", + testrig.FileToDataF("image", "../../../../testrig/media/rainbow-original.png"), map[string][]string{ "shortcode": {"new_emoji"}, "category": {"cute stuff"}, // this category already exists @@ -184,7 +184,7 @@ func (suite *EmojiCreateTestSuite) TestEmojiCreateExistingCategory() { func (suite *EmojiCreateTestSuite) TestEmojiCreateNoCategory() { // set up the request requestBody, w, err := testrig.CreateMultipartFormData( - "image", "../../../../testrig/media/rainbow-original.png", + testrig.FileToDataF("image", "../../../../testrig/media/rainbow-original.png"), map[string][]string{ "shortcode": {"new_emoji"}, "category": {""}, @@ -257,7 +257,7 @@ func (suite *EmojiCreateTestSuite) TestEmojiCreateNoCategory() { func (suite *EmojiCreateTestSuite) TestEmojiCreateAlreadyExists() { // set up the request -- use a shortcode that already exists for an emoji in the database requestBody, w, err := testrig.CreateMultipartFormData( - "image", "../../../../testrig/media/rainbow-original.png", + testrig.FileToDataF("image", "../../../../testrig/media/rainbow-original.png"), map[string][]string{ "shortcode": {"rainbow"}, }) diff --git a/internal/api/client/admin/emojiupdate_test.go b/internal/api/client/admin/emojiupdate_test.go index 073e3cec0..5df43d7ae 100644 --- a/internal/api/client/admin/emojiupdate_test.go +++ b/internal/api/client/admin/emojiupdate_test.go @@ -44,7 +44,7 @@ func (suite *EmojiUpdateTestSuite) TestEmojiUpdateNewCategory() { // set up the request requestBody, w, err := testrig.CreateMultipartFormData( - "", "", + nil, map[string][]string{ "category": {"New Category"}, // this category doesn't exist yet "type": {"modify"}, @@ -121,7 +121,7 @@ func (suite *EmojiUpdateTestSuite) TestEmojiUpdateSwitchCategory() { // set up the request requestBody, w, err := testrig.CreateMultipartFormData( - "", "", + nil, map[string][]string{ "type": {"modify"}, "category": {"cute stuff"}, @@ -198,7 +198,7 @@ func (suite *EmojiUpdateTestSuite) TestEmojiUpdateCopyRemoteToLocal() { // set up the request requestBody, w, err := testrig.CreateMultipartFormData( - "", "", + nil, map[string][]string{ "type": {"copy"}, "category": {"emojis i stole"}, @@ -276,7 +276,7 @@ func (suite *EmojiUpdateTestSuite) TestEmojiUpdateDisableEmoji() { // set up the request requestBody, w, err := testrig.CreateMultipartFormData( - "", "", + nil, map[string][]string{ "type": {"disable"}, }) @@ -317,7 +317,7 @@ func (suite *EmojiUpdateTestSuite) TestEmojiUpdateDisableLocalEmoji() { // set up the request requestBody, w, err := testrig.CreateMultipartFormData( - "", "", + nil, map[string][]string{ "type": {"disable"}, }) @@ -350,7 +350,7 @@ func (suite *EmojiUpdateTestSuite) TestEmojiUpdateModifyRemoteEmoji() { // set up the request requestBody, w, err := testrig.CreateMultipartFormData( - "image", "../../../../testrig/media/kip-original.gif", + testrig.FileToDataF("image", "../../../../testrig/media/kip-original.gif"), map[string][]string{ "type": {"modify"}, }) @@ -383,7 +383,7 @@ func (suite *EmojiUpdateTestSuite) TestEmojiUpdateModifyNoParams() { // set up the request requestBody, w, err := testrig.CreateMultipartFormData( - "", "", + nil, map[string][]string{ "type": {"modify"}, }) @@ -416,7 +416,7 @@ func (suite *EmojiUpdateTestSuite) TestEmojiUpdateCopyLocalToLocal() { // set up the request requestBody, w, err := testrig.CreateMultipartFormData( - "", "", + nil, map[string][]string{ "type": {"copy"}, "shortcode": {"bottoms"}, @@ -450,7 +450,7 @@ func (suite *EmojiUpdateTestSuite) TestEmojiUpdateCopyEmptyShortcode() { // set up the request requestBody, w, err := testrig.CreateMultipartFormData( - "", "", + nil, map[string][]string{ "type": {"copy"}, "shortcode": {""}, @@ -484,7 +484,7 @@ func (suite *EmojiUpdateTestSuite) TestEmojiUpdateCopyNoShortcode() { // set up the request requestBody, w, err := testrig.CreateMultipartFormData( - "", "", + nil, map[string][]string{ "type": {"copy"}, }) @@ -517,7 +517,7 @@ func (suite *EmojiUpdateTestSuite) TestEmojiUpdateCopyShortcodeAlreadyInUse() { // set up the request requestBody, w, err := testrig.CreateMultipartFormData( - "", "", + nil, map[string][]string{ "type": {"copy"}, "shortcode": {"rainbow"}, |