projects
/
Sone.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a9c1c17
)
Whitespace fixes
author
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Tue, 6 Dec 2016 21:18:58 +0000
(22:18 +0100)
committer
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Tue, 6 Dec 2016 21:19:43 +0000
(22:19 +0100)
src/test/kotlin/net/pterodactylus/sone/web/DeleteReplyPageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/DistrustPageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/EditProfilePageTest.kt
patch
|
blob
|
history
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/DeleteReplyPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/DeleteReplyPageTest.kt
index
ee6de04
..
1b202e4
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/DeleteReplyPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/DeleteReplyPageTest.kt
@@
-30,10
+30,10
@@
class DeleteReplyPageTest : WebPageTest() {
whenever(sone.isLocal).thenReturn(true)
whenever(reply.sone).thenReturn(sone)
}
whenever(sone.isLocal).thenReturn(true)
whenever(reply.sone).thenReturn(sone)
}
-
+
@Test
fun `get request sets reply ID and return page in template context`() {
@Test
fun `get request sets reply ID and return page in template context`() {
- request("", GET)
+
request("", GET)
addHttpRequestParameter("reply", "reply-id")
addHttpRequestParameter("returnPage", "return.html")
page.handleRequest(freenetRequest, templateContext)
addHttpRequestParameter("reply", "reply-id")
addHttpRequestParameter("returnPage", "return.html")
page.handleRequest(freenetRequest, templateContext)
@@
-43,7
+43,7
@@
class DeleteReplyPageTest : WebPageTest() {
@Test
fun `post request without any action sets reply ID and return page in template context`() {
@Test
fun `post request without any action sets reply ID and return page in template context`() {
- request("", POST)
+
request("", POST)
addPostReply("reply-id", reply)
addHttpRequestParameter("reply", "reply-id")
addHttpRequestParameter("returnPage", "return.html")
addPostReply("reply-id", reply)
addHttpRequestParameter("reply", "reply-id")
addHttpRequestParameter("returnPage", "return.html")
@@
-60,7
+60,7
@@
class DeleteReplyPageTest : WebPageTest() {
@Test
fun `trying to delete a reply from a non-local sone results in no permission page`() {
@Test
fun `trying to delete a reply from a non-local sone results in no permission page`() {
- request("", POST)
+
request("", POST)
addHttpRequestParameter("reply", "reply-id")
whenever(sone.isLocal).thenReturn(false)
addPostReply("reply-id", reply)
addHttpRequestParameter("reply", "reply-id")
whenever(sone.isLocal).thenReturn(false)
addPostReply("reply-id", reply)
@@
-69,7
+69,7
@@
class DeleteReplyPageTest : WebPageTest() {
@Test
fun `confirming deletion of reply deletes the reply and redirects to return page`() {
@Test
fun `confirming deletion of reply deletes the reply and redirects to return page`() {
- request("", POST)
+
request("", POST)
addPostReply("reply-id", reply)
addHttpRequestParameter("reply", "reply-id")
addHttpRequestParameter("returnPage", "return.html")
addPostReply("reply-id", reply)
addHttpRequestParameter("reply", "reply-id")
addHttpRequestParameter("returnPage", "return.html")
@@
-78,10
+78,10
@@
class DeleteReplyPageTest : WebPageTest() {
verify(core).deleteReply(reply)
}
}
verify(core).deleteReply(reply)
}
}
-
+
@Test
fun `aborting deletion of reply redirects to return page`() {
@Test
fun `aborting deletion of reply redirects to return page`() {
- request("", POST)
+
request("", POST)
addPostReply("reply-id", reply)
addHttpRequestParameter("reply", "reply-id")
addHttpRequestParameter("returnPage", "return.html")
addPostReply("reply-id", reply)
addHttpRequestParameter("reply", "reply-id")
addHttpRequestParameter("returnPage", "return.html")
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/DistrustPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/DistrustPageTest.kt
index
1b51a4f
..
b5af91a
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/DistrustPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/DistrustPageTest.kt
@@
-18,20
+18,20
@@
class DistrustPageTest : WebPageTest() {
@Test
fun `get request does not redirect`() {
@Test
fun `get request does not redirect`() {
- request("", GET)
+
request("", GET)
page.handleRequest(freenetRequest, templateContext)
}
@Test
fun `post request with invalid sone redirects to return page`() {
page.handleRequest(freenetRequest, templateContext)
}
@Test
fun `post request with invalid sone redirects to return page`() {
- request("", POST)
+
request("", POST)
addHttpRequestParameter("returnPage", "return.html")
verifyRedirect("return.html")
}
@Test
fun `post request with valid sone distrusts sone and redirects to return page`() {
addHttpRequestParameter("returnPage", "return.html")
verifyRedirect("return.html")
}
@Test
fun `post request with valid sone distrusts sone and redirects to return page`() {
- request("", POST)
+
request("", POST)
val remoteSone = mock<Sone>()
addSone("remote-sone-id", remoteSone)
addHttpRequestParameter("returnPage", "return.html")
val remoteSone = mock<Sone>()
addSone("remote-sone-id", remoteSone)
addHttpRequestParameter("returnPage", "return.html")
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/EditProfilePageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/EditProfilePageTest.kt
index
0bdff69
..
36c83b7
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/EditProfilePageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/EditProfilePageTest.kt
@@
-175,7
+175,7
@@
class EditProfilePageTest : WebPageTest() {
verify(currentSone).profile = profile
}
}
verify(currentSone).profile = profile
}
}
-
+
@Test
fun `moving an invalid field up redirects to the invalid page`() {
request("", POST)
@Test
fun `moving an invalid field up redirects to the invalid page`() {
request("", POST)