X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FCreateReplyPageTest.kt;fp=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FCreateReplyPageTest.kt;h=01f33615d4c53cbb10254b6f5d4977d260229c8e;hp=052620a4a8f7ba08bcd95343dff01665700bb261;hb=05fb821e72072bde52f383bdc5a988da67f66d0c;hpb=f0c1becb30b360bf414ca9cbdd5df61490a9393c diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/CreateReplyPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/CreateReplyPageTest.kt index 052620a..01f3361 100644 --- a/src/test/kotlin/net/pterodactylus/sone/web/pages/CreateReplyPageTest.kt +++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/CreateReplyPageTest.kt @@ -32,9 +32,9 @@ class CreateReplyPageTest: WebPageTest() { @Test fun `reply is created correctly`() { request("", POST) - addHttpRequestParameter("returnPage", "return.html") - addHttpRequestParameter("post", "post-id") - addHttpRequestParameter("text", "new text") + addHttpRequestPart("returnPage", "return.html") + addHttpRequestPart("post", "post-id") + addHttpRequestPart("text", "new text") val post = mock().apply { addPost("post-id", this) } verifyRedirect("return.html") { verify(core).createReply(currentSone, post, "new text") @@ -44,9 +44,9 @@ class CreateReplyPageTest: WebPageTest() { @Test fun `reply is filtered`() { request("", POST) - addHttpRequestParameter("returnPage", "return.html") - addHttpRequestParameter("post", "post-id") - addHttpRequestParameter("text", "new http://localhost:12345/KSK@foo text") + addHttpRequestPart("returnPage", "return.html") + addHttpRequestPart("post", "post-id") + addHttpRequestPart("text", "new http://localhost:12345/KSK@foo text") addHttpRequestHeader("Host", "localhost:12345") val post = mock().apply { addPost("post-id", this) } verifyRedirect("return.html") { @@ -57,10 +57,10 @@ class CreateReplyPageTest: WebPageTest() { @Test fun `reply is created with correct sender`() { request("", POST) - addHttpRequestParameter("returnPage", "return.html") - addHttpRequestParameter("post", "post-id") - addHttpRequestParameter("text", "new text") - addHttpRequestParameter("sender", "sender-id") + addHttpRequestPart("returnPage", "return.html") + addHttpRequestPart("post", "post-id") + addHttpRequestPart("text", "new text") + addHttpRequestPart("sender", "sender-id") val sender = mock().apply { addLocalSone("sender-id", this) } val post = mock().apply { addPost("post-id", this) } verifyRedirect("return.html") { @@ -71,9 +71,9 @@ class CreateReplyPageTest: WebPageTest() { @Test fun `empty text sets parameters in template contexty`() { request("", POST) - addHttpRequestParameter("returnPage", "return.html") - addHttpRequestParameter("post", "post-id") - addHttpRequestParameter("text", " ") + addHttpRequestPart("returnPage", "return.html") + addHttpRequestPart("post", "post-id") + addHttpRequestPart("text", " ") page.processTemplate(freenetRequest, templateContext) assertThat(templateContext["errorTextEmpty"], equalTo(true)) assertThat(templateContext["returnPage"], equalTo("return.html")) @@ -84,21 +84,10 @@ class CreateReplyPageTest: WebPageTest() { @Test fun `user is redirected to no permissions page if post does not exist`() { request("", POST) - addHttpRequestParameter("returnPage", "return.html") - addHttpRequestParameter("post", "post-id") - addHttpRequestParameter("text", "new text") + addHttpRequestPart("returnPage", "return.html") + addHttpRequestPart("post", "post-id") + addHttpRequestPart("text", "new text") verifyRedirect("noPermission.html") } - @Test - fun `get request stores parameters in template context`() { - addHttpRequestParameter("returnPage", "return.html") - addHttpRequestParameter("post", "post-id") - addHttpRequestParameter("text", "new text") - page.processTemplate(freenetRequest, templateContext) - assertThat(templateContext["returnPage"], equalTo("return.html")) - assertThat(templateContext["postId"], equalTo("post-id")) - assertThat(templateContext["text"], equalTo("new text")) - } - }