X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FEditImagePageTest.kt;h=e763a75b4b9d0540315245ee1796ec0d6455aca1;hp=ac710d58bda9b362b1912c13cf33ccb922d61d50;hb=6b29b49714912ff5e3e410d2484699cdf8041b90;hpb=65e3c95fe9d44b5654b2ac76fc09b9aaac50ca9c

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/EditImagePageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/EditImagePageTest.kt
index ac710d5..e763a75 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/EditImagePageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/EditImagePageTest.kt
@@ -9,7 +9,6 @@ import net.pterodactylus.sone.test.doThrow
 import net.pterodactylus.sone.test.mock
 import net.pterodactylus.sone.test.mockBuilder
 import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.util.web.Method.GET
 import net.pterodactylus.util.web.Method.POST
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
@@ -60,19 +59,18 @@ class EditImagePageTest : WebPageTest() {
 
 	@Test
 	fun `get request does not redirect`() {
-		request("", GET)
 		page.processTemplate(freenetRequest, templateContext)
 	}
 
 	@Test
 	fun `post request with invalid image redirects to invalid page`() {
-		request("", POST)
+		setMethod(POST)
 		verifyRedirect("invalid.html")
 	}
 
 	@Test
 	fun `post request with valid image from non-local sone redirects to no permission page`() {
-		request("", POST)
+		setMethod(POST)
 		whenever(sone.isLocal).thenReturn(false)
 		addImage("image-id", image)
 		addHttpRequestPart("image", "image-id")
@@ -81,7 +79,7 @@ class EditImagePageTest : WebPageTest() {
 
 	@Test
 	fun `post request with valid image and move left requested moves image left and redirects to return page`() {
-		request("", POST)
+		setMethod(POST)
 		addImage("image-id", image)
 		addHttpRequestPart("image", "image-id")
 		addHttpRequestPart("returnPage", "return.html")
@@ -94,7 +92,7 @@ class EditImagePageTest : WebPageTest() {
 
 	@Test
 	fun `post request with valid image and move right requested moves image right and redirects to return page`() {
-		request("", POST)
+		setMethod(POST)
 		addImage("image-id", image)
 		addHttpRequestPart("image", "image-id")
 		addHttpRequestPart("returnPage", "return.html")
@@ -107,7 +105,7 @@ class EditImagePageTest : WebPageTest() {
 
 	@Test
 	fun `post request with valid image but only whitespace in the title redirects to empty image title page`() {
-		request("", POST)
+		setMethod(POST)
 		addImage("image-id", image)
 		addHttpRequestPart("image", "image-id")
 		addHttpRequestPart("returnPage", "return.html")
@@ -120,7 +118,7 @@ class EditImagePageTest : WebPageTest() {
 
 	@Test
 	fun `post request with valid image title and description modifies image and redirects to reutrn page`() {
-		request("", POST)
+		setMethod(POST)
 		addImage("image-id", image)
 		addHttpRequestPart("image", "image-id")
 		addHttpRequestPart("returnPage", "return.html")
@@ -136,7 +134,7 @@ class EditImagePageTest : WebPageTest() {
 
 	@Test
 	fun `post request with image title and description modifies image with filtered description and redirects to return page`() {
-		request("", POST)
+		setMethod(POST)
 		addImage("image-id", image)
 		addHttpRequestPart("image", "image-id")
 		addHttpRequestPart("returnPage", "return.html")