X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FRescuePageTest.kt;h=e653bbee064f80d9a00be8111cd86e7410d05204;hb=6de1ddee725ce440b1a91880a45edae195c2d593;hp=19bc02eb05a4fb25293670d0d69e25fd4defcc3a;hpb=6d51a9996446ad0c1cbf5c36eb2802c35876c18e;p=Sone.git

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/RescuePageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/RescuePageTest.kt
index 19bc02e..e653bbe 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/RescuePageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/RescuePageTest.kt
@@ -1,16 +1,13 @@
 package net.pterodactylus.sone.web.pages
 
-import net.pterodactylus.sone.core.SoneRescuer
-import net.pterodactylus.sone.test.getInstance
-import net.pterodactylus.sone.test.mock
-import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.baseInjector
-import net.pterodactylus.util.web.Method.POST
-import org.hamcrest.MatcherAssert.assertThat
-import org.hamcrest.Matchers.equalTo
-import org.hamcrest.Matchers.notNullValue
-import org.junit.Before
-import org.junit.Test
+import net.pterodactylus.sone.core.*
+import net.pterodactylus.sone.test.*
+import net.pterodactylus.sone.web.*
+import net.pterodactylus.sone.web.page.*
+import net.pterodactylus.util.web.Method.*
+import org.hamcrest.MatcherAssert.*
+import org.hamcrest.Matchers.*
+import org.junit.*
 import org.mockito.ArgumentMatchers.anyLong
 import org.mockito.Mockito.never
 import org.mockito.Mockito.verify
@@ -18,7 +15,7 @@ import org.mockito.Mockito.verify
 /**
  * Unit test for [RescuePage].
  */
-class RescuePageTest: WebPageTest(::RescuePage) {
+class RescuePageTest : WebPageTest(::RescuePage) {
 
 	private val soneRescuer = mock<SoneRescuer>()
 
@@ -40,7 +37,7 @@ class RescuePageTest: WebPageTest(::RescuePage) {
 	@Test
 	fun `page returns correct title`() {
 		addTranslation("Page.Rescue.Title", "rescue page title")
-		assertThat(page.getPageTitle(freenetRequest), equalTo("rescue page title"))
+		assertThat(page.getPageTitle(soneRequest), equalTo("rescue page title"))
 	}
 
 	@Test
@@ -57,40 +54,36 @@ class RescuePageTest: WebPageTest(::RescuePage) {
 	}
 
 	@Test
-	fun `post request with fetch and invalid edition starts next fetch`() {
+	fun `post request with fetch starts next fetch`() {
 		setMethod(POST)
 		addHttpRequestPart("fetch", "true")
 		verifyRedirect("rescue.html") {
-			verify(soneRescuer, never()).setEdition(anyLong())
 			verify(soneRescuer).startNextFetch()
 		}
 	}
 
 	@Test
-	fun `post request with fetch and valid edition sets edition and starts next fetch`() {
+	fun `post request with skipping fetch starts next skipping fetch`() {
 		setMethod(POST)
-		addHttpRequestPart("fetch", "true")
-		addHttpRequestPart("edition", "123")
+		addHttpRequestPart("fetchSkip", "true")
 		verifyRedirect("rescue.html") {
-			verify(soneRescuer).setEdition(123L)
-			verify(soneRescuer).startNextFetch()
+			verify(soneRescuer).startNextFetchWithSkip()
 		}
 	}
 
 	@Test
-	fun `post request with negative edition will not set edition`() {
-		setMethod(POST)
-		addHttpRequestPart("fetch", "true")
-		addHttpRequestPart("edition", "-123")
-		verifyRedirect("rescue.html") {
-			verify(soneRescuer, never()).setEdition(anyLong())
-			verify(soneRescuer).startNextFetch()
-		}
+	fun `page can be created by dependency injection`() {
+		assertThat(baseInjector.getInstance<RescuePage>(), notNullValue())
 	}
 
 	@Test
-	fun `page can be created by dependency injection`() {
-	    assertThat(baseInjector.getInstance<RescuePage>(), notNullValue())
+	fun `page is annotated with correct menuname`() {
+		assertThat(page.menuName, equalTo("Rescue"))
+	}
+
+	@Test
+	fun `page is annotated with correct template path`() {
+		assertThat(page.templatePath, equalTo("/templates/rescue.html"))
 	}
 
 }