Merge branch 'release-0.9.8'

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

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/EditProfilePageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/EditProfilePageTest.kt
index fd03d0a..b4e6570 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/EditProfilePageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/EditProfilePageTest.kt
@@ -4,8 +4,6 @@ import net.pterodactylus.sone.data.Image
 import net.pterodactylus.sone.data.Profile
 import net.pterodactylus.sone.test.mock
 import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.EditProfilePage
-import net.pterodactylus.sone.web.pages.WebPageTest
 import net.pterodactylus.util.web.Method.POST
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.contains
@@ -19,16 +17,12 @@ import org.mockito.Mockito.verify
 /**
  * Unit test for [EditProfilePage].
  */
-class EditProfilePageTest : WebPageTest() {
-
-       private val page = EditProfilePage(template, webInterface)
+class EditProfilePageTest: WebPageTest(::EditProfilePage) {
 
        private val profile = Profile(currentSone)
        private val firstField = profile.addField("First Field")
        private val secondField = profile.addField("Second Field")
 
-       override fun getPage() = page
-
        @Before
        fun setupProfile() {
                val avatar = mock<Image>()
@@ -92,6 +86,7 @@ class EditProfilePageTest : WebPageTest() {
                addHttpRequestPart("save-profile", "true")
                addHttpRequestPart(fieldName, newValue.toString())
                verifyRedirect("editProfile.html") {
+                       verify(currentSone).profile = profile
                        verify(core).touchConfiguration()
                        assertThat(fieldAccessor(), equalTo(expectedValue))
                }