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

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/ViewPostPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/ViewPostPageTest.kt
index bbc03bf..88ca34a 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/ViewPostPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/ViewPostPageTest.kt
@@ -4,7 +4,6 @@ import net.pterodactylus.sone.data.Post
 import net.pterodactylus.sone.data.Profile
 import net.pterodactylus.sone.test.mock
 import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.ViewPostPage
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.hamcrest.Matchers.nullValue
@@ -27,26 +26,29 @@ class ViewPostPageTest : WebPageTest() {
 
 	@Test
 	fun `get request without parameters stores null in template context`() {
-		page.handleRequest(freenetRequest, templateContext)
-		assertThat(templateContext["post"], nullValue())
-		assertThat(templateContext["raw"] as? Boolean, equalTo(false))
+		verifyNoRedirect {
+			assertThat(templateContext["post"], nullValue())
+			assertThat(templateContext["raw"] as? Boolean, equalTo(false))
+		}
 	}
 
 	@Test
 	fun `get request with invalid post id stores null in template context`() {
 		addHttpRequestParameter("post", "invalid-post-id")
-		page.handleRequest(freenetRequest, templateContext)
-		assertThat(templateContext["post"], nullValue())
-		assertThat(templateContext["raw"] as? Boolean, equalTo(false))
+		verifyNoRedirect {
+			assertThat(templateContext["post"], nullValue())
+			assertThat(templateContext["raw"] as? Boolean, equalTo(false))
+		}
 	}
 
 	@Test
 	fun `get request with valid post id stores post in template context`() {
 		addPost("post-id", post)
 		addHttpRequestParameter("post", "post-id")
-		page.handleRequest(freenetRequest, templateContext)
-		assertThat(templateContext["post"], equalTo<Any>(post))
-		assertThat(templateContext["raw"] as? Boolean, equalTo(false))
+		verifyNoRedirect {
+			assertThat(templateContext["post"], equalTo<Any>(post))
+			assertThat(templateContext["raw"] as? Boolean, equalTo(false))
+		}
 	}
 
 	@Test
@@ -54,9 +56,10 @@ class ViewPostPageTest : WebPageTest() {
 		addPost("post-id", post)
 		addHttpRequestParameter("post", "post-id")
 		addHttpRequestParameter("raw", "true")
-		page.handleRequest(freenetRequest, templateContext)
-		assertThat(templateContext["post"], equalTo<Any>(post))
-		assertThat(templateContext["raw"] as? Boolean, equalTo(true))
+		verifyNoRedirect {
+			assertThat(templateContext["post"], equalTo<Any>(post))
+			assertThat(templateContext["raw"] as? Boolean, equalTo(true))
+		}
 	}
 
 	@Test