X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FRescuePageTest.kt;h=303a23cbe3c54d7edc0e8f3dc9ba6c6e69907fb7;hp=db6903eb427b1c133a2c6aa26d068d5c56b41bd4;hb=4f2dd6da42af253e7545d7cba5d9e5cb2895eb34;hpb=de7568a82eb4150bf6d2b0553841b7b69f84c968

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
--- 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()