X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FSearchPageTest.kt;h=106b35076e3cb29303efe20d39e6ae94946f2913;hp=87902834cdce72e3126837bf877bf3aac948a0d0;hb=4f2dd6da42af253e7545d7cba5d9e5cb2895eb34;hpb=5ba707d40f9d2a20094aaabc21647aeec1feed46

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/SearchPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/SearchPageTest.kt
index 8790283..106b350 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/SearchPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/SearchPageTest.kt
@@ -140,8 +140,9 @@ class SearchPageTest : WebPageTest() {
 		addSone("sone-with-match", soneWithMatch)
 		addSone("sone-without-match", soneWithoutMatch)
 		addHttpRequestParameter("query", "word")
-		page.handleRequest(freenetRequest, templateContext)
-		assertThat(this["postHits"], contains<Post>(postWithMatch))
+		verifyNoRedirect {
+			assertThat(this["postHits"], contains<Post>(postWithMatch))
+		}
 	}
 
 	@Test
@@ -157,8 +158,9 @@ class SearchPageTest : WebPageTest() {
 		addSone("sone-with-match", soneWithMatch)
 		addSone("sone-without-match", soneWithoutMatch)
 		addHttpRequestParameter("query", "word")
-		page.handleRequest(freenetRequest, templateContext)
-		assertThat(this["postHits"], contains<Post>(postWithMatch))
+		verifyNoRedirect {
+			assertThat(this["postHits"], contains<Post>(postWithMatch))
+		}
 	}
 
 	private fun createSoneWithPost(idPostfix: String, text: String, recipient: Sone? = null, sender: Sone? = null) =
@@ -171,8 +173,9 @@ class SearchPageTest : WebPageTest() {
 		val postWithEarlyMatch = createSoneWithPost("with-early-match", "optional match")
 		val postWithLaterMatch = createSoneWithPost("with-later-match", "match that is optional")
 		addHttpRequestParameter("query", "optional ")
-		page.handleRequest(freenetRequest, templateContext)
-		assertThat(this["postHits"], contains<Post>(postWithEarlyMatch, postWithLaterMatch))
+		verifyNoRedirect {
+			assertThat(this["postHits"], contains<Post>(postWithEarlyMatch, postWithLaterMatch))
+		}
 	}
 
 	@Test
@@ -180,8 +183,9 @@ class SearchPageTest : WebPageTest() {
 		val postWithRequiredMatch = createSoneWithPost("with-required-match", "required match")
 		createPost("without-required-match", "not a match")
 		addHttpRequestParameter("query", "+required ")
-		page.handleRequest(freenetRequest, templateContext)
-		assertThat(this["postHits"], contains<Post>(postWithRequiredMatch))
+		verifyNoRedirect {
+			assertThat(this["postHits"], contains<Post>(postWithRequiredMatch))
+		}
 	}
 
 	@Test
@@ -189,8 +193,9 @@ class SearchPageTest : WebPageTest() {
 		createSoneWithPost("with-forbidden-match", "forbidden match")
 		val postWithoutForbiddenMatch = createSoneWithPost("without-forbidden-match", "not a match")
 		addHttpRequestParameter("query", "match -forbidden")
-		page.handleRequest(freenetRequest, templateContext)
-		assertThat(this["postHits"], contains<Post>(postWithoutForbiddenMatch))
+		verifyNoRedirect {
+			assertThat(this["postHits"], contains<Post>(postWithoutForbiddenMatch))
+		}
 	}
 
 	@Test
@@ -198,8 +203,9 @@ class SearchPageTest : WebPageTest() {
 		val postWithMatch = createSoneWithPost("with-match", "with + match")
 		createSoneWithPost("without-match", "without match")
 		addHttpRequestParameter("query", "+")
-		page.handleRequest(freenetRequest, templateContext)
-		assertThat(this["postHits"], contains<Post>(postWithMatch))
+		verifyNoRedirect {
+			assertThat(this["postHits"], contains<Post>(postWithMatch))
+		}
 	}
 
 	@Test
@@ -207,8 +213,9 @@ class SearchPageTest : WebPageTest() {
 		val postWithMatch = createSoneWithPost("with-match", "with - match")
 		createSoneWithPost("without-match", "without match")
 		addHttpRequestParameter("query", "-")
-		page.handleRequest(freenetRequest, templateContext)
-		assertThat(this["postHits"], contains<Post>(postWithMatch))
+		verifyNoRedirect {
+			assertThat(this["postHits"], contains<Post>(postWithMatch))
+		}
 	}
 
 	private fun createPost(id: String, text: String, recipient: Sone?) = mock<Post>().apply {
@@ -235,8 +242,9 @@ class SearchPageTest : WebPageTest() {
 		val postWithMatch = createSoneWithPost("with-match", "test", recipient)
 		createSoneWithPost("without-match", "no match")
 		addHttpRequestParameter("query", "recipient")
-		page.handleRequest(freenetRequest, templateContext)
-		assertThat(this["postHits"], contains<Post>(postWithMatch))
+		verifyNoRedirect {
+			assertThat(this["postHits"], contains<Post>(postWithMatch))
+		}
 	}
 
 	@Test
@@ -246,8 +254,9 @@ class SearchPageTest : WebPageTest() {
 		createSoneWithPost("with-match", "test", sender = soneWithProfileField)
 		createSoneWithPost("without-match", "no match")
 		addHttpRequestParameter("query", "value")
-		page.handleRequest(freenetRequest, templateContext)
-		assertThat(this["soneHits"], contains(soneWithProfileField))
+		verifyNoRedirect {
+			assertThat(this["soneHits"], contains(soneWithProfileField))
+		}
 	}
 
 	@Suppress("UNCHECKED_CAST")