Change setup method signature for tests, no global vars

Signed-off-by: Vartan Benohanian <vartanbeno@gmail.com>

reddit/user_test.go

@@ -187,7 +187,7 @@ var expectedSearchUsers = &Users{
 }
 
 func TestUserService_Get(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/get.json")
@@ -204,7 +204,7 @@ func TestUserService_Get(t *testing.T) {
 }
 
 func TestUserService_GetMultipleByID(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/get-multiple-by-id.json")
@@ -226,7 +226,7 @@ func TestUserService_GetMultipleByID(t *testing.T) {
 }
 
 func TestUserService_UsernameAvailable(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/username_available", func(w http.ResponseWriter, r *http.Request) {
@@ -252,7 +252,7 @@ func TestUserService_UsernameAvailable(t *testing.T) {
 }
 
 func TestUserService_Overview(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/overview.json")
@@ -278,7 +278,7 @@ func TestUserService_Overview(t *testing.T) {
 }
 
 func TestUserService_OverviewOf(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/overview.json")
@@ -304,7 +304,7 @@ func TestUserService_OverviewOf(t *testing.T) {
 }
 
 func TestUserService_Overview_Options(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/overview.json")
@@ -336,7 +336,7 @@ func TestUserService_Overview_Options(t *testing.T) {
 }
 
 func TestUserService_Posts(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/submitted.json")
@@ -357,7 +357,7 @@ func TestUserService_Posts(t *testing.T) {
 }
 
 func TestUserService_PostsOf(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/submitted.json")
@@ -378,7 +378,7 @@ func TestUserService_PostsOf(t *testing.T) {
 }
 
 func TestUserService_Posts_Options(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/submitted.json")
@@ -408,7 +408,7 @@ func TestUserService_Posts_Options(t *testing.T) {
 }
 
 func TestUserService_Comments(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/comments.json")
@@ -429,7 +429,7 @@ func TestUserService_Comments(t *testing.T) {
 }
 
 func TestUserService_CommentsOf(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/comments.json")
@@ -450,7 +450,7 @@ func TestUserService_CommentsOf(t *testing.T) {
 }
 
 func TestUserService_Comments_Options(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/comments.json")
@@ -480,7 +480,7 @@ func TestUserService_Comments_Options(t *testing.T) {
 }
 
 func TestUserService_Saved(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	// we'll use this, similar payloads
@@ -507,7 +507,7 @@ func TestUserService_Saved(t *testing.T) {
 }
 
 func TestUserService_Saved_Options(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	// we'll use this, similar payloads
@@ -537,7 +537,7 @@ func TestUserService_Saved_Options(t *testing.T) {
 	require.NoError(t, err)
 }
 func TestUserService_Upvoted(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	// we'll use this, similar payloads
@@ -559,7 +559,7 @@ func TestUserService_Upvoted(t *testing.T) {
 }
 
 func TestUserService_Upvoted_Options(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	// we'll use this, similar payloads
@@ -590,7 +590,7 @@ func TestUserService_Upvoted_Options(t *testing.T) {
 }
 
 func TestUserService_UpvotedOf(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	// we'll use this, similar payloads
@@ -612,7 +612,7 @@ func TestUserService_UpvotedOf(t *testing.T) {
 }
 
 func TestUserService_Downvoted(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	// we'll use this, similar payloads
@@ -634,7 +634,7 @@ func TestUserService_Downvoted(t *testing.T) {
 }
 
 func TestUserService_Downvoted_Options(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	// we'll use this, similar payloads
@@ -665,7 +665,7 @@ func TestUserService_Downvoted_Options(t *testing.T) {
 }
 
 func TestUserService_DownvotedOf(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	// we'll use this, similar payloads
@@ -687,7 +687,7 @@ func TestUserService_DownvotedOf(t *testing.T) {
 }
 
 func TestUserService_Hidden(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	// we'll use this, similar payloads
@@ -709,7 +709,7 @@ func TestUserService_Hidden(t *testing.T) {
 }
 
 func TestUserService_Gilded(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	// we'll use this, similar payloads
@@ -731,7 +731,7 @@ func TestUserService_Gilded(t *testing.T) {
 }
 
 func TestUserService_GetFriendship(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/friend.json")
@@ -748,7 +748,7 @@ func TestUserService_GetFriendship(t *testing.T) {
 }
 
 func TestUserService_Friend(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/friend.json")
@@ -775,7 +775,7 @@ func TestUserService_Friend(t *testing.T) {
 }
 
 func TestUserService_Unfriend(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/v1/me/friends/test123", func(w http.ResponseWriter, r *http.Request) {
@@ -789,7 +789,7 @@ func TestUserService_Unfriend(t *testing.T) {
 }
 
 func TestUserService_Block(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/block.json")
@@ -814,7 +814,7 @@ func TestUserService_Block(t *testing.T) {
 }
 
 func TestUserService_BlockByID(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/block.json")
@@ -839,7 +839,7 @@ func TestUserService_BlockByID(t *testing.T) {
 }
 
 func TestUserService_Unblock(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	client.redditID = "self123"
@@ -862,7 +862,7 @@ func TestUserService_Unblock(t *testing.T) {
 }
 
 func TestUserService_UnblockByID(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	client.redditID = "self123"
@@ -885,7 +885,7 @@ func TestUserService_UnblockByID(t *testing.T) {
 }
 
 func TestUserService_Trophies(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/trophies.json")
@@ -902,7 +902,7 @@ func TestUserService_Trophies(t *testing.T) {
 }
 
 func TestUserService_TrophiesOf(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/trophies.json")
@@ -919,7 +919,7 @@ func TestUserService_TrophiesOf(t *testing.T) {
 }
 
 func TestUserService_Popular(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/user-subreddits.json")
@@ -936,7 +936,7 @@ func TestUserService_Popular(t *testing.T) {
 }
 
 func TestUserService_New(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/user-subreddits.json")
@@ -953,7 +953,7 @@ func TestUserService_New(t *testing.T) {
 }
 
 func TestUserService_Search(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/list.json")