Skip to content

Commit 223a4bf

Browse files
committed
Bump go-httpbin
1 parent 20369d7 commit 223a4bf

File tree

29 files changed

+3515
-1886
lines changed

29 files changed

+3515
-1886
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ require (
2727
github.com/mailru/easyjson v0.9.0
2828
github.com/mattn/go-colorable v0.1.14
2929
github.com/mattn/go-isatty v0.0.20
30-
github.com/mccutchen/go-httpbin v1.1.2-0.20190116014521-c5cb2f4802fa
30+
github.com/mccutchen/go-httpbin/v2 v2.18.1
3131
github.com/mstoykov/atlas v0.0.0-20220811071828-388f114305dd
3232
github.com/mstoykov/envconfig v1.5.0
3333
github.com/mstoykov/k6-taskqueue-lib v0.1.3

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE
119119
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
120120
github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
121121
github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
122-
github.com/mccutchen/go-httpbin v1.1.2-0.20190116014521-c5cb2f4802fa h1:lx8ZnNPwjkXSzOROz0cg69RlErRXs+L3eDkggASWKLo=
123-
github.com/mccutchen/go-httpbin v1.1.2-0.20190116014521-c5cb2f4802fa/go.mod h1:fhpOYavp5g2K74XDl/ao2y4KvhqVtKlkg1e+0UaQv7I=
122+
github.com/mccutchen/go-httpbin/v2 v2.18.1 h1:Zsi6gLCUS/kqZf36BicIbZsO8o0VyO2nSaOv/J8XKlQ=
123+
github.com/mccutchen/go-httpbin/v2 v2.18.1/go.mod h1:GBy5I7XwZ4ZLhT3hcq39I4ikwN9x4QUt6EAxNiR8Jus=
124124
github.com/mstoykov/atlas v0.0.0-20220811071828-388f114305dd h1:AC3N94irbx2kWGA8f/2Ks7EQl2LxKIRQYuT9IJDwgiI=
125125
github.com/mstoykov/atlas v0.0.0-20220811071828-388f114305dd/go.mod h1:9vRHVuLCjoFfE3GT06X0spdOAO+Zzo4AMjdIwUHBvAk=
126126
github.com/mstoykov/envconfig v1.5.0 h1:E2FgWf73BQt0ddgn7aoITkQHmgwAcHup1s//MsS5/f8=

internal/js/modules/k6/browser/tests/ws/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"github.com/mailru/easyjson"
2020
"github.com/mailru/easyjson/jlexer"
2121
"github.com/mailru/easyjson/jwriter"
22-
"github.com/mccutchen/go-httpbin/httpbin"
22+
"github.com/mccutchen/go-httpbin/v2/httpbin"
2323
"github.com/stretchr/testify/require"
2424
"golang.org/x/net/http2"
2525
)

internal/lib/testutils/httpmultibin/httpmultibin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"github.com/andybalholm/brotli"
2121
"github.com/gorilla/websocket"
2222
"github.com/klauspost/compress/zstd"
23-
"github.com/mccutchen/go-httpbin/httpbin"
23+
"github.com/mccutchen/go-httpbin/v2/httpbin"
2424
"github.com/stretchr/testify/require"
2525
"golang.org/x/net/http2"
2626
"google.golang.org/grpc"

js/modules/k6/http/request_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030

3131
"github.com/andybalholm/brotli"
3232
"github.com/klauspost/compress/zstd"
33-
"github.com/mccutchen/go-httpbin/httpbin"
33+
"github.com/mccutchen/go-httpbin/v2/httpbin"
3434
"github.com/sirupsen/logrus"
3535
"github.com/stretchr/testify/assert"
3636
"github.com/stretchr/testify/require"
@@ -274,7 +274,7 @@ func TestRequest(t *testing.T) {
274274
http.Redirect(w, r, sr("HTTPBIN_URL/post"), http.StatusPermanentRedirect)
275275
}))
276276
_, err := rt.RunString(sr(`
277-
var res = http.post("HTTPBIN_URL/post-redirect", "pesho", {redirects: 1});
277+
var res = http.post("HTTPBIN_URL/post-redirect", "pesho", {redirects: 1, headers: {"Content-Type": "text"}});
278278
279279
if (res.status != 200) { throw new Error("wrong status: " + res.status) }
280280
if (res.url != "HTTPBIN_URL/post") { throw new Error("incorrect URL: " + res.url) }
@@ -1076,11 +1076,11 @@ func TestRequest(t *testing.T) {
10761076
t.Run("name/template", func(t *testing.T) {
10771077
_, err := rt.RunString("http.get(http.url`" + sr(`HTTPBIN_URL/anything/${1+1}`) + "`);")
10781078
assert.NoError(t, err)
1079-
// There's no /anything endpoint in the go-httpbin library we're using, hence the 404,
1079+
// There's no /anythingwrong endpoint in the go-httpbin library we're using, hence the 404,
10801080
// but it doesn't matter for this test.
10811081
//
10821082
// Setting name will overwrite both name and url tags
1083-
assertRequestMetricsEmitted(t, metrics.GetBufferedSamples(samples), "GET", sr("HTTPBIN_URL/anything/${}"), 404, "")
1083+
assertRequestMetricsEmitted(t, metrics.GetBufferedSamples(samples), "GET", sr("HTTPBIN_URL/anythingwrong/${}"), 404, "")
10841084
})
10851085

10861086
t.Run("object", func(t *testing.T) {

lib/netext/httpext/request_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"testing"
1515
"time"
1616

17-
"github.com/mccutchen/go-httpbin/httpbin"
17+
"github.com/mccutchen/go-httpbin/v2/httpbin"
1818
"github.com/sirupsen/logrus"
1919
"github.com/stretchr/testify/assert"
2020
"github.com/stretchr/testify/require"

lib/netext/httpext/tracer_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"testing"
1717
"time"
1818

19-
"github.com/mccutchen/go-httpbin/httpbin"
19+
"github.com/mccutchen/go-httpbin/v2/httpbin"
2020
"github.com/stretchr/testify/assert"
2121
"github.com/stretchr/testify/require"
2222

vendor/github.com/mccutchen/go-httpbin/httpbin/assets/assets.go

Lines changed: 0 additions & 463 deletions
This file was deleted.

0 commit comments

Comments
 (0)