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=dabcbbee11bd01eeca3bf8b83f5844242b8d45a1;hpb=a76956e389fcfe6282ad4ca7156bbf76327bb0c0;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 dabcbbe..e653bbe 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/RescuePageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/RescuePageTest.kt
@@ -15,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>()
 
@@ -54,50 +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")
-		verifyRedirect("rescue.html") {
-			verify(soneRescuer).setEdition(123L)
-			verify(soneRescuer).startNextFetch()
-		}
-	}
-
-	@Test
-	fun `post request with negative edition will not set edition`() {
-		setMethod(POST)
-		addHttpRequestPart("fetch", "true")
-		addHttpRequestPart("edition", "-123")
+		addHttpRequestPart("fetchSkip", "true")
 		verifyRedirect("rescue.html") {
-			verify(soneRescuer, never()).setEdition(anyLong())
-			verify(soneRescuer).startNextFetch()
+			verify(soneRescuer).startNextFetchWithSkip()
 		}
 	}
 
 	@Test
 	fun `page can be created by dependency injection`() {
-	    assertThat(baseInjector.getInstance<RescuePage>(), notNullValue())
+		assertThat(baseInjector.getInstance<RescuePage>(), notNullValue())
 	}
 
 	@Test
 	fun `page is annotated with correct menuname`() {
-	    assertThat(page.menuName, equalTo("Rescue"))
+		assertThat(page.menuName, equalTo("Rescue"))
 	}
 
 	@Test
 	fun `page is annotated with correct template path`() {
-	    assertThat(page.templatePath, equalTo("/templates/rescue.html"))
+		assertThat(page.templatePath, equalTo("/templates/rescue.html"))
 	}
 
 }