Skip to content

Commit 7d88c51

Browse files
committed
update some info, fix test on windows
1 parent a86e390 commit 7d88c51

4 files changed

Lines changed: 22 additions & 5 deletions

File tree

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: go
22
go:
3-
- '1.11'
3+
# - '1.11' gorilla/websocket >= go 1.12
44
- '1.12'
55
- '1.13'
66
- '1.14'

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.11
44

55
require (
66
github.com/gookit/color v1.2.7
7-
github.com/gookit/goutil v0.2.14
7+
github.com/gookit/goutil v0.2.16
88
github.com/gorilla/websocket v1.4.2
99
github.com/stretchr/testify v1.3.0
1010
)

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ github.com/gookit/goutil v0.2.3 h1:CJWRcCYzJJXIocHxLeeIn4U09ZLlNTqJtzc9QRF9g/o=
1717
github.com/gookit/goutil v0.2.3/go.mod h1:8emMcACka2rFot/L9ZO7r3zjWiitzIhB/CfWXUCW75w=
1818
github.com/gookit/goutil v0.2.14 h1:73t/TvV9FzwWMZpOrOzqJxniBxd63dujnIdbBX+BS1Q=
1919
github.com/gookit/goutil v0.2.14/go.mod h1:3rjyvZP1PJiyZgC4eN0xu0bdLqeBbF5+pM4XlrimmtA=
20+
github.com/gookit/goutil v0.2.16 h1:dp+4RR6p+c3IL0K51uGT11AwTdytXufTp+A48vbE7K4=
21+
github.com/gookit/goutil v0.2.16/go.mod h1:3rjyvZP1PJiyZgC4eN0xu0bdLqeBbF5+pM4XlrimmtA=
2022
github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
2123
github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
2224
github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=

router_test.go

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"strings"
88
"testing"
99

10+
"github.com/gookit/goutil/envutil"
1011
"github.com/stretchr/testify/assert"
1112
)
1213

@@ -600,11 +601,21 @@ func TestAccessStaticAssets(t *testing.T) {
600601
r := New()
601602
is := assert.New(t)
602603

604+
checkJsAssetHeader := func(contentType string) {
605+
if envutil.IsWin() {
606+
is.Equal("text/plain; charset=utf-8", contentType)
607+
} else {
608+
is.Equal("application/javascript", contentType)
609+
}
610+
}
611+
603612
// one file
604613
r.StaticFile("/site.js", "testdata/site.js")
605614
w := mockRequest(r, "GET", "/site.js", nil)
606615
is.Equal(200, w.Code)
607-
is.Equal("application/javascript", w.Header().Get("Content-Type"))
616+
617+
checkJsAssetHeader(w.Header().Get("Content-Type"))
618+
608619
is.Contains(w.Body.String(), "console.log")
609620
// try again
610621
w = mockRequest(r, "GET", "/site.js?t=33455", nil)
@@ -618,7 +629,9 @@ func TestAccessStaticAssets(t *testing.T) {
618629
is.Contains(w.Body.String(), "max-width")
619630
w = mockRequest(r, "GET", "/static/site.js", nil)
620631
is.Equal(200, w.Code)
621-
is.Equal("application/javascript", w.Header().Get("Content-Type"))
632+
633+
checkJsAssetHeader(w.Header().Get("Content-Type"))
634+
622635
is.Contains(w.Body.String(), "console.log")
623636
w = mockRequest(r, "GET", "/static/site.md", nil)
624637
is.Equal(200, w.Code)
@@ -628,7 +641,9 @@ func TestAccessStaticAssets(t *testing.T) {
628641
r.StaticFiles("/assets", "testdata", "css|js")
629642
w = mockRequest(r, "GET", "/assets/site.js", nil)
630643
is.Equal(200, w.Code)
631-
is.Equal("application/javascript", w.Header().Get("Content-Type"))
644+
645+
checkJsAssetHeader(w.Header().Get("Content-Type"))
646+
632647
is.Contains(w.Body.String(), "console.log")
633648
w = mockRequest(r, "GET", "/assets/site.md", nil)
634649
is.Equal(404, w.Code)

0 commit comments

Comments
 (0)