🚧 Add Loaders to all template-using pages

[Sone.git] / src / test / kotlin / net / pterodactylus / sone / web / pages / SearchPageTest.kt

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 b0aee64..440fe1d 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/SearchPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/SearchPageTest.kt
@@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicInteger
 /**
  * Unit test for [SearchPage].
  */
-class SearchPageTest: WebPageTest({ template, webInterface -> SearchPage(template, webInterface, ticker) }) {
+class SearchPageTest: WebPageTest({ template, webInterface, loaders -> SearchPage(template, webInterface, loaders, ticker) }) {
 
        companion object {
                val ticker = mock<Ticker>()
@@ -44,7 +44,7 @@ class SearchPageTest: WebPageTest({ template, webInterface -> SearchPage(templat
        @Test
        fun `page returns correct title`() {
                addTranslation("Page.Search.Title", "search page title")
-               assertThat(page.getPageTitle(freenetRequest), equalTo("search page title"))
+               assertThat(page.getPageTitle(soneRequest), equalTo("search page title"))
        }
 
        @Test
@@ -73,21 +73,21 @@ class SearchPageTest: WebPageTest({ template, webInterface -> SearchPage(templat
 
        @Test
        fun `searching for sone link without prefix redirects to view sone page`() {
-               addSone("sone-id", mock<Sone>())
+               addSone("sone-id", mock())
                addHttpRequestParameter("query", "sone-id")
                verifyRedirect("viewSone.html?sone=sone-id")
        }
 
        @Test
        fun `searching for a post link redirects to post page`() {
-               addPost("Post-id", mock<Post>())
+               addPost("Post-id", mock())
                addHttpRequestParameter("query", "post://Post-id")
                verifyRedirect("viewPost.html?post=Post-id")
        }
 
        @Test
        fun `searching for a post ID without prefix redirects to post page`() {
-               addPost("post-id", mock<Post>())
+               addPost("post-id", mock())
                addHttpRequestParameter("query", "post-id")
                verifyRedirect("viewPost.html?post=post-id")
        }
@@ -110,28 +110,28 @@ class SearchPageTest: WebPageTest({ template, webInterface -> SearchPage(templat
 
        @Test
        fun `searching for an album link redirects to the image browser`() {
-               addAlbum("album-id", mock<Album>())
+               addAlbum("album-id", mock())
                addHttpRequestParameter("query", "album://album-id")
                verifyRedirect("imageBrowser.html?album=album-id")
        }
 
        @Test
        fun `searching for an album ID redirects to the image browser`() {
-               addAlbum("album-id", mock<Album>())
+               addAlbum("album-id", mock())
                addHttpRequestParameter("query", "album-id")
                verifyRedirect("imageBrowser.html?album=album-id")
        }
 
        @Test
        fun `searching for an image link redirects to the image browser`() {
-               addImage("image-id", mock<Image>())
+               addImage("image-id", mock())
                addHttpRequestParameter("query", "image://image-id")
                verifyRedirect("imageBrowser.html?image=image-id")
        }
 
        @Test
        fun `searching for an image ID redirects to the image browser`() {
-               addImage("image-id", mock<Image>())
+               addImage("image-id", mock())
                addHttpRequestParameter("query", "image-id")
                verifyRedirect("imageBrowser.html?image=image-id")
        }
@@ -285,7 +285,7 @@ class SearchPageTest: WebPageTest({ template, webInterface -> SearchPage(templat
 
        @Test
        fun `sone hits are paginated correctly`() {
-               core.preferences.postsPerPage = 2
+               core.preferences.newPostsPerPage = 2
                val sones = listOf(createSone("1Sone"), createSone("Other1"), createSone("22Sone"), createSone("333Sone"), createSone("Other2"))
                                .onEach { addSone(it.id, it) }
                addHttpRequestParameter("query", "sone")
@@ -297,7 +297,7 @@ class SearchPageTest: WebPageTest({ template, webInterface -> SearchPage(templat
 
        @Test
        fun `sone hits page 2 is shown correctly`() {
-               core.preferences.postsPerPage = 2
+               core.preferences.newPostsPerPage = 2
                val sones = listOf(createSone("1Sone"), createSone("Other1"), createSone("22Sone"), createSone("333Sone"), createSone("Other2"))
                                .onEach { addSone(it.id, it) }
                addHttpRequestParameter("query", "sone")
@@ -310,7 +310,7 @@ class SearchPageTest: WebPageTest({ template, webInterface -> SearchPage(templat
 
        @Test
        fun `post hits are paginated correctly`() {
-               core.preferences.postsPerPage = 2
+               core.preferences.newPostsPerPage = 2
                val sones = listOf(createSoneWithPost("match1", "1Sone"), createSoneWithPost("no-match1", "Other1"), createSoneWithPost("match2", "22Sone"), createSoneWithPost("match3", "333Sone"), createSoneWithPost("no-match2", "Other2"))
                addHttpRequestParameter("query", "sone")
                verifyNoRedirect {
@@ -321,7 +321,7 @@ class SearchPageTest: WebPageTest({ template, webInterface -> SearchPage(templat
 
        @Test
        fun `post hits page 2 is shown correctly`() {
-               core.preferences.postsPerPage = 2
+               core.preferences.newPostsPerPage = 2
                val sones = listOf(createSoneWithPost("match1", "1Sone"), createSoneWithPost("no-match1", "Other1"), createSoneWithPost("match2", "22Sone"), createSoneWithPost("match3", "333Sone"), createSoneWithPost("no-match2", "Other2"))
                addHttpRequestParameter("query", "sone")
                addHttpRequestParameter("postPage", "1")