projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert login page test to use new web page test base
[Sone.git]
/
src
/
test
/
kotlin
/
net
/
pterodactylus
/
sone
/
web
/
pages
/
DeleteAlbumPageTest.kt
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPageTest.kt
index
3a1c504
..
c618400
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPageTest.kt
@@
-4,9
+4,6
@@
import net.pterodactylus.sone.data.Album
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.pages.WebPageTest
-import net.pterodactylus.sone.web.pages.DeleteAlbumPage
-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
@@
-52,14
+49,12
@@
class DeleteAlbumPageTest: WebPageTest() {
@Test
fun `get request with invalid album ID results in redirect to invalid page`() {
@Test
fun `get request with invalid album ID results in redirect to invalid page`() {
- request("", GET)
whenever(core.getAlbum(anyString())).thenReturn(null)
verifyRedirect("invalid.html")
}
@Test
fun `get request with valid album ID sets album in template context`() {
whenever(core.getAlbum(anyString())).thenReturn(null)
verifyRedirect("invalid.html")
}
@Test
fun `get request with valid album ID sets album in template context`() {
- request("", GET)
val album = mock<Album>()
addAlbum("album-id", album)
addHttpRequestParameter("album", "album-id")
val album = mock<Album>()
addAlbum("album-id", album)
addHttpRequestParameter("album", "album-id")
@@
-69,13
+64,13
@@
class DeleteAlbumPageTest: WebPageTest() {
@Test
fun `post request redirects to invalid page if album is invalid`() {
@Test
fun `post request redirects to invalid page if album is invalid`() {
-
request("",
POST)
+
setMethod(
POST)
verifyRedirect("invalid.html")
}
@Test
fun `post request redirects to no permissions page if album is not local`() {
verifyRedirect("invalid.html")
}
@Test
fun `post request redirects to no permissions page if album is not local`() {
-
request("",
POST)
+
setMethod(
POST)
whenever(sone.isLocal).thenReturn(false)
addAlbum("album-id", album)
addHttpRequestPart("album", "album-id")
whenever(sone.isLocal).thenReturn(false)
addAlbum("album-id", album)
addHttpRequestPart("album", "album-id")
@@
-84,7
+79,7
@@
class DeleteAlbumPageTest: WebPageTest() {
@Test
fun `post request with abort delete parameter set redirects to album browser`() {
@Test
fun `post request with abort delete parameter set redirects to album browser`() {
-
request("",
POST)
+
setMethod(
POST)
addAlbum("album-id", album)
addHttpRequestPart("album", "album-id")
addHttpRequestPart("abortDelete", "true")
addAlbum("album-id", album)
addHttpRequestPart("album", "album-id")
addHttpRequestPart("abortDelete", "true")
@@
-93,7
+88,7
@@
class DeleteAlbumPageTest: WebPageTest() {
@Test
fun `album is deleted and page redirects to sone if parent album is root album`() {
@Test
fun `album is deleted and page redirects to sone if parent album is root album`() {
-
request("",
POST)
+
setMethod(
POST)
addAlbum("album-id", album)
addHttpRequestPart("album", "album-id")
verifyRedirect("imageBrowser.html?sone=sone-id") {
addAlbum("album-id", album)
addHttpRequestPart("album", "album-id")
verifyRedirect("imageBrowser.html?sone=sone-id") {
@@
-103,7
+98,7
@@
class DeleteAlbumPageTest: WebPageTest() {
@Test
fun `album is deleted and page redirects to album if parent album is not root album`() {
@Test
fun `album is deleted and page redirects to album if parent album is not root album`() {
-
request("",
POST)
+
setMethod(
POST)
whenever(parentAlbum.isRoot).thenReturn(false)
whenever(sone.rootAlbum).thenReturn(mock<Album>())
addAlbum("album-id", album)
whenever(parentAlbum.isRoot).thenReturn(false)
whenever(sone.rootAlbum).thenReturn(mock<Album>())
addAlbum("album-id", album)