projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove obsolete loading animation
[Sone.git]
/
src
/
test
/
kotlin
/
net
/
pterodactylus
/
sone
/
web
/
DeletePostPageTest.kt
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/DeletePostPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/DeletePostPageTest.kt
index
dd42f5e
..
ab7851a
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/DeletePostPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/DeletePostPageTest.kt
@@
-4,7
+4,6
@@
import net.pterodactylus.sone.data.Post
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.WebTestUtils.redirectsTo
import net.pterodactylus.util.web.Method.GET
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import net.pterodactylus.util.web.Method.GET
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
@@
-13,7
+12,6
@@
import org.junit.Before
import org.junit.Test
import org.mockito.Mockito.never
import org.mockito.Mockito.verify
import org.junit.Test
import org.mockito.Mockito.never
import org.mockito.Mockito.verify
-import kotlin.test.fail
/**
* Unit test for [DeletePostPage].
/**
* Unit test for [DeletePostPage].
@@
-25,6
+23,8
@@
class DeletePostPageTest : WebPageTest() {
private val post = mock<Post>()
private val sone = mock<Sone>()
private val post = mock<Post>()
private val sone = mock<Sone>()
+ override fun getPage() = page
+
@Before
fun setupPost() {
whenever(post.sone).thenReturn(sone)
@Before
fun setupPost() {
whenever(post.sone).thenReturn(sone)
@@
-32,10
+32,19
@@
class DeletePostPageTest : WebPageTest() {
}
@Test
}
@Test
+ fun `page returns correct path`() {
+ assertThat(page.path, equalTo("deletePost.html"))
+ }
+
+ @Test
+ fun `page requires login`() {
+ assertThat(page.requiresLogin(), equalTo(true))
+ }
+
+ @Test
fun `get request with invalid post redirects to no permission page`() {
request("", GET)
fun `get request with invalid post redirects to no permission page`() {
request("", GET)
- expectedException.expect(redirectsTo("noPermission.html"))
- page.processTemplate(freenetRequest, templateContext)
+ verifyRedirect("noPermission.html")
}
@Test
}
@Test
@@
-52,8
+61,7
@@
class DeletePostPageTest : WebPageTest() {
@Test
fun `post request with invalid post redirects to no permission page`() {
request("", POST)
@Test
fun `post request with invalid post redirects to no permission page`() {
request("", POST)
- expectedException.expect(redirectsTo("noPermission.html"))
- page.processTemplate(freenetRequest, templateContext)
+ verifyRedirect("noPermission.html")
}
@Test
}
@Test
@@
-63,8
+71,7
@@
class DeletePostPageTest : WebPageTest() {
addPost("post-id", post)
addHttpRequestParameter("post", "post-id")
addHttpRequestParameter("returnPage", "return.html")
addPost("post-id", post)
addHttpRequestParameter("post", "post-id")
addHttpRequestParameter("returnPage", "return.html")
- expectedException.expect(redirectsTo("noPermission.html"))
- page.processTemplate(freenetRequest, templateContext)
+ verifyRedirect("noPermission.html")
}
@Test
}
@Test
@@
-74,13
+81,8
@@
class DeletePostPageTest : WebPageTest() {
addHttpRequestParameter("post", "post-id")
addHttpRequestParameter("returnPage", "return.html")
addHttpRequestParameter("confirmDelete", "true")
addHttpRequestParameter("post", "post-id")
addHttpRequestParameter("returnPage", "return.html")
addHttpRequestParameter("confirmDelete", "true")
- expectedException.expect(redirectsTo("return.html"))
- try {
- page.processTemplate(freenetRequest, templateContext)
- fail()
- } catch (e: Exception) {
+ verifyRedirect("return.html") {
verify(core).deletePost(post)
verify(core).deletePost(post)
- throw e
}
}
}
}
@@
-91,13
+93,8
@@
class DeletePostPageTest : WebPageTest() {
addHttpRequestParameter("post", "post-id")
addHttpRequestParameter("returnPage", "return.html")
addHttpRequestParameter("abortDelete", "true")
addHttpRequestParameter("post", "post-id")
addHttpRequestParameter("returnPage", "return.html")
addHttpRequestParameter("abortDelete", "true")
- expectedException.expect(redirectsTo("return.html"))
- try {
- page.processTemplate(freenetRequest, templateContext)
- fail()
- } catch (e: Exception) {
+ verifyRedirect("return.html") {
verify(core, never()).deletePost(post)
verify(core, never()).deletePost(post)
- throw e
}
}
}
}