Skip to content

Commit cdccee7

Browse files
committed
fix tests
1 parent 1fdac6c commit cdccee7

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

Diff for: redirect.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ func (r *Redirect) Route(name string, config ...RedirectConfig) error {
146146
_, _ = messageText.WriteString("k:")
147147
}
148148

149-
_, _ = messageText.WriteString("k:old_input_data_" + k + ":" + v)
149+
_, _ = messageText.WriteString("old_input_data_" + k + ":" + v)
150150
if len(r.oldInput) != i {
151151
_, _ = messageText.WriteString(",")
152152
}

Diff for: redirect_test.go

+10-12
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,11 @@ func Test_Redirect_Route_WithFlashMessages(t *testing.T) {
168168
utils.AssertEqual(t, 302, c.Response().StatusCode())
169169
utils.AssertEqual(t, "/user", string(c.Response().Header.Peek(HeaderLocation)))
170170

171-
equal := string(c.Response().Header.Peek(HeaderSetCookie)) == "fiber_flash=k:success:1,k:message:test; path=/; SameSite=Lax" || string(c.Response().Header.Peek(HeaderSetCookie)) == "fiber_flash=k:message:test,k:success:1; path=/; SameSite=Lax"
171+
equal := string(c.Response().Header.Peek(HeaderSetCookie)) == "fiber_flash=success:1,k:message:test; path=/; SameSite=Lax" || string(c.Response().Header.Peek(HeaderSetCookie)) == "fiber_flash=message:test,k:success:1; path=/; SameSite=Lax"
172172
utils.AssertEqual(t, true, equal)
173173

174174
c.Redirect().setFlash()
175-
utils.AssertEqual(t, "fiber_flash=; expires=Tue, 10 Nov 2009 23:00:00 GMT; fiber_flash_old_input=; expires=Tue, 10 Nov 2009 23:00:00 GMT", string(c.Response().Header.Peek(HeaderSetCookie)))
175+
utils.AssertEqual(t, "fiber_flash=; expires=Tue, 10 Nov 2009 23:00:00 GMT", string(c.Response().Header.Peek(HeaderSetCookie)))
176176
}
177177

178178
// go test -run Test_Redirect_Route_WithOldInput
@@ -192,16 +192,15 @@ func Test_Redirect_Route_WithOldInput(t *testing.T) {
192192
utils.AssertEqual(t, 302, c.Response().StatusCode())
193193
utils.AssertEqual(t, "/user", string(c.Response().Header.Peek(HeaderLocation)))
194194

195-
utils.AssertEqual(t, true, strings.Contains(string(c.Response().Header.Peek(HeaderSetCookie)), "fiber_flash=k:"))
196-
utils.AssertEqual(t, true, strings.Contains(string(c.Response().Header.Peek(HeaderSetCookie)), "k:success:1"))
197-
utils.AssertEqual(t, true, strings.Contains(string(c.Response().Header.Peek(HeaderSetCookie)), "k:message:test"))
195+
utils.AssertEqual(t, true, strings.Contains(string(c.Response().Header.Peek(HeaderSetCookie)), "fiber_flash="))
196+
utils.AssertEqual(t, true, strings.Contains(string(c.Response().Header.Peek(HeaderSetCookie)), "success:1"))
197+
utils.AssertEqual(t, true, strings.Contains(string(c.Response().Header.Peek(HeaderSetCookie)), "message:test"))
198198

199-
utils.AssertEqual(t, true, strings.Contains(string(c.Response().Header.Peek(HeaderSetCookie)), "fiber_flash_old_input=k:"))
200-
utils.AssertEqual(t, true, strings.Contains(string(c.Response().Header.Peek(HeaderSetCookie)), "k:id:1"))
201-
utils.AssertEqual(t, true, strings.Contains(string(c.Response().Header.Peek(HeaderSetCookie)), "k:name:tom"))
199+
utils.AssertEqual(t, true, strings.Contains(string(c.Response().Header.Peek(HeaderSetCookie)), "old_input_data_id:1"))
200+
utils.AssertEqual(t, true, strings.Contains(string(c.Response().Header.Peek(HeaderSetCookie)), "old_input_data_name:tom"))
202201

203202
c.Redirect().setFlash()
204-
utils.AssertEqual(t, "fiber_flash=; expires=Tue, 10 Nov 2009 23:00:00 GMT; fiber_flash_old_input=; expires=Tue, 10 Nov 2009 23:00:00 GMT", string(c.Response().Header.Peek(HeaderSetCookie)))
203+
utils.AssertEqual(t, "fiber_flash=; expires=Tue, 10 Nov 2009 23:00:00 GMT", string(c.Response().Header.Peek(HeaderSetCookie)))
205204
}
206205

207206
// go test -run Test_Redirect_setFlash
@@ -215,12 +214,11 @@ func Test_Redirect_setFlash(t *testing.T) {
215214

216215
c := app.NewCtx(&fasthttp.RequestCtx{}).(*DefaultCtx)
217216

218-
c.Request().Header.Set(HeaderCookie, "fiber_flash_old_input=k:name:tom,k:id:1")
219-
c.Request().Header.Set(HeaderCookie, "fiber_flash=k:success:1,k:message:test")
217+
c.Request().Header.Set(HeaderCookie, "fiber_flash=success:1,k:message:test,k:old_input_data_name:tom,k:old_input_data_id:1")
220218

221219
c.Redirect().setFlash()
222220

223-
utils.AssertEqual(t, "fiber_flash=; expires=Tue, 10 Nov 2009 23:00:00 GMT; fiber_flash_old_input=; expires=Tue, 10 Nov 2009 23:00:00 GMT", string(c.Response().Header.Peek(HeaderSetCookie)))
221+
utils.AssertEqual(t, "fiber_flash=; expires=Tue, 10 Nov 2009 23:00:00 GMT", string(c.Response().Header.Peek(HeaderSetCookie)))
224222

225223
utils.AssertEqual(t, "1", c.Redirect().Message("success"))
226224
utils.AssertEqual(t, "test", c.Redirect().Message("message"))

0 commit comments

Comments
 (0)