X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FSoneTemplatePageTest.kt;h=10dfb6e0fbfa1771c743a4b524926a63ae6c95ca;hp=2eb77e2dfbd43ea44aa9a7662e10ae7c4d6e9b86;hb=2dd40fba7031cffb35a5156435547a5d964535c9;hpb=fdc047dd37e982776d55d827ca405868efe32c5a

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePageTest.kt
index 2eb77e2..10dfb6e 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePageTest.kt
@@ -8,7 +8,6 @@ import net.pterodactylus.sone.web.page.FreenetRequest
 import net.pterodactylus.util.notify.Notification
 import net.pterodactylus.util.template.TemplateContext
 import net.pterodactylus.util.version.Version
-import net.pterodactylus.util.web.Method.GET
 import org.hamcrest.Matcher
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.anyOf
@@ -22,10 +21,7 @@ import org.mockito.Mockito.verify
 /**
  * Unit test for [SoneTemplatePage].
  */
-class SoneTemplatePageTest : WebPageTest() {
-
-	private val preferences by lazy { core.preferences!! }
-	private val page = object : SoneTemplatePage("path.html", template, webInterface, true) {}
+class SoneTemplatePageTest: WebPageTest({ template, webInterface -> object : SoneTemplatePage("path.html", template, webInterface, true) {}}) {
 
 	@Test
 	fun `current sone is retrieved from web interface`() {
@@ -207,14 +203,14 @@ class SoneTemplatePageTest : WebPageTest() {
 	@Test
 	fun `redirect does happen if sone is not logged in`() {
 		unsetCurrentSone()
-		request("index.html", GET)
+		request("index.html")
 		assertThat(page.getRedirectTarget(freenetRequest), equalTo("login.html?target=index.html"))
 	}
 
 	@Test
 	fun `redirect does happen with parameters encoded correctly if sone is not logged in`() {
 		unsetCurrentSone()
-		request("index.html", GET)
+		request("index.html")
 		addHttpRequestParameter("foo", "b=r")
 		addHttpRequestParameter("baz", "q&o")
 		assertThat(page.getRedirectTarget(freenetRequest), anyOf(