Skip to content

Commit 3bb493d

Browse files
Update module github.com/golangci/golangci-lint to v2.11.1 (#124)
* Update module github.com/golangci/golangci-lint to v2.11.1 * Fix lint violations --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Colin O'Dell <codell@seatgeek.com>
1 parent 5ae1049 commit 3bb493d

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# renovate: datasource=go depName=github.com/golangci/golangci-lint
2-
GOLANGCI_LINT_VERSION=v2.10.1
2+
GOLANGCI_LINT_VERSION=v2.11.1
33
# renovate: datasource=go depName=gotest.tools/gotestsum
44
GOTESTSUM_VERSION=v1.13.0
55
# renovate: datasource=go depName=github.com/boumenot/gocover-cobertura

pkg/server/handler_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func TestHandler(t *testing.T) {
8888

8989
writer := httptest.NewRecorder()
9090

91-
handler(writer, httptest.NewRequest("POST", "/some-handler", nil))
91+
handler(writer, httptest.NewRequestWithContext(t.Context(), "POST", "/some-handler", nil))
9292

9393
assert.Equal(t, tc.wantStatusCode, writer.Code)
9494
})

pkg/user/handler_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ func TestPreferencesHandler_GetPreferences(t *testing.T) {
144144
t.Parallel()
145145

146146
writer := httptest.NewRecorder()
147-
router.ServeHTTP(writer, httptest.NewRequest("GET", "/users/rufus/preferences", nil))
147+
router.ServeHTTP(writer, httptest.NewRequestWithContext(t.Context(), "GET", "/users/rufus/preferences", nil))
148148

149149
assert.Equal(t, 200, writer.Code)
150150
assert.JSONEq(t, `{
@@ -165,7 +165,7 @@ func TestPreferencesHandler_GetPreferences(t *testing.T) {
165165
t.Parallel()
166166

167167
writer := httptest.NewRecorder()
168-
router.ServeHTTP(writer, httptest.NewRequest("GET", "/users/taylor/preferences", nil))
168+
router.ServeHTTP(writer, httptest.NewRequestWithContext(t.Context(), "GET", "/users/taylor/preferences", nil))
169169

170170
assert.Equal(t, 404, writer.Code)
171171
})
@@ -183,7 +183,7 @@ func TestPreferencesHandler_UpdatePreferences(t *testing.T) {
183183
t.Parallel()
184184

185185
writer := httptest.NewRecorder()
186-
router.ServeHTTP(writer, httptest.NewRequest("PUT", "/users/rufus/preferences", bytes.NewBufferString(`{
186+
router.ServeHTTP(writer, httptest.NewRequestWithContext(t.Context(), "PUT", "/users/rufus/preferences", bytes.NewBufferString(`{
187187
"preferences": {
188188
"com.gitlab.push": {
189189
"slack": false,
@@ -230,7 +230,7 @@ func TestPreferencesHandler_UpdatePreferences(t *testing.T) {
230230
t.Parallel()
231231

232232
writer := httptest.NewRecorder()
233-
router.ServeHTTP(writer, httptest.NewRequest("PUT", "/users/taylor/preferences", bytes.NewBufferString(`{
233+
router.ServeHTTP(writer, httptest.NewRequestWithContext(t.Context(), "PUT", "/users/taylor/preferences", bytes.NewBufferString(`{
234234
"preferences": {
235235
"com.gitlab.push": {
236236
"slack": false,
@@ -250,7 +250,7 @@ func TestPreferencesHandler_UpdatePreferences(t *testing.T) {
250250
t.Parallel()
251251

252252
writer := httptest.NewRecorder()
253-
router.ServeHTTP(writer, httptest.NewRequest("PUT", "/users/rufus/preferences", bytes.NewBufferString(`{{{{ lol this isn't json!`)))
253+
router.ServeHTTP(writer, httptest.NewRequestWithContext(t.Context(), "PUT", "/users/rufus/preferences", bytes.NewBufferString(`{{{{ lol this isn't json!`)))
254254

255255
assert.Equal(t, 400, writer.Code)
256256
})
@@ -265,7 +265,7 @@ func TestPreferencesHandler_ListOptions(t *testing.T) {
265265
router.HandleFunc("/configuration", handler.ListOptions).Methods("GET")
266266

267267
writer := httptest.NewRecorder()
268-
router.ServeHTTP(writer, httptest.NewRequest("GET", "/configuration", nil))
268+
router.ServeHTTP(writer, httptest.NewRequestWithContext(t.Context(), "GET", "/configuration", nil))
269269

270270
assert.Equal(t, 200, writer.Code)
271271
assert.JSONEq(t, `{
@@ -364,7 +364,7 @@ func TestListOptions(t *testing.T) {
364364

365365
// Update to use Parser
366366
ph := NewPreferencesHandler(store, parsers, transports, preference.Default(true))
367-
req := httptest.NewRequest("GET", "/configuration", nil)
367+
req := httptest.NewRequestWithContext(t.Context(), "GET", "/configuration", nil)
368368
w := httptest.NewRecorder()
369369

370370
ph.ListOptions(w, req)

server_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ func TestRun(t *testing.T) {
102102

103103
s := New(tt.opts...)
104104
ctx, cancel := context.WithCancel(t.Context())
105+
defer cancel()
105106
go func() {
106107
time.Sleep(500 * time.Millisecond)
107108
cancel()

0 commit comments

Comments
 (0)