projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up some imports
[Sone.git]
/
src
/
test
/
kotlin
/
net
/
pterodactylus
/
sone
/
web
/
pages
/
UploadImagePageTest.kt
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/UploadImagePageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/UploadImagePageTest.kt
index
38c5fe1
..
8bea89e
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/UploadImagePageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/UploadImagePageTest.kt
@@
-8,7
+8,6
@@
import net.pterodactylus.sone.data.TemporaryImage
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.mockBuilder
import net.pterodactylus.sone.test.whenever
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.mockBuilder
import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.UploadImagePage
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
@@
-39,13
+38,13
@@
class UploadImagePageTest : WebPageTest() {
@Test
fun `post request without parent results in no permission error page`() {
@Test
fun `post request without parent results in no permission error page`() {
-
request("",
POST)
+
setMethod(
POST)
verifyRedirect("noPermission.html")
}
@Test
fun `post request with parent that is not the current sone results in no permission error page`() {
verifyRedirect("noPermission.html")
}
@Test
fun `post request with parent that is not the current sone results in no permission error page`() {
-
request("",
POST)
+
setMethod(
POST)
addHttpRequestPart("parent", "parent-id")
whenever(parentAlbum.sone).thenReturn(mock<Sone>())
addAlbum("parent-id", parentAlbum)
addHttpRequestPart("parent", "parent-id")
whenever(parentAlbum.sone).thenReturn(mock<Sone>())
addAlbum("parent-id", parentAlbum)
@@
-54,7
+53,7
@@
class UploadImagePageTest : WebPageTest() {
@Test
fun `post request with empty name redirects to error page`() {
@Test
fun `post request with empty name redirects to error page`() {
-
request("",
POST)
+
setMethod(
POST)
addAlbum("parent-id", parentAlbum)
addHttpRequestPart("parent", "parent-id")
addHttpRequestPart("title", " ")
addAlbum("parent-id", parentAlbum)
addHttpRequestPart("parent", "parent-id")
addHttpRequestPart("title", " ")
@@
-63,7
+62,7
@@
class UploadImagePageTest : WebPageTest() {
@Test
fun `uploading an invalid image results in no redirect and message set in template context`() {
@Test
fun `uploading an invalid image results in no redirect and message set in template context`() {
-
request("",
POST)
+
setMethod(
POST)
addAlbum("parent-id", parentAlbum)
addHttpRequestPart("parent", "parent-id")
addHttpRequestPart("title", "title")
addAlbum("parent-id", parentAlbum)
addHttpRequestPart("parent", "parent-id")
addHttpRequestPart("title", "title")
@@
-75,7
+74,7
@@
class UploadImagePageTest : WebPageTest() {
@Test
fun `uploading a valid image uploads image and redirects to album browser`() {
@Test
fun `uploading a valid image uploads image and redirects to album browser`() {
-
request("",
POST)
+
setMethod(
POST)
addAlbum("parent-id", parentAlbum)
addHttpRequestPart("parent", "parent-id")
addHttpRequestPart("title", "Title")
addAlbum("parent-id", parentAlbum)
addHttpRequestPart("parent", "parent-id")
addHttpRequestPart("title", "Title")