Use verifyNoRedirect instead of calling the request handler directly

[Sone.git] / src / test / kotlin / net / pterodactylus / sone / web / pages / RescuePageTest.kt

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/RescuePageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/RescuePageTest.kt
index db6903e..303a23c 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/RescuePageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/RescuePageTest.kt
@@ -3,8 +3,6 @@ package net.pterodactylus.sone.web.pages
 import net.pterodactylus.sone.core.SoneRescuer
 import net.pterodactylus.sone.test.mock
 import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.RescuePage
-import net.pterodactylus.util.web.Method.GET
 import net.pterodactylus.util.web.Method.POST
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
@@ -32,21 +30,21 @@ class RescuePageTest : WebPageTest() {
 
        @Test
        fun `get request sets rescuer in template context`() {
-               request("", GET)
-               page.handleRequest(freenetRequest, templateContext)
-               assertThat(templateContext["soneRescuer"], equalTo<Any>(soneRescuer))
+               verifyNoRedirect {
+                       assertThat(templateContext["soneRescuer"], equalTo<Any>(soneRescuer))
+               }
        }
 
        @Test
        fun `post request redirects to rescue page`() {
-               request("", POST)
+               setMethod(POST)
                verifyRedirect("rescue.html")
        }
 
        @Test
        fun `post request with fetch and invalid edition starts next fetch`() {
-               request("", POST)
-               addHttpRequestParameter("fetch", "true")
+               setMethod(POST)
+               addHttpRequestPart("fetch", "true")
                verifyRedirect("rescue.html") {
                        verify(soneRescuer, never()).setEdition(anyLong())
                        verify(soneRescuer).startNextFetch()
@@ -55,9 +53,9 @@ class RescuePageTest : WebPageTest() {
 
        @Test
        fun `post request with fetch and valid edition sets edition and starts next fetch`() {
-               request("", POST)
-               addHttpRequestParameter("fetch", "true")
-               addHttpRequestParameter("edition", "123")
+               setMethod(POST)
+               addHttpRequestPart("fetch", "true")
+               addHttpRequestPart("edition", "123")
                verifyRedirect("rescue.html") {
                        verify(soneRescuer).setEdition(123L)
                        verify(soneRescuer).startNextFetch()