X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FOptionsPageTest.kt;h=28844b9fef15c147f3ff46b3532cd2eb0af197c7;hb=2a172721a88c1e14d5b6f8bddec5a9d2a556218f;hp=c7b3423078569aa359d21327a9976ef594b75347;hpb=4e822a612bedf423ec395f55da13cfb68975f2ef;p=Sone.git

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/OptionsPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/OptionsPageTest.kt
index c7b3423..28844b9 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/OptionsPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/OptionsPageTest.kt
@@ -18,11 +18,7 @@ import org.junit.Test
 /**
  * Unit test for [OptionsPage].
  */
-class OptionsPageTest : WebPageTest() {
-
-	private val page = OptionsPage(template, webInterface)
-
-	override fun getPage() = page
+class OptionsPageTest: WebPageTest2(::OptionsPage) {
 
 	@Before
 	fun setupPreferences() {
@@ -54,7 +50,7 @@ class OptionsPageTest : WebPageTest() {
 
 	@Test
 	fun `page returns correct path`() {
-	    assertThat(page.path, equalTo("options.html"))
+		assertThat(page.path, equalTo("options.html"))
 	}
 
 	@Test
@@ -64,7 +60,7 @@ class OptionsPageTest : WebPageTest() {
 
 	@Test
 	fun `page returns correct title`() {
-	    addTranslation("Page.Options.Title", "options page title")
+		addTranslation("Page.Options.Title", "options page title")
 		assertThat(page.getPageTitle(freenetRequest), equalTo("options page title"))
 	}
 
@@ -110,7 +106,7 @@ class OptionsPageTest : WebPageTest() {
 		setMethod(POST)
 		addHttpRequestPart("show-custom-avatars", "ALWAYS")
 		addHttpRequestPart("load-linked-images", "ALWAYS")
-		addHttpRequestPart(option, setValue.toString())
+		setValue?.also { addHttpRequestPart(option, it.toString()) }
 		verifyRedirect("options.html") {
 			assertThat(getter(), equalTo(expectedValue))
 		}
@@ -122,26 +118,52 @@ class OptionsPageTest : WebPageTest() {
 	}
 
 	@Test
+	fun `auto-follow option can be unset`() {
+		verifyThatOptionCanBeSet("auto-follow", null, false) { currentSone.options.isAutoFollow }
+	}
+
+	@Test
 	fun `show new sone notification option can be set`() {
 		verifyThatOptionCanBeSet("show-notification-new-sones", "checked", true) { currentSone.options.isShowNewSoneNotifications }
 	}
 
 	@Test
+	fun `show new sone notification option can be unset`() {
+		verifyThatOptionCanBeSet("" +
+				"", null, false) { currentSone.options.isShowNewSoneNotifications }
+	}
+
+	@Test
 	fun `show new post notification option can be set`() {
 		verifyThatOptionCanBeSet("show-notification-new-posts", "checked", true) { currentSone.options.isShowNewPostNotifications }
 	}
 
 	@Test
+	fun `show new post notification option can be unset`() {
+		verifyThatOptionCanBeSet("show-notification-new-posts", null, false) { currentSone.options.isShowNewPostNotifications }
+	}
+
+	@Test
 	fun `show new reply notification option can be set`() {
 		verifyThatOptionCanBeSet("show-notification-new-replies", "checked", true) { currentSone.options.isShowNewReplyNotifications }
 	}
 
 	@Test
+	fun `show new reply notification option can be unset`() {
+		verifyThatOptionCanBeSet("show-notification-new-replies", null, false) { currentSone.options.isShowNewReplyNotifications }
+	}
+
+	@Test
 	fun `enable sone insert notifications option can be set`() {
 		verifyThatOptionCanBeSet("enable-sone-insert-notifications", "checked", true) { currentSone.options.isSoneInsertNotificationEnabled }
 	}
 
 	@Test
+	fun `enable sone insert notifications option can be unset`() {
+		verifyThatOptionCanBeSet("enable-sone-insert-notifications", null, false) { currentSone.options.isSoneInsertNotificationEnabled }
+	}
+
+	@Test
 	fun `load linked images option can be set`() {
 		verifyThatOptionCanBeSet("load-linked-images", "TRUSTED", TRUSTED) { currentSone.options.loadLinkedImages }
 	}
@@ -163,7 +185,7 @@ class OptionsPageTest : WebPageTest() {
 	private fun <T> verifyThatPreferencesCanBeSet(name: String, setValue: String?, expectedValue: T, getter: () -> T) {
 		unsetCurrentSone()
 		setMethod(POST)
-		addHttpRequestPart(name, setValue)
+		setValue?.also { addHttpRequestPart(name, it) }
 		verifyRedirect("options.html") {
 			assertThat(getter(), equalTo(expectedValue))
 		}