From a76dfa0a00ba96f307d67566ae7ef53ce938e6f8 Mon Sep 17 00:00:00 2001 From: Vartan Benohanian Date: Sun, 20 Sep 2020 23:44:08 -0400 Subject: [PATCH] Use (*http.Request).PostForm, delete preceding slashes Signed-off-by: Vartan Benohanian --- reddit/account_test.go | 4 ++-- reddit/collection_test.go | 22 +++++++++++----------- reddit/emoji_test.go | 12 ++++++------ reddit/gold_test.go | 2 +- reddit/live-thread.go | 16 ++++++++-------- reddit/message_test.go | 14 +++++++------- reddit/moderation_test.go | 12 ++++++------ reddit/multi_test.go | 6 +++--- reddit/post_test.go | 6 +++--- reddit/subreddit_test.go | 12 ++++++------ reddit/user_test.go | 8 ++++---- 11 files changed, 57 insertions(+), 57 deletions(-) diff --git a/reddit/account_test.go b/reddit/account_test.go index 41bd510..0aea35a 100644 --- a/reddit/account_test.go +++ b/reddit/account_test.go @@ -297,7 +297,7 @@ func TestAccountService_AddTrusted(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Account.AddTrusted(ctx, "test123") @@ -316,7 +316,7 @@ func TestAccountService_RemoveTrusted(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Account.RemoveTrusted(ctx, "test123") diff --git a/reddit/collection_test.go b/reddit/collection_test.go index 729b370..49e1b24 100644 --- a/reddit/collection_test.go +++ b/reddit/collection_test.go @@ -138,7 +138,7 @@ func TestCollectionService_Create(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) fmt.Fprint(w, blob) }) @@ -167,7 +167,7 @@ func TestCollectionService_Delete(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Collection.Delete(ctx, "37f1e52d-7ec9-466b-b4cc-59e86e071ed7") @@ -187,7 +187,7 @@ func TestCollectionService_AddPost(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Collection.AddPost(ctx, "t3_hs03f3", "37f1e52d-7ec9-466b-b4cc-59e86e071ed7") @@ -207,7 +207,7 @@ func TestCollectionService_RemovePost(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Collection.RemovePost(ctx, "t3_hs03f3", "37f1e52d-7ec9-466b-b4cc-59e86e071ed7") @@ -227,7 +227,7 @@ func TestCollectionService_ReorderPosts(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Collection.ReorderPosts(ctx, "37f1e52d-7ec9-466b-b4cc-59e86e071ed7", "t3_hs0cyh", "t3_hqrg8s", "t3_hs03f3") @@ -247,7 +247,7 @@ func TestCollectionService_UpdateTitle(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Collection.UpdateTitle(ctx, "37f1e52d-7ec9-466b-b4cc-59e86e071ed7", "Test Title") @@ -267,7 +267,7 @@ func TestCollectionService_UpdateDescription(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Collection.UpdateDescription(ctx, "37f1e52d-7ec9-466b-b4cc-59e86e071ed7", "Test Description") @@ -287,7 +287,7 @@ func TestCollectionService_UpdateLayoutTimeline(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Collection.UpdateLayoutTimeline(ctx, "37f1e52d-7ec9-466b-b4cc-59e86e071ed7") @@ -307,7 +307,7 @@ func TestCollectionService_UpdateLayoutGallery(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Collection.UpdateLayoutGallery(ctx, "37f1e52d-7ec9-466b-b4cc-59e86e071ed7") @@ -327,7 +327,7 @@ func TestCollectionService_Follow(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Collection.Follow(ctx, "37f1e52d-7ec9-466b-b4cc-59e86e071ed7") @@ -347,7 +347,7 @@ func TestCollectionService_Unfollow(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Collection.Unfollow(ctx, "37f1e52d-7ec9-466b-b4cc-59e86e071ed7") diff --git a/reddit/emoji_test.go b/reddit/emoji_test.go index d7990d6..e10569f 100644 --- a/reddit/emoji_test.go +++ b/reddit/emoji_test.go @@ -88,7 +88,7 @@ func TestEmojiService_SetSize(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Emoji.SetSize(ctx, "testsubreddit", 20, 20) @@ -106,7 +106,7 @@ func TestEmojiService_DisableCustomSize(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Emoji.DisableCustomSize(ctx, "testsubreddit") @@ -142,7 +142,7 @@ func TestEmojiService_Upload(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) fmt.Fprint(w, blob) }) @@ -168,7 +168,7 @@ func TestEmojiService_Upload(t *testing.T) { // for some reason this has to come after the FormFile call err = r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) mux.HandleFunc("/api/v1/testsubreddit/emoji.json", func(w http.ResponseWriter, r *http.Request) { @@ -183,7 +183,7 @@ func TestEmojiService_Upload(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err = client.Emoji.Upload(ctx, "testsubreddit", nil, emojiFile.Name()) @@ -215,7 +215,7 @@ func TestEmojiService_Update(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Emoji.Update(ctx, "testsubreddit", nil) diff --git a/reddit/gold_test.go b/reddit/gold_test.go index ea41f02..6e58511 100644 --- a/reddit/gold_test.go +++ b/reddit/gold_test.go @@ -32,7 +32,7 @@ func TestGoldService_Give(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Gold.Give(ctx, "testuser", 0) diff --git a/reddit/live-thread.go b/reddit/live-thread.go index bac46d4..5dac208 100644 --- a/reddit/live-thread.go +++ b/reddit/live-thread.go @@ -263,7 +263,7 @@ func (s *LiveThreadService) Update(ctx context.Context, id, text string) (*Respo form.Set("api_type", "json") form.Set("body", text) - path := fmt.Sprintf("/api/live/%s/update", id) + path := fmt.Sprintf("api/live/%s/update", id) req, err := s.client.NewRequest(http.MethodPost, path, form) if err != nil { return nil, err @@ -475,7 +475,7 @@ func (s *LiveThreadService) Invite(ctx context.Context, id, username string, per form.Set("type", "liveupdate_contributor_invite") form.Set("permissions", permissions.String()) - path := fmt.Sprintf("/api/live/%s/invite_contributor", id) + path := fmt.Sprintf("api/live/%s/invite_contributor", id) req, err := s.client.NewRequest(http.MethodPost, path, form) if err != nil { return nil, err @@ -491,7 +491,7 @@ func (s *LiveThreadService) Uninvite(ctx context.Context, threadID, userID strin form.Set("api_type", "json") form.Set("id", userID) - path := fmt.Sprintf("/api/live/%s/rm_contributor_invite", threadID) + path := fmt.Sprintf("api/live/%s/rm_contributor_invite", threadID) req, err := s.client.NewRequest(http.MethodPost, path, form) if err != nil { return nil, err @@ -510,7 +510,7 @@ func (s *LiveThreadService) SetPermissions(ctx context.Context, id, username str form.Set("type", "liveupdate_contributor") form.Set("permissions", permissions.String()) - path := fmt.Sprintf("/api/live/%s/set_contributor_permissions", id) + path := fmt.Sprintf("api/live/%s/set_contributor_permissions", id) req, err := s.client.NewRequest(http.MethodPost, path, form) if err != nil { return nil, err @@ -529,7 +529,7 @@ func (s *LiveThreadService) SetPermissionsForInvite(ctx context.Context, id, use form.Set("type", "liveupdate_contributor_invite") form.Set("permissions", permissions.String()) - path := fmt.Sprintf("/api/live/%s/set_contributor_permissions", id) + path := fmt.Sprintf("api/live/%s/set_contributor_permissions", id) req, err := s.client.NewRequest(http.MethodPost, path, form) if err != nil { return nil, err @@ -545,7 +545,7 @@ func (s *LiveThreadService) Revoke(ctx context.Context, threadID, userID string) form.Set("api_type", "json") form.Set("id", userID) - path := fmt.Sprintf("/api/live/%s/rm_contributor", threadID) + path := fmt.Sprintf("api/live/%s/rm_contributor", threadID) req, err := s.client.NewRequest(http.MethodPost, path, form) if err != nil { return nil, err @@ -561,7 +561,7 @@ func (s *LiveThreadService) HideDiscussion(ctx context.Context, threadID, postID form.Set("api_type", "json") form.Set("link", postID) - path := fmt.Sprintf("/api/live/%s/hide_discussion", threadID) + path := fmt.Sprintf("api/live/%s/hide_discussion", threadID) req, err := s.client.NewRequest(http.MethodPost, path, form) if err != nil { return nil, err @@ -577,7 +577,7 @@ func (s *LiveThreadService) UnhideDiscussion(ctx context.Context, threadID, post form.Set("api_type", "json") form.Set("link", postID) - path := fmt.Sprintf("/api/live/%s/unhide_discussion", threadID) + path := fmt.Sprintf("api/live/%s/unhide_discussion", threadID) req, err := s.client.NewRequest(http.MethodPost, path, form) if err != nil { return nil, err diff --git a/reddit/message_test.go b/reddit/message_test.go index aaad983..8d3b711 100644 --- a/reddit/message_test.go +++ b/reddit/message_test.go @@ -70,7 +70,7 @@ func TestMessageService_Read(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Message.Read(ctx) @@ -92,7 +92,7 @@ func TestMessageService_Unread(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Message.Unread(ctx) @@ -114,7 +114,7 @@ func TestMessageService_Block(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Message.Block(ctx, "test") @@ -133,7 +133,7 @@ func TestMessageService_Collapse(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Message.Collapse(ctx) @@ -155,7 +155,7 @@ func TestMessageService_Uncollapse(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Message.Uncollapse(ctx) @@ -177,7 +177,7 @@ func TestMessageService_Delete(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Message.Delete(ctx, "test") @@ -200,7 +200,7 @@ func TestMessageService_Send(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Message.Send(ctx, nil) diff --git a/reddit/moderation_test.go b/reddit/moderation_test.go index 7d59afa..58da484 100644 --- a/reddit/moderation_test.go +++ b/reddit/moderation_test.go @@ -87,7 +87,7 @@ func TestModerationService_AcceptInvite(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) fmt.Fprint(w, blob) }) @@ -108,7 +108,7 @@ func TestModerationService_Approve(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Moderation.Approve(ctx, "t3_test") @@ -128,7 +128,7 @@ func TestModerationService_Remove(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Moderation.Remove(ctx, "t3_test") @@ -148,7 +148,7 @@ func TestModerationService_RemoveSpam(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Moderation.RemoveSpam(ctx, "t3_test") @@ -167,7 +167,7 @@ func TestModerationService_Leave(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Moderation.Leave(ctx, "t5_test") @@ -186,7 +186,7 @@ func TestModerationService_LeaveContributor(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Moderation.LeaveContributor(ctx, "t5_test") diff --git a/reddit/multi_test.go b/reddit/multi_test.go index 748feb8..ec4b74e 100644 --- a/reddit/multi_test.go +++ b/reddit/multi_test.go @@ -112,7 +112,7 @@ func TestMultiService_Copy(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) fmt.Fprint(w, blob) }) @@ -249,7 +249,7 @@ func TestMultiService_UpdateDescription(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) fmt.Fprint(w, blob) }) @@ -271,7 +271,7 @@ func TestMultiService_AddSubreddit(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Multi.AddSubreddit(ctx, "user/testuser/m/testmulti", "golang") diff --git a/reddit/post_test.go b/reddit/post_test.go index 90de854..585c003 100644 --- a/reddit/post_test.go +++ b/reddit/post_test.go @@ -281,7 +281,7 @@ func TestPostService_SubmitText(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) fmt.Fprint(w, blob) }) @@ -318,7 +318,7 @@ func TestPostService_SubmitLink(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) fmt.Fprint(w, blob) }) @@ -353,7 +353,7 @@ func TestPostService_Edit(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) fmt.Fprint(w, blob) }) diff --git a/reddit/subreddit_test.go b/reddit/subreddit_test.go index 3648ece..375723f 100644 --- a/reddit/subreddit_test.go +++ b/reddit/subreddit_test.go @@ -631,7 +631,7 @@ func TestSubredditService_Subscribe(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Subreddit.Subscribe(ctx, "test", "golang", "nba") @@ -651,7 +651,7 @@ func TestSubredditService_SubscribeByID(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Subreddit.SubscribeByID(ctx, "t5_test1", "t5_test2", "t5_test3") @@ -671,7 +671,7 @@ func TestSubredditService_Unsubscribe(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Subreddit.Unsubscribe(ctx, "test", "golang", "nba") @@ -691,7 +691,7 @@ func TestSubredditService_UnsubscribeByID(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Subreddit.UnsubscribeByID(ctx, "t5_test1", "t5_test2", "t5_test3") @@ -712,7 +712,7 @@ func TestSubredditService_Favorite(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Subreddit.Favorite(ctx, "testsubreddit") @@ -733,7 +733,7 @@ func TestSubredditService_Unfavorite(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.Subreddit.Unfavorite(ctx, "testsubreddit") diff --git a/reddit/user_test.go b/reddit/user_test.go index bd1cd8c..9431a4b 100644 --- a/reddit/user_test.go +++ b/reddit/user_test.go @@ -781,7 +781,7 @@ func TestUserService_Block(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) fmt.Fprint(w, blob) }) @@ -806,7 +806,7 @@ func TestUserService_BlockByID(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) fmt.Fprint(w, blob) }) @@ -832,7 +832,7 @@ func TestUserService_Unblock(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.User.Unblock(ctx, "test123") @@ -855,7 +855,7 @@ func TestUserService_UnblockByID(t *testing.T) { err := r.ParseForm() require.NoError(t, err) - require.Equal(t, form, r.Form) + require.Equal(t, form, r.PostForm) }) _, err := client.User.UnblockByID(ctx, "abc123")