Skip to content

Commit 946a151

Browse files
armsnyderarmsnyder
committed
Refactor tests to not call teardown explicitly
1 parent 4e7c141 commit 946a151

File tree

109 files changed

+678
-1360
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+678
-1360
lines changed

‎access_requests_test.go

+8-16
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ import (
2727
)
2828

2929
func TestListProjectAccessRequests(t *testing.T) {
30-
mux, server, client := setup(t)
31-
defer teardown(server)
30+
mux, client := setup(t)
3231

3332
mux.HandleFunc("/api/v4/projects/1/access_requests", func(w http.ResponseWriter, r *http.Request) {
3433
testMethod(t, r, http.MethodGet)
@@ -94,8 +93,7 @@ func TestListProjectAccessRequests(t *testing.T) {
9493
}
9594

9695
func TestListGroupAccessRequests(t *testing.T) {
97-
mux, server, client := setup(t)
98-
defer teardown(server)
96+
mux, client := setup(t)
9997

10098
mux.HandleFunc("/api/v4/groups/1/access_requests", func(w http.ResponseWriter, r *http.Request) {
10199
testMethod(t, r, http.MethodGet)
@@ -161,8 +159,7 @@ func TestListGroupAccessRequests(t *testing.T) {
161159
}
162160

163161
func TestRequestProjectAccess(t *testing.T) {
164-
mux, server, client := setup(t)
165-
defer teardown(server)
162+
mux, client := setup(t)
166163

167164
mux.HandleFunc("/api/v4/projects/1/access_requests", func(w http.ResponseWriter, r *http.Request) {
168165
testMethod(t, r, http.MethodPost)
@@ -208,8 +205,7 @@ func TestRequestProjectAccess(t *testing.T) {
208205
}
209206

210207
func TestRequestGroupAccess(t *testing.T) {
211-
mux, server, client := setup(t)
212-
defer teardown(server)
208+
mux, client := setup(t)
213209

214210
mux.HandleFunc("/api/v4/groups/1/access_requests", func(w http.ResponseWriter, r *http.Request) {
215211
testMethod(t, r, http.MethodPost)
@@ -255,8 +251,7 @@ func TestRequestGroupAccess(t *testing.T) {
255251
}
256252

257253
func TestApproveProjectAccessRequest(t *testing.T) {
258-
mux, server, client := setup(t)
259-
defer teardown(server)
254+
mux, client := setup(t)
260255

261256
mux.HandleFunc("/api/v4/projects/1/access_requests/10/approve", func(w http.ResponseWriter, r *http.Request) {
262257
testMethod(t, r, http.MethodPut)
@@ -315,8 +310,7 @@ func TestApproveProjectAccessRequest(t *testing.T) {
315310
}
316311

317312
func TestApproveGroupAccessRequest(t *testing.T) {
318-
mux, server, client := setup(t)
319-
defer teardown(server)
313+
mux, client := setup(t)
320314

321315
mux.HandleFunc("/api/v4/groups/1/access_requests/10/approve", func(w http.ResponseWriter, r *http.Request) {
322316
testMethod(t, r, http.MethodPut)
@@ -375,8 +369,7 @@ func TestApproveGroupAccessRequest(t *testing.T) {
375369
}
376370

377371
func TestDenyProjectAccessRequest(t *testing.T) {
378-
mux, server, client := setup(t)
379-
defer teardown(server)
372+
mux, client := setup(t)
380373

381374
mux.HandleFunc("/api/v4/projects/1/access_requests/10", func(w http.ResponseWriter, r *http.Request) {
382375
testMethod(t, r, http.MethodDelete)
@@ -400,8 +393,7 @@ func TestDenyProjectAccessRequest(t *testing.T) {
400393
}
401394

402395
func TestDenyGroupAccessRequest(t *testing.T) {
403-
mux, server, client := setup(t)
404-
defer teardown(server)
396+
mux, client := setup(t)
405397

406398
mux.HandleFunc("/api/v4/groups/1/access_requests/10", func(w http.ResponseWriter, r *http.Request) {
407399
testMethod(t, r, http.MethodDelete)

‎applications_test.go

+3-6
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ import (
2424
)
2525

2626
func TestCreateApplication(t *testing.T) {
27-
mux, server, client := setup(t)
28-
defer teardown(server)
27+
mux, client := setup(t)
2928

3029
mux.HandleFunc("/api/v4/applications",
3130
func(w http.ResponseWriter, r *http.Request) {
@@ -56,8 +55,7 @@ func TestCreateApplication(t *testing.T) {
5655
}
5756

5857
func TestListApplications(t *testing.T) {
59-
mux, server, client := setup(t)
60-
defer teardown(server)
58+
mux, client := setup(t)
6159

6260
mux.HandleFunc("/api/v4/applications",
6361
func(w http.ResponseWriter, r *http.Request) {
@@ -84,8 +82,7 @@ func TestListApplications(t *testing.T) {
8482
}
8583

8684
func TestDeleteApplication(t *testing.T) {
87-
mux, server, client := setup(t)
88-
defer teardown(server)
85+
mux, client := setup(t)
8986

9087
mux.HandleFunc("/api/v4/applications/4",
9188
func(w http.ResponseWriter, r *http.Request) {

‎audit_events_test.go

+7-14
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ import (
99
)
1010

1111
func TestAuditEventsService_ListInstanceAuditEvents(t *testing.T) {
12-
mux, server, client := setup(t)
13-
defer teardown(server)
12+
mux, client := setup(t)
1413

1514
mux.HandleFunc("/api/v4/audit_events", func(w http.ResponseWriter, r *http.Request) {
1615
testMethod(t, r, http.MethodGet)
@@ -63,8 +62,7 @@ func TestAuditEventsService_ListInstanceAuditEvents(t *testing.T) {
6362
}
6463

6564
func TestAuditEventsService_ListInstanceAuditEvents_StatusNotFound(t *testing.T) {
66-
mux, server, client := setup(t)
67-
defer teardown(server)
65+
mux, client := setup(t)
6866

6967
mux.HandleFunc("/api/v4/audit_events", func(w http.ResponseWriter, r *http.Request) {
7068
testMethod(t, r, http.MethodGet)
@@ -78,8 +76,7 @@ func TestAuditEventsService_ListInstanceAuditEvents_StatusNotFound(t *testing.T)
7876
}
7977

8078
func TestAuditEventsService_GetInstanceAuditEvent(t *testing.T) {
81-
mux, server, client := setup(t)
82-
defer teardown(server)
79+
mux, client := setup(t)
8380

8481
mux.HandleFunc("/api/v4/audit_events/1", func(w http.ResponseWriter, r *http.Request) {
8582
testMethod(t, r, http.MethodGet)
@@ -135,8 +132,7 @@ func TestAuditEventsService_GetInstanceAuditEvent(t *testing.T) {
135132
}
136133

137134
func TestAuditEventsService_ListGroupAuditEvents(t *testing.T) {
138-
mux, server, client := setup(t)
139-
defer teardown(server)
135+
mux, client := setup(t)
140136

141137
mux.HandleFunc("/api/v4/groups/6/audit_events", func(w http.ResponseWriter, r *http.Request) {
142138
testMethod(t, r, http.MethodGet)
@@ -199,8 +195,7 @@ func TestAuditEventsService_ListGroupAuditEvents(t *testing.T) {
199195
}
200196

201197
func TestAuditEventsService_GetGroupAuditEvent(t *testing.T) {
202-
mux, server, client := setup(t)
203-
defer teardown(server)
198+
mux, client := setup(t)
204199

205200
mux.HandleFunc("/api/v4/groups/6/audit_events/1", func(w http.ResponseWriter, r *http.Request) {
206201
testMethod(t, r, http.MethodGet)
@@ -261,8 +256,7 @@ func TestAuditEventsService_GetGroupAuditEvent(t *testing.T) {
261256
}
262257

263258
func TestAuditEventsService_ListProjectAuditEvents(t *testing.T) {
264-
mux, server, client := setup(t)
265-
defer teardown(server)
259+
mux, client := setup(t)
266260

267261
mux.HandleFunc("/api/v4/projects/6/audit_events", func(w http.ResponseWriter, r *http.Request) {
268262
testMethod(t, r, http.MethodGet)
@@ -325,8 +319,7 @@ func TestAuditEventsService_ListProjectAuditEvents(t *testing.T) {
325319
}
326320

327321
func TestAuditEventsService_GetProjectAuditEvent(t *testing.T) {
328-
mux, server, client := setup(t)
329-
defer teardown(server)
322+
mux, client := setup(t)
330323

331324
mux.HandleFunc("/api/v4/projects/6/audit_events/1", func(w http.ResponseWriter, r *http.Request) {
332325
testMethod(t, r, http.MethodGet)

‎avatar_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ import (
2323
)
2424

2525
func TestGetAvatar(t *testing.T) {
26-
mux, server, client := setup(t)
27-
defer teardown(server)
26+
mux, client := setup(t)
2827

2928
const url = "https://www.gravatar.com/avatar/10e6bf7bcf22c2f00a3ef684b4ada178"
3029

0 commit comments

Comments
 (0)