X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FDeleteAlbumPageTest.kt;h=c6184003fbdc05d6a0c8a96d259830dd8b03bd86;hb=5ba707d40f9d2a20094aaabc21647aeec1feed46;hp=3efd109065fa37279b826f02f8924e6e2becd389;hpb=de7568a82eb4150bf6d2b0553841b7b69f84c968;p=Sone.git

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPageTest.kt
index 3efd109..c618400 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPageTest.kt
@@ -4,9 +4,6 @@ import net.pterodactylus.sone.data.Album
 import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.test.mock
 import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.WebPageTest
-import net.pterodactylus.sone.web.pages.DeleteAlbumPage
-import net.pterodactylus.util.web.Method.GET
 import net.pterodactylus.util.web.Method.POST
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
@@ -52,14 +49,12 @@ class DeleteAlbumPageTest: WebPageTest() {
 
 	@Test
 	fun `get request with invalid album ID results in redirect to invalid page`() {
-		request("", GET)
 		whenever(core.getAlbum(anyString())).thenReturn(null)
 		verifyRedirect("invalid.html")
 	}
 
 	@Test
 	fun `get request with valid album ID sets album in template context`() {
-		request("", GET)
 		val album = mock<Album>()
 		addAlbum("album-id", album)
 		addHttpRequestParameter("album", "album-id")
@@ -69,33 +64,33 @@ class DeleteAlbumPageTest: WebPageTest() {
 
 	@Test
 	fun `post request redirects to invalid page if album is invalid`() {
-		request("", POST)
+		setMethod(POST)
 		verifyRedirect("invalid.html")
 	}
 
 	@Test
 	fun `post request redirects to no permissions page if album is not local`() {
-		request("", POST)
+		setMethod(POST)
 		whenever(sone.isLocal).thenReturn(false)
 		addAlbum("album-id", album)
-		addHttpRequestParameter("album", "album-id")
+		addHttpRequestPart("album", "album-id")
 		verifyRedirect("noPermission.html")
 	}
 
 	@Test
 	fun `post request with abort delete parameter set redirects to album browser`() {
-		request("", POST)
+		setMethod(POST)
 		addAlbum("album-id", album)
-		addHttpRequestParameter("album", "album-id")
-		addHttpRequestParameter("abortDelete", "true")
+		addHttpRequestPart("album", "album-id")
+		addHttpRequestPart("abortDelete", "true")
 		verifyRedirect("imageBrowser.html?album=album-id")
 	}
 
 	@Test
 	fun `album is deleted and page redirects to sone if parent album is root album`() {
-		request("", POST)
+		setMethod(POST)
 		addAlbum("album-id", album)
-		addHttpRequestParameter("album", "album-id")
+		addHttpRequestPart("album", "album-id")
 		verifyRedirect("imageBrowser.html?sone=sone-id") {
 			verify(core).deleteAlbum(album)
 		}
@@ -103,11 +98,11 @@ class DeleteAlbumPageTest: WebPageTest() {
 
 	@Test
 	fun `album is deleted and page redirects to album if parent album is not root album`() {
-		request("", POST)
+		setMethod(POST)
 		whenever(parentAlbum.isRoot).thenReturn(false)
 		whenever(sone.rootAlbum).thenReturn(mock<Album>())
 		addAlbum("album-id", album)
-		addHttpRequestParameter("album", "album-id")
+		addHttpRequestPart("album", "album-id")
 		verifyRedirect("imageBrowser.html?album=parent-id") {
 			verify(core).deleteAlbum(album)
 		}