From 0081171aa6fafd38aa5d93921cf1d263e4346d6e Mon Sep 17 00:00:00 2001 From: "Gerasimos (Makis) Maropoulos" Date: Fri, 19 Feb 2021 09:06:22 +0200 Subject: [PATCH] minor --- _examples/file-server/embedding-files-into-app/main_test.go | 2 +- .../file-server/embedding-gzipped-files-into-app/main_test.go | 1 + _examples/logging/json-logger/main_test.go | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/_examples/file-server/embedding-files-into-app/main_test.go b/_examples/file-server/embedding-files-into-app/main_test.go index 71cf7a31..2a54a39c 100644 --- a/_examples/file-server/embedding-files-into-app/main_test.go +++ b/_examples/file-server/embedding-files-into-app/main_test.go @@ -90,7 +90,7 @@ func TestEmbeddingFilesIntoApp(t *testing.T) { e.GET(url).Expect(). Status(httptest.StatusOK). - ContentType(u.contentType(), app.ConfigurationReadOnly().GetCharset()). + ContentType(u.contentType()). Body().Equal(contents) } } diff --git a/_examples/file-server/embedding-gzipped-files-into-app/main_test.go b/_examples/file-server/embedding-gzipped-files-into-app/main_test.go index 024fea50..d7cf8da5 100644 --- a/_examples/file-server/embedding-gzipped-files-into-app/main_test.go +++ b/_examples/file-server/embedding-gzipped-files-into-app/main_test.go @@ -56,6 +56,7 @@ func (r resource) loadFromBase(dir string) string { if runtime.GOOS != "windows" { result = strings.ReplaceAll(result, "\n", "\r\n") + result = strings.ReplaceAll(result, "\r\r", "") } return result } diff --git a/_examples/logging/json-logger/main_test.go b/_examples/logging/json-logger/main_test.go index cc1ea72f..7997fcf9 100644 --- a/_examples/logging/json-logger/main_test.go +++ b/_examples/logging/json-logger/main_test.go @@ -30,7 +30,7 @@ func TestJSONLogger(t *testing.T) { app.Get("/ping", ping) - const expectedLogStr = `{"level":"debug","message":"Request path: /ping","fields":{"request_id":null},"stacktrace":[{"function":"json-logger/ping","source":"C:/mygopath/src/github.com/kataras/iris/_examples/logging/json-logger/main.go:78"}]}` + const expectedLogStr = `{"level":"debug","message":"Request path: /ping","fields":{"request_id":null},"stacktrace":[{"function":"json-logger/ping","source":"/home/runner/work/iris/iris/_examples/logging/json-logger/main.go:78"}]}` // gh actions-specific. e := httptest.New(t, app, httptest.LogLevel("debug")) wg := new(sync.WaitGroup) wg.Add(iters)