X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FDeleteReplyPageTest.kt;h=1b202e4821f117266c3acb1d2983b507c1c12790;hb=8a6c37232a2b4973e31b4c0ea397d867c7e02c7a;hp=c2649d8afaf8c739f1093133d1e9d9aa541a099c;hpb=fa90abc436a8f44118b601843b7f5a801c29ce79;p=Sone.git diff --git a/src/test/kotlin/net/pterodactylus/sone/web/DeleteReplyPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/DeleteReplyPageTest.kt index c2649d8..1b202e4 100644 --- a/src/test/kotlin/net/pterodactylus/sone/web/DeleteReplyPageTest.kt +++ b/src/test/kotlin/net/pterodactylus/sone/web/DeleteReplyPageTest.kt @@ -1,19 +1,11 @@ package net.pterodactylus.sone.web -import net.pterodactylus.sone.web.WebTestUtils.redirectsTo -import net.pterodactylus.util.web.Method.POST -import org.mockito.ArgumentMatchers.anyInt -import org.mockito.ArgumentMatchers.eq -import org.mockito.Mockito.`when` - import net.pterodactylus.sone.data.PostReply - -import com.google.common.base.Optional import net.pterodactylus.sone.data.Sone import net.pterodactylus.sone.test.mock import net.pterodactylus.sone.test.whenever import net.pterodactylus.util.web.Method.GET -import org.hamcrest.MatcherAssert +import net.pterodactylus.util.web.Method.POST import org.hamcrest.MatcherAssert.assertThat import org.hamcrest.Matchers.equalTo import org.junit.Before @@ -31,15 +23,17 @@ class DeleteReplyPageTest : WebPageTest() { private val sone = mock() private val reply = mock() + override fun getPage() = page + @Before fun setupReply() { whenever(sone.isLocal).thenReturn(true) whenever(reply.sone).thenReturn(sone) } - + @Test fun `get request sets reply ID and return page in template context`() { - request("", GET) + request("", GET) addHttpRequestParameter("reply", "reply-id") addHttpRequestParameter("returnPage", "return.html") page.handleRequest(freenetRequest, templateContext) @@ -49,7 +43,7 @@ class DeleteReplyPageTest : WebPageTest() { @Test fun `post request without any action sets reply ID and return page in template context`() { - request("", POST) + request("", POST) addPostReply("reply-id", reply) addHttpRequestParameter("reply", "reply-id") addHttpRequestParameter("returnPage", "return.html") @@ -61,46 +55,38 @@ class DeleteReplyPageTest : WebPageTest() { @Test fun `trying to delete a reply with an invalid ID results in no permission page`() { request("", POST) - expectedException.expect(redirectsTo("noPermission.html")) - page.processTemplate(freenetRequest, templateContext) + verifyRedirect("noPermission.html") } @Test fun `trying to delete a reply from a non-local sone results in no permission page`() { - request("", POST) + request("", POST) addHttpRequestParameter("reply", "reply-id") whenever(sone.isLocal).thenReturn(false) addPostReply("reply-id", reply) - expectedException.expect(redirectsTo("noPermission.html")) - page.processTemplate(freenetRequest, templateContext) + verifyRedirect("noPermission.html") } @Test fun `confirming deletion of reply deletes the reply and redirects to return page`() { - request("", POST) + request("", POST) addPostReply("reply-id", reply) addHttpRequestParameter("reply", "reply-id") addHttpRequestParameter("returnPage", "return.html") addHttpRequestParameter("confirmDelete", "true") - expectedException.expect(redirectsTo("return.html")) - try { - page.processTemplate(freenetRequest, templateContext) - } finally { + verifyRedirect("return.html") { verify(core).deleteReply(reply) } } - + @Test fun `aborting deletion of reply redirects to return page`() { - request("", POST) + request("", POST) addPostReply("reply-id", reply) addHttpRequestParameter("reply", "reply-id") addHttpRequestParameter("returnPage", "return.html") addHttpRequestParameter("abortDelete", "true") - expectedException.expect(redirectsTo("return.html")) - try { - page.processTemplate(freenetRequest, templateContext) - } finally { + verifyRedirect("return.html") { verify(core, never()).deleteReply(reply) } }