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=cbc8968c73b9e969ebfb47a46830b4488606bfd6;hb=4f2dd6da42af253e7545d7cba5d9e5cb2895eb34;hpb=05fb821e72072bde52f383bdc5a988da67f66d0c

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 cbc8968..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,20 +30,20 @@ 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)
+		setMethod(POST)
 		addHttpRequestPart("fetch", "true")
 		verifyRedirect("rescue.html") {
 			verify(soneRescuer, never()).setEdition(anyLong())
@@ -55,7 +53,7 @@ class RescuePageTest : WebPageTest() {
 
 	@Test
 	fun `post request with fetch and valid edition sets edition and starts next fetch`() {
-		request("", POST)
+		setMethod(POST)
 		addHttpRequestPart("fetch", "true")
 		addHttpRequestPart("edition", "123")
 		verifyRedirect("rescue.html") {