projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use verifyNoRedirect instead of calling the request handler directly
[Sone.git]
/
src
/
test
/
kotlin
/
net
/
pterodactylus
/
sone
/
web
/
pages
/
RescuePageTest.kt
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
cbc8968
..
303a23c
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/RescuePageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/RescuePageTest.kt
@@
-3,8
+3,6
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.core.SoneRescuer
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
import net.pterodactylus.sone.core.SoneRescuer
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.RescuePage
-import net.pterodactylus.util.web.Method.GET
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
@@
-32,20
+30,20
@@
class RescuePageTest : WebPageTest() {
@Test
fun `get request sets rescuer in template context`() {
@Test
fun `get request sets rescuer in template context`() {
- request("", GET)
-
page.handleRequest(freenetRequest, templateContext
)
- assertThat(templateContext["soneRescuer"], equalTo<Any>(soneRescuer))
+ verifyNoRedirect {
+
assertThat(templateContext["soneRescuer"], equalTo<Any>(soneRescuer)
)
+ }
}
@Test
fun `post request redirects to rescue page`() {
}
@Test
fun `post request redirects to rescue page`() {
-
request("",
POST)
+
setMethod(
POST)
verifyRedirect("rescue.html")
}
@Test
fun `post request with fetch and invalid edition starts next fetch`() {
verifyRedirect("rescue.html")
}
@Test
fun `post request with fetch and invalid edition starts next fetch`() {
-
request("",
POST)
+
setMethod(
POST)
addHttpRequestPart("fetch", "true")
verifyRedirect("rescue.html") {
verify(soneRescuer, never()).setEdition(anyLong())
addHttpRequestPart("fetch", "true")
verifyRedirect("rescue.html") {
verify(soneRescuer, never()).setEdition(anyLong())
@@
-55,7
+53,7
@@
class RescuePageTest : WebPageTest() {
@Test
fun `post request with fetch and valid edition sets edition and starts next fetch`() {
@Test
fun `post request with fetch and valid edition sets edition and starts next fetch`() {
-
request("",
POST)
+
setMethod(
POST)
addHttpRequestPart("fetch", "true")
addHttpRequestPart("edition", "123")
verifyRedirect("rescue.html") {
addHttpRequestPart("fetch", "true")
addHttpRequestPart("edition", "123")
verifyRedirect("rescue.html") {