From 8fe2410f4ab2e9673abdb0455155771b25425301 Mon Sep 17 00:00:00 2001 From: Vartan Benohanian Date: Sun, 1 Nov 2020 22:15:20 -0500 Subject: [PATCH] Use t.Cleanup instead of defer to close server Signed-off-by: Vartan Benohanian --- reddit/account_test.go | 33 +++----- reddit/collection_test.go | 39 +++------ reddit/comment_test.go | 42 ++++------ reddit/emoji_test.go | 18 ++-- reddit/flair_test.go | 69 ++++++---------- reddit/gold_test.go | 6 +- reddit/listings_test.go | 6 +- reddit/live-thread_test.go | 78 ++++++------------ reddit/message_test.go | 33 +++----- reddit/moderation_test.go | 93 +++++++-------------- reddit/multi_test.go | 33 +++----- reddit/post_test.go | 126 ++++++++++------------------ reddit/reddit_test.go | 18 ++-- reddit/stream_test.go | 8 +- reddit/subreddit_test.go | 165 +++++++++++++------------------------ reddit/user_test.go | 102 ++++++++--------------- reddit/widget_test.go | 12 +-- reddit/wiki_test.go | 39 +++------ 18 files changed, 308 insertions(+), 612 deletions(-) diff --git a/reddit/account_test.go b/reddit/account_test.go index 0aea35a..a555210 100644 --- a/reddit/account_test.go +++ b/reddit/account_test.go @@ -123,8 +123,7 @@ var expectedRelationships2 = []Relationship{ } func TestAccountService_Info(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/account/info.json") require.NoError(t, err) @@ -140,8 +139,7 @@ func TestAccountService_Info(t *testing.T) { } func TestAccountService_Karma(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/account/karma.json") require.NoError(t, err) @@ -157,8 +155,7 @@ func TestAccountService_Karma(t *testing.T) { } func TestAccountService_Settings(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/account/settings.json") require.NoError(t, err) @@ -174,8 +171,7 @@ func TestAccountService_Settings(t *testing.T) { } func TestAccountService_UpdateSettings(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/account/settings.json") require.NoError(t, err) @@ -199,8 +195,7 @@ func TestAccountService_UpdateSettings(t *testing.T) { } func TestAccountService_Trophies(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/account/trophies.json") require.NoError(t, err) @@ -216,8 +211,7 @@ func TestAccountService_Trophies(t *testing.T) { } func TestAccountService_Friends(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/account/friends.json") require.NoError(t, err) @@ -233,8 +227,7 @@ func TestAccountService_Friends(t *testing.T) { } func TestAccountService_Blocked(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/account/blocked.json") require.NoError(t, err) @@ -250,8 +243,7 @@ func TestAccountService_Blocked(t *testing.T) { } func TestAccountService_Messaging(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/account/messaging.json") require.NoError(t, err) @@ -268,8 +260,7 @@ func TestAccountService_Messaging(t *testing.T) { } func TestAccountService_Trusted(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/account/trusted.json") require.NoError(t, err) @@ -285,8 +276,7 @@ func TestAccountService_Trusted(t *testing.T) { } func TestAccountService_AddTrusted(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/add_whitelisted", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -305,8 +295,7 @@ func TestAccountService_AddTrusted(t *testing.T) { } func TestAccountService_RemoveTrusted(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/remove_whitelisted", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) diff --git a/reddit/collection_test.go b/reddit/collection_test.go index 1ab7fb1..f75acc6 100644 --- a/reddit/collection_test.go +++ b/reddit/collection_test.go @@ -71,8 +71,7 @@ var expectedCollections = []*Collection{ } func TestCollectionService_Get(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/collection/collection.json") require.NoError(t, err) @@ -97,8 +96,7 @@ func TestCollectionService_Get(t *testing.T) { } func TestCollectionService_FromSubreddit(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/collection/collections.json") require.NoError(t, err) @@ -122,8 +120,7 @@ func TestCollectionService_FromSubreddit(t *testing.T) { } func TestCollectionService_Create(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/collection/collection.json") require.NoError(t, err) @@ -156,8 +153,7 @@ func TestCollectionService_Create(t *testing.T) { } func TestCollectionService_Delete(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/v1/collections/delete_collection", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -175,8 +171,7 @@ func TestCollectionService_Delete(t *testing.T) { } func TestCollectionService_AddPost(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/v1/collections/add_post_to_collection", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -195,8 +190,7 @@ func TestCollectionService_AddPost(t *testing.T) { } func TestCollectionService_RemovePost(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/v1/collections/remove_post_in_collection", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -215,8 +209,7 @@ func TestCollectionService_RemovePost(t *testing.T) { } func TestCollectionService_ReorderPosts(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/v1/collections/reorder_collection", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -235,8 +228,7 @@ func TestCollectionService_ReorderPosts(t *testing.T) { } func TestCollectionService_UpdateTitle(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/v1/collections/update_collection_title", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -255,8 +247,7 @@ func TestCollectionService_UpdateTitle(t *testing.T) { } func TestCollectionService_UpdateDescription(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/v1/collections/update_collection_description", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -275,8 +266,7 @@ func TestCollectionService_UpdateDescription(t *testing.T) { } func TestCollectionService_UpdateLayoutTimeline(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/v1/collections/update_collection_display_layout", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -295,8 +285,7 @@ func TestCollectionService_UpdateLayoutTimeline(t *testing.T) { } func TestCollectionService_UpdateLayoutGallery(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/v1/collections/update_collection_display_layout", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -315,8 +304,7 @@ func TestCollectionService_UpdateLayoutGallery(t *testing.T) { } func TestCollectionService_Follow(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/v1/collections/follow_collection", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -335,8 +323,7 @@ func TestCollectionService_Follow(t *testing.T) { } func TestCollectionService_Unfollow(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/v1/collections/follow_collection", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) diff --git a/reddit/comment_test.go b/reddit/comment_test.go index bfaaca4..e902550 100644 --- a/reddit/comment_test.go +++ b/reddit/comment_test.go @@ -38,8 +38,7 @@ var expectedCommentSubmitOrEdit = &Comment{ } func TestCommentService_Submit(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/comment/submit-or-edit.json") require.NoError(t, err) @@ -66,8 +65,7 @@ func TestCommentService_Submit(t *testing.T) { } func TestCommentService_Edit(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/comment/submit-or-edit.json") require.NoError(t, err) @@ -94,8 +92,7 @@ func TestCommentService_Edit(t *testing.T) { } func TestCommentService_Delete(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/del", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -114,8 +111,7 @@ func TestCommentService_Delete(t *testing.T) { } func TestCommentService_Save(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/save", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -134,8 +130,7 @@ func TestCommentService_Save(t *testing.T) { } func TestCommentService_Unsave(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/unsave", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -154,8 +149,7 @@ func TestCommentService_Unsave(t *testing.T) { } func TestCommentService_EnableReplies(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/sendreplies", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -175,8 +169,7 @@ func TestCommentService_EnableReplies(t *testing.T) { } func TestCommentService_DisableReplies(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/sendreplies", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -196,8 +189,7 @@ func TestCommentService_DisableReplies(t *testing.T) { } func TestCommentService_Lock(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/lock", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -216,8 +208,7 @@ func TestCommentService_Lock(t *testing.T) { } func TestCommentService_Unlock(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/unlock", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -236,8 +227,7 @@ func TestCommentService_Unlock(t *testing.T) { } func TestCommentService_Upvote(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/vote", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -258,8 +248,7 @@ func TestCommentService_Upvote(t *testing.T) { } func TestCommentService_Downvote(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/vote", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -280,8 +269,7 @@ func TestCommentService_Downvote(t *testing.T) { } func TestCommentService_RemoveVote(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/vote", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -302,8 +290,7 @@ func TestCommentService_RemoveVote(t *testing.T) { } func TestCommentService_LoadMoreReplies(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/comment/more.json") require.NoError(t, err) @@ -348,8 +335,7 @@ func TestCommentService_LoadMoreReplies(t *testing.T) { } func TestCommentService_Report(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/report", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) diff --git a/reddit/emoji_test.go b/reddit/emoji_test.go index f303ca4..1edb9fe 100644 --- a/reddit/emoji_test.go +++ b/reddit/emoji_test.go @@ -44,8 +44,7 @@ var expectedSubredditEmojis = []*Emoji{ } func TestEmojiService_Get(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/emoji/emojis.json") require.NoError(t, err) @@ -64,8 +63,7 @@ func TestEmojiService_Get(t *testing.T) { } func TestEmojiService_Delete(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/v1/testsubreddit/emoji/testemoji", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodDelete, r.Method) @@ -76,8 +74,7 @@ func TestEmojiService_Delete(t *testing.T) { } func TestEmojiService_SetSize(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/v1/testsubreddit/emoji_custom_size", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -96,8 +93,7 @@ func TestEmojiService_SetSize(t *testing.T) { } func TestEmojiService_DisableCustomSize(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/v1/testsubreddit/emoji_custom_size", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -114,8 +110,7 @@ func TestEmojiService_DisableCustomSize(t *testing.T) { } func TestEmojiService_Upload(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) uploadURL := client.BaseURL.Host + "/api/emoji_upload" @@ -202,8 +197,7 @@ func TestEmojiService_Upload(t *testing.T) { } func TestEmojiService_Update(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/v1/testsubreddit/emoji_permissions", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) diff --git a/reddit/flair_test.go b/reddit/flair_test.go index 80308d4..dd92533 100644 --- a/reddit/flair_test.go +++ b/reddit/flair_test.go @@ -152,8 +152,7 @@ var expectedFlairChanges = []*FlairChangeResponse{ } func TestFlairService_GetUserFlairs(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/flair/user-flairs.json") require.NoError(t, err) @@ -169,8 +168,7 @@ func TestFlairService_GetUserFlairs(t *testing.T) { } func TestFlairService_GetPostFlairs(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/flair/post-flairs.json") require.NoError(t, err) @@ -186,8 +184,7 @@ func TestFlairService_GetPostFlairs(t *testing.T) { } func TestFlairService_ListUserFlairs(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/flair/list-user-flairs.json") require.NoError(t, err) @@ -203,8 +200,7 @@ func TestFlairService_ListUserFlairs(t *testing.T) { } func TestFlairService_Configure(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/flairconfig", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -236,8 +232,7 @@ func TestFlairService_Configure(t *testing.T) { } func TestFlairService_Enable(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/setflairenabled", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -256,8 +251,7 @@ func TestFlairService_Enable(t *testing.T) { } func TestFlairService_Disable(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/setflairenabled", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -276,8 +270,7 @@ func TestFlairService_Disable(t *testing.T) { } func TestFlairService_UpsertUserTemplate(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/flair/flair-template.json") require.NoError(t, err) @@ -322,8 +315,7 @@ func TestFlairService_UpsertUserTemplate(t *testing.T) { } func TestFlairService_UpsertPostTemplate(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/flair/flair-template.json") require.NoError(t, err) @@ -368,8 +360,7 @@ func TestFlairService_UpsertPostTemplate(t *testing.T) { } func TestFlairService_Delete(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/deleteflair", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -388,8 +379,7 @@ func TestFlairService_Delete(t *testing.T) { } func TestFlairService_DeleteTemplate(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/deleteflairtemplate", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -408,8 +398,7 @@ func TestFlairService_DeleteTemplate(t *testing.T) { } func TestFlairService_DeleteAllUserTemplates(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/clearflairtemplates", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -428,8 +417,7 @@ func TestFlairService_DeleteAllUserTemplates(t *testing.T) { } func TestFlairService_DeleteAllPostTemplates(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/clearflairtemplates", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -448,8 +436,7 @@ func TestFlairService_DeleteAllPostTemplates(t *testing.T) { } func TestFlairService_ReorderUserTemplates(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/v1/testsubreddit/flair_template_order/USER_FLAIR", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPatch, r.Method) @@ -465,8 +452,7 @@ func TestFlairService_ReorderUserTemplates(t *testing.T) { } func TestFlairService_ReorderPostTemplates(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/v1/testsubreddit/flair_template_order/LINK_FLAIR", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPatch, r.Method) @@ -482,8 +468,7 @@ func TestFlairService_ReorderPostTemplates(t *testing.T) { } func TestFlairService_Choices(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/flair/choices.json") require.NoError(t, err) @@ -508,8 +493,7 @@ func TestFlairService_Choices(t *testing.T) { } func TestFlairService_ChoicesOf(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/flair/choices.json") require.NoError(t, err) @@ -534,8 +518,7 @@ func TestFlairService_ChoicesOf(t *testing.T) { } func TestFlairService_ChoicesForPost(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/flair/choices.json") require.NoError(t, err) @@ -560,8 +543,7 @@ func TestFlairService_ChoicesForPost(t *testing.T) { } func TestFlairService_ChoicesForNewPost(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/flair/choices.json") require.NoError(t, err) @@ -585,8 +567,7 @@ func TestFlairService_ChoicesForNewPost(t *testing.T) { } func TestFlairService_Select(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/selectflair", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -613,8 +594,7 @@ func TestFlairService_Select(t *testing.T) { } func TestFlairService_Assign(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/selectflair", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -639,8 +619,7 @@ func TestFlairService_Assign(t *testing.T) { } func TestFlairService_SelectForPost(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/selectflair", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -667,8 +646,7 @@ func TestFlairService_SelectForPost(t *testing.T) { } func TestFlairService_RemoveFromPost(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/selectflair", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -687,8 +665,7 @@ func TestFlairService_RemoveFromPost(t *testing.T) { } func TestFlairService_Change(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/flair/csv-change.json") require.NoError(t, err) diff --git a/reddit/gold_test.go b/reddit/gold_test.go index 6e58511..11de810 100644 --- a/reddit/gold_test.go +++ b/reddit/gold_test.go @@ -9,8 +9,7 @@ import ( ) func TestGoldService_Gild(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/v1/gold/gild/t1_test", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -21,8 +20,7 @@ func TestGoldService_Gild(t *testing.T) { } func TestGoldService_Give(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/v1/gold/give/testuser", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) diff --git a/reddit/listings_test.go b/reddit/listings_test.go index a7a537f..3cac649 100644 --- a/reddit/listings_test.go +++ b/reddit/listings_test.go @@ -141,8 +141,7 @@ var expectedListingPosts2 = []*Post{ } func TestListingsService_Get(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/listings/posts-comments-subreddits.json") require.NoError(t, err) @@ -168,8 +167,7 @@ func TestListingsService_Get(t *testing.T) { } func TestListingsService_GetPosts(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/listings/posts.json") require.NoError(t, err) diff --git a/reddit/live-thread_test.go b/reddit/live-thread_test.go index 3fb3d2f..dc52715 100644 --- a/reddit/live-thread_test.go +++ b/reddit/live-thread_test.go @@ -171,8 +171,7 @@ var expectedLiveThreadContributorsAndInvited = &LiveThreadContributors{ } func TestLiveThreadService_Get(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/live-thread/live-thread.json") require.NoError(t, err) @@ -188,8 +187,7 @@ func TestLiveThreadService_Get(t *testing.T) { } func TestLiveThreadService_Now(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/live-thread/live-thread.json") require.NoError(t, err) @@ -205,8 +203,7 @@ func TestLiveThreadService_Now(t *testing.T) { } func TestLiveThreadService_Now_NoContent(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/live/happening_now", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodGet, r.Method) @@ -219,8 +216,7 @@ func TestLiveThreadService_Now_NoContent(t *testing.T) { } func TestLiveThreadService_GetMultiple(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/live-thread/live-threads.json") require.NoError(t, err) @@ -239,8 +235,7 @@ func TestLiveThreadService_GetMultiple(t *testing.T) { } func TestLiveThreadService_Update(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/live/id123/update", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -259,8 +254,7 @@ func TestLiveThreadService_Update(t *testing.T) { } func TestLiveThreadService_Updates(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/live-thread/updates.json") require.NoError(t, err) @@ -276,8 +270,7 @@ func TestLiveThreadService_Updates(t *testing.T) { } func TestLiveThreadService_UpdateByID(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/live-thread/update.json") require.NoError(t, err) @@ -293,8 +286,7 @@ func TestLiveThreadService_UpdateByID(t *testing.T) { } func TestLiveThreadService_Discussions(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/live-thread/discussions.json") require.NoError(t, err) @@ -310,8 +302,7 @@ func TestLiveThreadService_Discussions(t *testing.T) { } func TestLiveThreadService_Strike(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/live/id123/strike_update", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -330,8 +321,7 @@ func TestLiveThreadService_Strike(t *testing.T) { } func TestLiveThreadService_Delete(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/live/id123/delete_update", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -350,8 +340,7 @@ func TestLiveThreadService_Delete(t *testing.T) { } func TestLiveThreadService_Create(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/live/create", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -391,8 +380,7 @@ func TestLiveThreadService_Create(t *testing.T) { } func TestLiveThreadService_Close(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/live/id123/close_thread", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -410,8 +398,7 @@ func TestLiveThreadService_Close(t *testing.T) { } func TestLiveThreadService_Configure(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/live/id123/edit", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -450,8 +437,7 @@ func TestLiveThreadService_Configure(t *testing.T) { } func TestLiveThreadService_Contributors(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/live-thread/contributors.json") require.NoError(t, err) @@ -467,8 +453,7 @@ func TestLiveThreadService_Contributors(t *testing.T) { } func TestLiveThreadService_ContributorsAndInvited(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/live-thread/contributors-and-invited.json") require.NoError(t, err) @@ -484,8 +469,7 @@ func TestLiveThreadService_ContributorsAndInvited(t *testing.T) { } func TestLiveThreadService_Accept(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/live/id123/accept_contributor_invite", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -503,8 +487,7 @@ func TestLiveThreadService_Accept(t *testing.T) { } func TestLiveThreadService_Leave(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/live/id123/leave_contributor", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -522,8 +505,7 @@ func TestLiveThreadService_Leave(t *testing.T) { } func TestLiveThreadService_Invite(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/live/id123/invite_contributor", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -544,8 +526,7 @@ func TestLiveThreadService_Invite(t *testing.T) { } func TestLiveThreadService_Invite_Permissions(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/live/id123/invite_contributor", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -566,8 +547,7 @@ func TestLiveThreadService_Invite_Permissions(t *testing.T) { } func TestLiveThreadService_Uninvite(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/live/id123/rm_contributor_invite", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -586,8 +566,7 @@ func TestLiveThreadService_Uninvite(t *testing.T) { } func TestLiveThreadService_SetPermissions(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/live/id123/set_contributor_permissions", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -608,8 +587,7 @@ func TestLiveThreadService_SetPermissions(t *testing.T) { } func TestLiveThreadService_SetPermissionsForInvite(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/live/id123/set_contributor_permissions", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -630,8 +608,7 @@ func TestLiveThreadService_SetPermissionsForInvite(t *testing.T) { } func TestLiveThreadService_Revoke(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/live/id123/rm_contributor", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -650,8 +627,7 @@ func TestLiveThreadService_Revoke(t *testing.T) { } func TestLiveThreadService_HideDiscussion(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/live/id123/hide_discussion", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -670,8 +646,7 @@ func TestLiveThreadService_HideDiscussion(t *testing.T) { } func TestLiveThreadService_UnhideDiscussion(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/live/id123/unhide_discussion", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -690,8 +665,7 @@ func TestLiveThreadService_UnhideDiscussion(t *testing.T) { } func TestLiveThreadService_Report(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/live/id123/report", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) diff --git a/reddit/message_test.go b/reddit/message_test.go index c6b6312..b624653 100644 --- a/reddit/message_test.go +++ b/reddit/message_test.go @@ -45,8 +45,7 @@ var expectedMessages = []*Message{ } func TestMessageService_ReadAll(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/read_all_messages", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -59,8 +58,7 @@ func TestMessageService_ReadAll(t *testing.T) { } func TestMessageService_Read(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/read_message", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -81,8 +79,7 @@ func TestMessageService_Read(t *testing.T) { } func TestMessageService_Unread(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/unread_message", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -103,8 +100,7 @@ func TestMessageService_Unread(t *testing.T) { } func TestMessageService_Block(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/block", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -122,8 +118,7 @@ func TestMessageService_Block(t *testing.T) { } func TestMessageService_Collapse(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/collapse_message", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -144,8 +139,7 @@ func TestMessageService_Collapse(t *testing.T) { } func TestMessageService_Uncollapse(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/uncollapse_message", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -166,8 +160,7 @@ func TestMessageService_Uncollapse(t *testing.T) { } func TestMessageService_Delete(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/del_msg", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -185,8 +178,7 @@ func TestMessageService_Delete(t *testing.T) { } func TestMessageService_Send(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/compose", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -216,8 +208,7 @@ func TestMessageService_Send(t *testing.T) { } func TestMessageService_Inbox(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/message/inbox.json") require.NoError(t, err) @@ -234,8 +225,7 @@ func TestMessageService_Inbox(t *testing.T) { } func TestMessageService_InboxUnread(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/message/inbox.json") require.NoError(t, err) @@ -252,8 +242,7 @@ func TestMessageService_InboxUnread(t *testing.T) { } func TestMessageService_Sent(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/message/inbox.json") require.NoError(t, err) diff --git a/reddit/moderation_test.go b/reddit/moderation_test.go index 58da484..0966be8 100644 --- a/reddit/moderation_test.go +++ b/reddit/moderation_test.go @@ -46,8 +46,7 @@ var expectedModActions = []*ModAction{ } func TestModerationService_Actions(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/moderation/actions.json") require.NoError(t, err) @@ -73,8 +72,7 @@ func TestModerationService_Actions(t *testing.T) { } func TestModerationService_AcceptInvite(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/moderation/actions.json") require.NoError(t, err) @@ -97,8 +95,7 @@ func TestModerationService_AcceptInvite(t *testing.T) { } func TestModerationService_Approve(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/approve", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -116,8 +113,7 @@ func TestModerationService_Approve(t *testing.T) { } func TestModerationService_Remove(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/remove", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -136,8 +132,7 @@ func TestModerationService_Remove(t *testing.T) { } func TestModerationService_RemoveSpam(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/remove", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -156,8 +151,7 @@ func TestModerationService_RemoveSpam(t *testing.T) { } func TestModerationService_Leave(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/leavemoderator", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -175,8 +169,7 @@ func TestModerationService_Leave(t *testing.T) { } func TestModerationService_LeaveContributor(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/leavecontributor", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -194,8 +187,7 @@ func TestModerationService_LeaveContributor(t *testing.T) { } func TestModerationService_Reported(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) // contains posts and comments blob, err := readFileContents("../testdata/user/overview.json") @@ -219,8 +211,7 @@ func TestModerationService_Reported(t *testing.T) { } func TestModerationService_Spam(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) // contains posts and comments blob, err := readFileContents("../testdata/user/overview.json") @@ -244,8 +235,7 @@ func TestModerationService_Spam(t *testing.T) { } func TestModerationService_Queue(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) // contains posts and comments blob, err := readFileContents("../testdata/user/overview.json") @@ -269,8 +259,7 @@ func TestModerationService_Queue(t *testing.T) { } func TestModerationService_Unmoderated(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) // contains posts and comments blob, err := readFileContents("../testdata/user/overview.json") @@ -290,8 +279,7 @@ func TestModerationService_Unmoderated(t *testing.T) { } func TestModerationService_Edited(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) // contains posts and comments blob, err := readFileContents("../testdata/user/overview.json") @@ -315,8 +303,7 @@ func TestModerationService_Edited(t *testing.T) { } func TestModerationService_IgnoreReports(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/ignore_reports", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -334,8 +321,7 @@ func TestModerationService_IgnoreReports(t *testing.T) { } func TestModerationService_UnignoreReports(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/unignore_reports", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -353,8 +339,7 @@ func TestModerationService_UnignoreReports(t *testing.T) { } func TestModerationService_Invite(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/friend", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -375,8 +360,7 @@ func TestModerationService_Invite(t *testing.T) { } func TestModerationService_Invite_Permissions(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/friend", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -397,8 +381,7 @@ func TestModerationService_Invite_Permissions(t *testing.T) { } func TestModerationService_Uninvite(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/unfriend", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -418,8 +401,7 @@ func TestModerationService_Uninvite(t *testing.T) { } func TestModerationService_SetPermissions(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/setpermissions", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -440,8 +422,7 @@ func TestModerationService_SetPermissions(t *testing.T) { } func TestModerationService_Ban(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/friend", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -470,8 +451,7 @@ func TestModerationService_Ban(t *testing.T) { } func TestModerationService_Unban(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/unfriend", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -491,8 +471,7 @@ func TestModerationService_Unban(t *testing.T) { } func TestModerationService_BanWiki(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/friend", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -521,8 +500,7 @@ func TestModerationService_BanWiki(t *testing.T) { } func TestModerationService_UnbanWiki(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/unfriend", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -542,8 +520,7 @@ func TestModerationService_UnbanWiki(t *testing.T) { } func TestModerationService_Mute(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/friend", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -563,8 +540,7 @@ func TestModerationService_Mute(t *testing.T) { } func TestModerationService_Unmuted(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/unfriend", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -584,8 +560,7 @@ func TestModerationService_Unmuted(t *testing.T) { } func TestModerationService_ApproveUser(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/friend", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -605,8 +580,7 @@ func TestModerationService_ApproveUser(t *testing.T) { } func TestModerationService_UnapproveUser(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/unfriend", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -626,8 +600,7 @@ func TestModerationService_UnapproveUser(t *testing.T) { } func TestModerationService_ApproveUserWiki(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/friend", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -647,8 +620,7 @@ func TestModerationService_ApproveUserWiki(t *testing.T) { } func TestModerationService_UnapproveUserWiki(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/unfriend", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -668,8 +640,7 @@ func TestModerationService_UnapproveUserWiki(t *testing.T) { } func TestModerationService_Distinguish(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/distinguish", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -689,8 +660,7 @@ func TestModerationService_Distinguish(t *testing.T) { } func TestModerationService_DistinguishAndSticky(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/distinguish", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -711,8 +681,7 @@ func TestModerationService_DistinguishAndSticky(t *testing.T) { } func TestModerationService_Undistinguish(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/distinguish", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) diff --git a/reddit/multi_test.go b/reddit/multi_test.go index 41975f7..72423b6 100644 --- a/reddit/multi_test.go +++ b/reddit/multi_test.go @@ -44,8 +44,7 @@ var expectedMulti2 = &Multi{ } func TestMultiService_Get(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/multi/multi.json") require.NoError(t, err) @@ -61,8 +60,7 @@ func TestMultiService_Get(t *testing.T) { } func TestMultiService_Mine(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/multi/multis.json") require.NoError(t, err) @@ -78,8 +76,7 @@ func TestMultiService_Mine(t *testing.T) { } func TestMultiService_Of(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/multi/multis.json") require.NoError(t, err) @@ -95,8 +92,7 @@ func TestMultiService_Of(t *testing.T) { } func TestMultiService_Copy(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/multi/multi.json") require.NoError(t, err) @@ -131,8 +127,7 @@ func TestMultiService_Copy(t *testing.T) { } func TestMultiService_Create(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/multi/multi.json") require.NoError(t, err) @@ -169,8 +164,7 @@ func TestMultiService_Create(t *testing.T) { } func TestMultiService_Update(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/multi/multi.json") require.NoError(t, err) @@ -206,8 +200,7 @@ func TestMultiService_Update(t *testing.T) { } func TestMultiService_Delete(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/multi/user/testuser/m/testmulti", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodDelete, r.Method) @@ -218,8 +211,7 @@ func TestMultiService_Delete(t *testing.T) { } func TestMultiService_Description(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/multi/description.json") require.NoError(t, err) @@ -235,8 +227,7 @@ func TestMultiService_Description(t *testing.T) { } func TestMultiService_UpdateDescription(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/multi/description.json") require.NoError(t, err) @@ -260,8 +251,7 @@ func TestMultiService_UpdateDescription(t *testing.T) { } func TestMultiService_AddSubreddit(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/multi/user/testuser/m/testmulti/r/golang", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPut, r.Method) @@ -279,8 +269,7 @@ func TestMultiService_AddSubreddit(t *testing.T) { } func TestMultiService_DeleteSubreddit(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/multi/user/testuser/m/testmulti/r/golang", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodDelete, r.Method) diff --git a/reddit/post_test.go b/reddit/post_test.go index fe8ce45..78d26b3 100644 --- a/reddit/post_test.go +++ b/reddit/post_test.go @@ -212,8 +212,7 @@ var expectedPostDuplicates = []*Post{ } func TestPostService_Get(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/post/post.json") require.NoError(t, err) @@ -229,8 +228,7 @@ func TestPostService_Get(t *testing.T) { } func TestPostService_Duplicates(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/post/duplicates.json") require.NoError(t, err) @@ -262,8 +260,7 @@ func TestPostService_Duplicates(t *testing.T) { } func TestPostService_SubmitText(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/post/submit.json") require.NoError(t, err) @@ -297,8 +294,7 @@ func TestPostService_SubmitText(t *testing.T) { } func TestPostService_SubmitLink(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/post/submit.json") require.NoError(t, err) @@ -336,8 +332,7 @@ func TestPostService_SubmitLink(t *testing.T) { } func TestPostService_Edit(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/post/edit.json") require.NoError(t, err) @@ -364,8 +359,7 @@ func TestPostService_Edit(t *testing.T) { } func TestPostService_Hide(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/hide", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -387,8 +381,7 @@ func TestPostService_Hide(t *testing.T) { } func TestPostService_Unhide(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/unhide", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -410,8 +403,7 @@ func TestPostService_Unhide(t *testing.T) { } func TestPostService_MarkNSFW(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/marknsfw", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -430,8 +422,7 @@ func TestPostService_MarkNSFW(t *testing.T) { } func TestPostService_UnmarkNSFW(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/unmarknsfw", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -450,8 +441,7 @@ func TestPostService_UnmarkNSFW(t *testing.T) { } func TestPostService_Spoiler(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/spoiler", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -470,8 +460,7 @@ func TestPostService_Spoiler(t *testing.T) { } func TestPostService_Unspoiler(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/unspoiler", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -490,8 +479,7 @@ func TestPostService_Unspoiler(t *testing.T) { } func TestPostService_Sticky(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/set_subreddit_sticky", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -513,8 +501,7 @@ func TestPostService_Sticky(t *testing.T) { } func TestPostService_Unsticky(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/set_subreddit_sticky", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -535,8 +522,7 @@ func TestPostService_Unsticky(t *testing.T) { } func TestPostService_PinToProfile(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/set_subreddit_sticky", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -558,8 +544,7 @@ func TestPostService_PinToProfile(t *testing.T) { } func TestPostService_UnpinFromProfile(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/set_subreddit_sticky", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -581,8 +566,7 @@ func TestPostService_UnpinFromProfile(t *testing.T) { } func TestPostService_SetSuggestedSortBest(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/set_suggested_sort", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -603,8 +587,7 @@ func TestPostService_SetSuggestedSortBest(t *testing.T) { } func TestPostService_SetSuggestedSortTop(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/set_suggested_sort", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -625,8 +608,7 @@ func TestPostService_SetSuggestedSortTop(t *testing.T) { } func TestPostService_SetSuggestedSortNew(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/set_suggested_sort", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -647,8 +629,7 @@ func TestPostService_SetSuggestedSortNew(t *testing.T) { } func TestPostService_SetSuggestedSortControversial(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/set_suggested_sort", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -669,8 +650,7 @@ func TestPostService_SetSuggestedSortControversial(t *testing.T) { } func TestPostService_SetSuggestedSortOld(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/set_suggested_sort", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -691,8 +671,7 @@ func TestPostService_SetSuggestedSortOld(t *testing.T) { } func TestPostService_SetSuggestedSortRandom(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/set_suggested_sort", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -713,8 +692,7 @@ func TestPostService_SetSuggestedSortRandom(t *testing.T) { } func TestPostService_SetSuggestedSortAMA(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/set_suggested_sort", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -735,8 +713,7 @@ func TestPostService_SetSuggestedSortAMA(t *testing.T) { } func TestPostService_SetSuggestedSortLive(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/set_suggested_sort", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -757,8 +734,7 @@ func TestPostService_SetSuggestedSortLive(t *testing.T) { } func TestPostService_ClearSuggestedSort(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/set_suggested_sort", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -779,8 +755,7 @@ func TestPostService_ClearSuggestedSort(t *testing.T) { } func TestPostService_EnableContestMode(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/set_contest_mode", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -801,8 +776,7 @@ func TestPostService_EnableContestMode(t *testing.T) { } func TestPostService_DisableContestMode(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/set_contest_mode", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -823,8 +797,7 @@ func TestPostService_DisableContestMode(t *testing.T) { } func TestPostService_LoadMoreReplies(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/post/more.json") require.NoError(t, err) @@ -875,8 +848,7 @@ func TestPostService_LoadMoreReplies(t *testing.T) { } func TestPostService_RandomFromSubreddits(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/post/post.json") require.NoError(t, err) @@ -892,8 +864,7 @@ func TestPostService_RandomFromSubreddits(t *testing.T) { } func TestPostService_Random(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/post/post.json") require.NoError(t, err) @@ -909,8 +880,7 @@ func TestPostService_Random(t *testing.T) { } func TestPostService_RandomFromSubscriptions(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/post/post.json") require.NoError(t, err) @@ -926,8 +896,7 @@ func TestPostService_RandomFromSubscriptions(t *testing.T) { } func TestPostService_Delete(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/del", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -946,8 +915,7 @@ func TestPostService_Delete(t *testing.T) { } func TestPostService_Save(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/save", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -966,8 +934,7 @@ func TestPostService_Save(t *testing.T) { } func TestPostService_Unsave(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/unsave", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -986,8 +953,7 @@ func TestPostService_Unsave(t *testing.T) { } func TestPostService_EnableReplies(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/sendreplies", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -1007,8 +973,7 @@ func TestPostService_EnableReplies(t *testing.T) { } func TestPostService_DisableReplies(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/sendreplies", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -1028,8 +993,7 @@ func TestPostService_DisableReplies(t *testing.T) { } func TestPostService_Lock(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/lock", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -1048,8 +1012,7 @@ func TestPostService_Lock(t *testing.T) { } func TestPostService_Unlock(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/unlock", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -1068,8 +1031,7 @@ func TestPostService_Unlock(t *testing.T) { } func TestPostService_Upvote(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/vote", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -1090,8 +1052,7 @@ func TestPostService_Upvote(t *testing.T) { } func TestPostService_Downvote(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/vote", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -1112,8 +1073,7 @@ func TestPostService_Downvote(t *testing.T) { } func TestPostService_RemoveVote(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/vote", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -1134,8 +1094,7 @@ func TestPostService_RemoveVote(t *testing.T) { } func TestPostService_MarkVisited(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/store_visits", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -1156,8 +1115,7 @@ func TestPostService_MarkVisited(t *testing.T) { } func TestPostService_Report(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/report", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) diff --git a/reddit/reddit_test.go b/reddit/reddit_test.go index d252aa6..2aea1d4 100644 --- a/reddit/reddit_test.go +++ b/reddit/reddit_test.go @@ -17,9 +17,11 @@ import ( var ctx = context.Background() -func setup() (*Client, *http.ServeMux, func()) { +func setup(t testing.TB) (*Client, *http.ServeMux) { mux := http.NewServeMux() + server := httptest.NewServer(mux) + t.Cleanup(server.Close) mux.HandleFunc("/api/v1/access_token", func(w http.ResponseWriter, r *http.Request) { response := `{ @@ -38,7 +40,7 @@ func setup() (*Client, *http.ServeMux, func()) { WithTokenURL(server.URL+"/api/v1/access_token"), ) - return client, mux, server.Close + return client, mux } func readFileContents(path string) (string, error) { @@ -145,8 +147,7 @@ func TestClient_Readonly_NewRequest(t *testing.T) { } func TestClient_OnRequestComplemented(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) var i int cb := func(*http.Request, *http.Response) { @@ -175,8 +176,7 @@ func TestClient_OnRequestComplemented(t *testing.T) { } func TestClient_JSONErrorResponse(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/v1/test", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodGet, r.Method) @@ -203,8 +203,7 @@ func TestClient_JSONErrorResponse(t *testing.T) { } func TestClient_ErrorResponse(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/v1/test", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodGet, r.Method) @@ -224,8 +223,7 @@ func TestClient_ErrorResponse(t *testing.T) { } func TestClient_Do_RateLimitError(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) var counter int mux.HandleFunc("/api/v1/test", func(w http.ResponseWriter, r *http.Request) { diff --git a/reddit/stream_test.go b/reddit/stream_test.go index 9ac54cd..9ae48c6 100644 --- a/reddit/stream_test.go +++ b/reddit/stream_test.go @@ -10,11 +10,9 @@ import ( ) func TestStreamService_Posts(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) var counter int - mux.HandleFunc("/r/testsubreddit/new", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodGet, r.Method) defer func() { counter++ }() @@ -162,11 +160,9 @@ loop: } func TestStreamService_Posts_DiscardInitial(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) var counter int - mux.HandleFunc("/r/testsubreddit/new", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodGet, r.Method) defer func() { counter++ }() diff --git a/reddit/subreddit_test.go b/reddit/subreddit_test.go index dab0ad8..9bf9049 100644 --- a/reddit/subreddit_test.go +++ b/reddit/subreddit_test.go @@ -435,8 +435,7 @@ var expectedSubredditPostRequirements = &SubredditPostRequirements{ } func TestSubredditService_HotPosts(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/subreddit/posts.json") require.NoError(t, err) @@ -453,8 +452,7 @@ func TestSubredditService_HotPosts(t *testing.T) { } func TestSubredditService_NewPosts(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/subreddit/posts.json") require.NoError(t, err) @@ -471,8 +469,7 @@ func TestSubredditService_NewPosts(t *testing.T) { } func TestSubredditService_RisingPosts(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/subreddit/posts.json") require.NoError(t, err) @@ -489,8 +486,7 @@ func TestSubredditService_RisingPosts(t *testing.T) { } func TestSubredditService_ControversialPosts(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/subreddit/posts.json") require.NoError(t, err) @@ -507,8 +503,7 @@ func TestSubredditService_ControversialPosts(t *testing.T) { } func TestSubredditService_TopPosts(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/subreddit/posts.json") require.NoError(t, err) @@ -525,8 +520,7 @@ func TestSubredditService_TopPosts(t *testing.T) { } func TestSubredditService_Get(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/subreddit/about.json") require.NoError(t, err) @@ -545,8 +539,7 @@ func TestSubredditService_Get(t *testing.T) { } func TestSubredditService_Popular(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/subreddit/list.json") require.NoError(t, err) @@ -563,8 +556,7 @@ func TestSubredditService_Popular(t *testing.T) { } func TestSubredditService_New(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/subreddit/list.json") require.NoError(t, err) @@ -581,8 +573,7 @@ func TestSubredditService_New(t *testing.T) { } func TestSubredditService_Gold(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/subreddit/list.json") require.NoError(t, err) @@ -599,8 +590,7 @@ func TestSubredditService_Gold(t *testing.T) { } func TestSubredditService_Default(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/subreddit/list.json") require.NoError(t, err) @@ -617,8 +607,7 @@ func TestSubredditService_Default(t *testing.T) { } func TestSubredditService_Subscribed(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/subreddit/list.json") require.NoError(t, err) @@ -635,8 +624,7 @@ func TestSubredditService_Subscribed(t *testing.T) { } func TestSubredditService_Approved(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/subreddit/list.json") require.NoError(t, err) @@ -653,8 +641,7 @@ func TestSubredditService_Approved(t *testing.T) { } func TestSubredditService_Moderated(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/subreddit/list.json") require.NoError(t, err) @@ -671,8 +658,7 @@ func TestSubredditService_Moderated(t *testing.T) { } func TestSubredditService_GetSticky1(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/post/post.json") require.NoError(t, err) @@ -693,8 +679,7 @@ func TestSubredditService_GetSticky1(t *testing.T) { } func TestSubredditService_GetSticky2(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/post/post.json") require.NoError(t, err) @@ -715,8 +700,7 @@ func TestSubredditService_GetSticky2(t *testing.T) { } func TestSubredditService_Subscribe(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/subscribe", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -735,8 +719,7 @@ func TestSubredditService_Subscribe(t *testing.T) { } func TestSubredditService_SubscribeByID(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/subscribe", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -755,8 +738,7 @@ func TestSubredditService_SubscribeByID(t *testing.T) { } func TestSubredditService_Unsubscribe(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/subscribe", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -775,8 +757,7 @@ func TestSubredditService_Unsubscribe(t *testing.T) { } func TestSubredditService_UnsubscribeByID(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/subscribe", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -795,8 +776,7 @@ func TestSubredditService_UnsubscribeByID(t *testing.T) { } func TestSubredditService_Favorite(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/favorite", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -816,8 +796,7 @@ func TestSubredditService_Favorite(t *testing.T) { } func TestSubredditService_Unfavorite(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/favorite", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -837,8 +816,7 @@ func TestSubredditService_Unfavorite(t *testing.T) { } func TestSubredditService_Search(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/subreddit/list.json") require.NoError(t, err) @@ -870,8 +848,7 @@ func TestSubredditService_Search(t *testing.T) { } func TestSubredditService_SearchNames(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/subreddit/search-names.json") require.NoError(t, err) @@ -895,8 +872,7 @@ func TestSubredditService_SearchNames(t *testing.T) { } func TestSubredditService_SearchPosts(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/subreddit/search-posts.json") require.NoError(t, err) @@ -921,8 +897,7 @@ func TestSubredditService_SearchPosts(t *testing.T) { } func TestSubredditService_SearchPosts_InSubreddit(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/subreddit/search-posts.json") require.NoError(t, err) @@ -948,8 +923,7 @@ func TestSubredditService_SearchPosts_InSubreddit(t *testing.T) { } func TestSubredditService_SearchPosts_InSubreddits(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/subreddit/search-posts.json") require.NoError(t, err) @@ -975,8 +949,7 @@ func TestSubredditService_SearchPosts_InSubreddits(t *testing.T) { } func TestSubredditService_Random(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/subreddit/random.json") require.NoError(t, err) @@ -998,8 +971,7 @@ func TestSubredditService_Random(t *testing.T) { } func TestSubredditService_RandomNSFW(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/subreddit/random.json") require.NoError(t, err) @@ -1021,8 +993,7 @@ func TestSubredditService_RandomNSFW(t *testing.T) { } func TestSubredditService_SubmissionText(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/test/api/submit_text", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodGet, r.Method) @@ -1038,8 +1009,7 @@ func TestSubredditService_SubmissionText(t *testing.T) { } func TestSubredditService_Banned(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/subreddit/banned-users.json") require.NoError(t, err) @@ -1064,8 +1034,7 @@ func TestSubredditService_Banned(t *testing.T) { } func TestSubredditService_Muted(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/subreddit/relationships.json") require.NoError(t, err) @@ -1090,8 +1059,7 @@ func TestSubredditService_Muted(t *testing.T) { } func TestSubredditService_WikiBanned(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/subreddit/banned-users.json") require.NoError(t, err) @@ -1116,8 +1084,7 @@ func TestSubredditService_WikiBanned(t *testing.T) { } func TestSubredditService_Contributors(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/subreddit/relationships.json") require.NoError(t, err) @@ -1141,8 +1108,7 @@ func TestSubredditService_Contributors(t *testing.T) { } func TestSubredditService_WikiContributors(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/subreddit/relationships.json") require.NoError(t, err) @@ -1166,8 +1132,7 @@ func TestSubredditService_WikiContributors(t *testing.T) { } func TestSubredditService_Moderators(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/subreddit/moderators.json") require.NoError(t, err) @@ -1183,8 +1148,7 @@ func TestSubredditService_Moderators(t *testing.T) { } func TestSubredditService_Rules(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/subreddit/rules.json") require.NoError(t, err) @@ -1200,8 +1164,7 @@ func TestSubredditService_Rules(t *testing.T) { } func TestSubredditService_CreateRule(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/add_subreddit_rule", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -1228,8 +1191,7 @@ func TestSubredditService_CreateRule(t *testing.T) { } func TestSubredditService_CreateRule_Error(t *testing.T) { - client, _, teardown := setup() - defer teardown() + client, _ := setup(t) _, err := client.Subreddit.CreateRule(ctx, "testsubreddit", nil) require.EqualError(t, err, "*SubredditRuleCreateRequest: cannot be nil") @@ -1256,8 +1218,7 @@ func TestSubredditService_CreateRule_Error(t *testing.T) { } func TestSubredditService_Traffic(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/subreddit/traffic.json") require.NoError(t, err) @@ -1275,8 +1236,7 @@ func TestSubredditService_Traffic(t *testing.T) { } func TestSubredditService_StyleSheet(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/subreddit/stylesheet.json") require.NoError(t, err) @@ -1292,8 +1252,7 @@ func TestSubredditService_StyleSheet(t *testing.T) { } func TestSubredditService_StyleSheetRaw(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/stylesheet", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodGet, r.Method) @@ -1306,8 +1265,7 @@ func TestSubredditService_StyleSheetRaw(t *testing.T) { } func TestSubredditService_UpdateStyleSheet(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/subreddit_stylesheet", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -1328,8 +1286,7 @@ func TestSubredditService_UpdateStyleSheet(t *testing.T) { } func TestSubredditService_RemoveImage(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/delete_sr_img", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -1348,8 +1305,7 @@ func TestSubredditService_RemoveImage(t *testing.T) { } func TestSubredditService_RemoveHeader(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/delete_sr_header", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -1367,8 +1323,7 @@ func TestSubredditService_RemoveHeader(t *testing.T) { } func TestSubredditService_RemoveMobileHeader(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/delete_sr_banner", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -1386,8 +1341,7 @@ func TestSubredditService_RemoveMobileHeader(t *testing.T) { } func TestSubredditService_RemoveMobileIcon(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/delete_sr_icon", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -1405,8 +1359,7 @@ func TestSubredditService_RemoveMobileIcon(t *testing.T) { } func TestSubredditService_UploadImage(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) imageFile, err := ioutil.TempFile("/tmp", "emoji*.png") require.NoError(t, err) @@ -1452,8 +1405,7 @@ func TestSubredditService_UploadImage(t *testing.T) { } func TestSubredditService_UploadHeader(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) imageFile, err := ioutil.TempFile("/tmp", "emoji*.png") require.NoError(t, err) @@ -1499,8 +1451,7 @@ func TestSubredditService_UploadHeader(t *testing.T) { } func TestSubredditService_UploadMobileHeader(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) imageFile, err := ioutil.TempFile("/tmp", "emoji*.png") require.NoError(t, err) @@ -1546,8 +1497,7 @@ func TestSubredditService_UploadMobileHeader(t *testing.T) { } func TestSubredditService_UploadMobileIcon(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) imageFile, err := ioutil.TempFile("/tmp", "emoji*.jpg") require.NoError(t, err) @@ -1593,8 +1543,7 @@ func TestSubredditService_UploadMobileIcon(t *testing.T) { } func TestSubredditService_UploadImage_Error(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) imageFile, err := ioutil.TempFile("/tmp", "emoji*.jpg") require.NoError(t, err) @@ -1621,8 +1570,7 @@ func TestSubredditService_UploadImage_Error(t *testing.T) { } func TestSubredditService_Create(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/site_admin", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -1682,8 +1630,7 @@ func TestSubredditService_Create(t *testing.T) { } func TestSubredditService_Edit(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/site_admin", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -1743,8 +1690,7 @@ func TestSubredditService_Edit(t *testing.T) { } func TestSubredditService_GetSettings(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/subreddit/settings.json") require.NoError(t, err) @@ -1760,8 +1706,7 @@ func TestSubredditService_GetSettings(t *testing.T) { } func TestSubredditService_PostRequirements(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/subreddit/post-requirements.json") require.NoError(t, err) diff --git a/reddit/user_test.go b/reddit/user_test.go index 9431a4b..81a2fd0 100644 --- a/reddit/user_test.go +++ b/reddit/user_test.go @@ -182,8 +182,7 @@ var expectedSearchUsers = []*User{ } func TestUserService_Get(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/user/get.json") require.NoError(t, err) @@ -199,8 +198,7 @@ func TestUserService_Get(t *testing.T) { } func TestUserService_GetMultipleByID(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/user/get-multiple-by-id.json") require.NoError(t, err) @@ -221,8 +219,7 @@ func TestUserService_GetMultipleByID(t *testing.T) { } func TestUserService_UsernameAvailable(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/username_available", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodGet, r.Method) @@ -247,8 +244,7 @@ func TestUserService_UsernameAvailable(t *testing.T) { } func TestUserService_Overview(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/user/overview.json") require.NoError(t, err) @@ -271,8 +267,7 @@ func TestUserService_Overview(t *testing.T) { } func TestUserService_OverviewOf(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/user/overview.json") require.NoError(t, err) @@ -295,8 +290,7 @@ func TestUserService_OverviewOf(t *testing.T) { } func TestUserService_Overview_Options(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/user/overview.json") require.NoError(t, err) @@ -327,8 +321,7 @@ func TestUserService_Overview_Options(t *testing.T) { } func TestUserService_Posts(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/user/submitted.json") require.NoError(t, err) @@ -347,8 +340,7 @@ func TestUserService_Posts(t *testing.T) { } func TestUserService_PostsOf(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/user/submitted.json") require.NoError(t, err) @@ -367,8 +359,7 @@ func TestUserService_PostsOf(t *testing.T) { } func TestUserService_Posts_Options(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/user/submitted.json") require.NoError(t, err) @@ -397,8 +388,7 @@ func TestUserService_Posts_Options(t *testing.T) { } func TestUserService_Comments(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/user/comments.json") require.NoError(t, err) @@ -417,8 +407,7 @@ func TestUserService_Comments(t *testing.T) { } func TestUserService_CommentsOf(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/user/comments.json") require.NoError(t, err) @@ -437,8 +426,7 @@ func TestUserService_CommentsOf(t *testing.T) { } func TestUserService_Comments_Options(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/user/comments.json") require.NoError(t, err) @@ -467,8 +455,7 @@ func TestUserService_Comments_Options(t *testing.T) { } func TestUserService_Saved(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) // we'll use this, similar payloads blob, err := readFileContents("../testdata/user/overview.json") @@ -492,8 +479,7 @@ func TestUserService_Saved(t *testing.T) { } func TestUserService_Saved_Options(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) // we'll use this, similar payloads blob, err := readFileContents("../testdata/user/overview.json") @@ -522,8 +508,7 @@ func TestUserService_Saved_Options(t *testing.T) { require.NoError(t, err) } func TestUserService_Upvoted(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) // we'll use this, similar payloads blob, err := readFileContents("../testdata/user/submitted.json") @@ -543,8 +528,7 @@ func TestUserService_Upvoted(t *testing.T) { } func TestUserService_Upvoted_Options(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) // we'll use this, similar payloads blob, err := readFileContents("../testdata/user/submitted.json") @@ -574,8 +558,7 @@ func TestUserService_Upvoted_Options(t *testing.T) { } func TestUserService_UpvotedOf(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) // we'll use this, similar payloads blob, err := readFileContents("../testdata/user/submitted.json") @@ -595,8 +578,7 @@ func TestUserService_UpvotedOf(t *testing.T) { } func TestUserService_Downvoted(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) // we'll use this, similar payloads blob, err := readFileContents("../testdata/user/submitted.json") @@ -616,8 +598,7 @@ func TestUserService_Downvoted(t *testing.T) { } func TestUserService_Downvoted_Options(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) // we'll use this, similar payloads blob, err := readFileContents("../testdata/user/submitted.json") @@ -647,8 +628,7 @@ func TestUserService_Downvoted_Options(t *testing.T) { } func TestUserService_DownvotedOf(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) // we'll use this, similar payloads blob, err := readFileContents("../testdata/user/submitted.json") @@ -668,8 +648,7 @@ func TestUserService_DownvotedOf(t *testing.T) { } func TestUserService_Hidden(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) // we'll use this, similar payloads blob, err := readFileContents("../testdata/user/submitted.json") @@ -689,8 +668,7 @@ func TestUserService_Hidden(t *testing.T) { } func TestUserService_Gilded(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) // we'll use this, similar payloads blob, err := readFileContents("../testdata/user/submitted.json") @@ -710,8 +688,7 @@ func TestUserService_Gilded(t *testing.T) { } func TestUserService_GetFriendship(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/user/friend.json") require.NoError(t, err) @@ -727,8 +704,7 @@ func TestUserService_GetFriendship(t *testing.T) { } func TestUserService_Friend(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/user/friend.json") require.NoError(t, err) @@ -753,8 +729,7 @@ func TestUserService_Friend(t *testing.T) { } func TestUserService_Unfriend(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/api/v1/me/friends/test123", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodDelete, r.Method) @@ -767,8 +742,7 @@ func TestUserService_Unfriend(t *testing.T) { } func TestUserService_Block(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/user/block.json") require.NoError(t, err) @@ -792,8 +766,7 @@ func TestUserService_Block(t *testing.T) { } func TestUserService_BlockByID(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/user/block.json") require.NoError(t, err) @@ -817,8 +790,7 @@ func TestUserService_BlockByID(t *testing.T) { } func TestUserService_Unblock(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) client.redditID = "self123" @@ -840,8 +812,7 @@ func TestUserService_Unblock(t *testing.T) { } func TestUserService_UnblockByID(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) client.redditID = "self123" @@ -863,8 +834,7 @@ func TestUserService_UnblockByID(t *testing.T) { } func TestUserService_Trophies(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/user/trophies.json") require.NoError(t, err) @@ -880,8 +850,7 @@ func TestUserService_Trophies(t *testing.T) { } func TestUserService_TrophiesOf(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/user/trophies.json") require.NoError(t, err) @@ -897,8 +866,7 @@ func TestUserService_TrophiesOf(t *testing.T) { } func TestUserService_Popular(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/user/user-subreddits.json") require.NoError(t, err) @@ -915,8 +883,7 @@ func TestUserService_Popular(t *testing.T) { } func TestUserService_New(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/user/user-subreddits.json") require.NoError(t, err) @@ -933,8 +900,7 @@ func TestUserService_New(t *testing.T) { } func TestUserService_Search(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/user/list.json") require.NoError(t, err) diff --git a/reddit/widget_test.go b/reddit/widget_test.go index 7a42e59..40692b6 100644 --- a/reddit/widget_test.go +++ b/reddit/widget_test.go @@ -172,8 +172,7 @@ var expectedWidgets = []Widget{ } func TestWidgetService_Get(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/widget/widgets.json") require.NoError(t, err) @@ -197,8 +196,7 @@ func TestWidgetService_Get(t *testing.T) { } func TestWidgetService_Create(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/widget", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -240,8 +238,7 @@ func TestWidgetService_Create(t *testing.T) { } func TestWidgetService_Delete(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/widget/abc123", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodDelete, r.Method) @@ -252,8 +249,7 @@ func TestWidgetService_Delete(t *testing.T) { } func TestWidgetService_Reorder(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/widget_order/sidebar", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPatch, r.Method) diff --git a/reddit/wiki_test.go b/reddit/wiki_test.go index 6519860..cc9b961 100644 --- a/reddit/wiki_test.go +++ b/reddit/wiki_test.go @@ -116,8 +116,7 @@ var expectedWikiPageRevisions = []*WikiPageRevision{ } func TestWikiService_Page(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/wiki/page.json") require.NoError(t, err) @@ -133,8 +132,7 @@ func TestWikiService_Page(t *testing.T) { } func TestWikiService_PageRevision(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/wiki/page.json") require.NoError(t, err) @@ -158,8 +156,7 @@ func TestWikiService_PageRevision(t *testing.T) { } func TestWikiService_Pages(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/wiki/pages", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodGet, r.Method) @@ -178,8 +175,7 @@ func TestWikiService_Pages(t *testing.T) { } func TestWikiService_Edit(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/wiki/edit", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -207,8 +203,7 @@ func TestWikiService_Edit(t *testing.T) { } func TestWikiService_Revert(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/wiki/revert", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -227,8 +222,7 @@ func TestWikiService_Revert(t *testing.T) { } func TestWikiService_Settings(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/wiki/page-settings.json") require.NoError(t, err) @@ -244,8 +238,7 @@ func TestWikiService_Settings(t *testing.T) { } func TestWikiService_UpdateSettings(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/wiki/page-settings.json") require.NoError(t, err) @@ -276,8 +269,7 @@ func TestWikiService_UpdateSettings(t *testing.T) { } func TestWikiService_Discussions(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/wiki/discussions.json") require.NoError(t, err) @@ -293,8 +285,7 @@ func TestWikiService_Discussions(t *testing.T) { } func TestWikiService_ToggleVisibility(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/wiki/hide", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -316,8 +307,7 @@ func TestWikiService_ToggleVisibility(t *testing.T) { } func TestWikiService_Revisions(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/wiki/revisions.json") require.NoError(t, err) @@ -333,8 +323,7 @@ func TestWikiService_Revisions(t *testing.T) { } func TestWikiService_RevisionsPage(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) blob, err := readFileContents("../testdata/wiki/revisions.json") require.NoError(t, err) @@ -364,8 +353,7 @@ func TestWikiService_RevisionsPage(t *testing.T) { } func TestWikiService_Allow(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/wiki/alloweditor/add", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method) @@ -384,8 +372,7 @@ func TestWikiService_Allow(t *testing.T) { } func TestWikiService_Deny(t *testing.T) { - client, mux, teardown := setup() - defer teardown() + client, mux := setup(t) mux.HandleFunc("/r/testsubreddit/api/wiki/alloweditor/del", func(w http.ResponseWriter, r *http.Request) { require.Equal(t, http.MethodPost, r.Method)