Skip to content

Commit f7b4a45

Browse files
committed
idk how i missed it
1 parent d130f3a commit f7b4a45

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

server/src/test/kotlin/ua/pp/lumivoid/iwtcms/server/ConnectToTestDb.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ import ua.pp.lumivoid.iwtcms.server.tables.UserPermissionsTable
1010
import ua.pp.lumivoid.iwtcms.server.tables.UsersTable
1111

1212
fun connectToTestDb() {
13-
val url = "jdbc:h2:mem:///test;MODE=MYSQL;DB_CLOSE_DELAY=-1"
14-
15-
Database.connect(url = url, driver = "h2")
13+
Database.connect(url = "jdbc:h2:mem:///test;MODE=MYSQL;DB_CLOSE_DELAY=-1", driver = "org.h2.Driver")
1614

1715
transaction {
1816
addLogger(StdOutSqlLogger)

server/src/test/kotlin/ua/pp/lumivoid/iwtcms/server/CreateTestSession.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ package ua.pp.lumivoid.iwtcms.server
22

33
import org.jetbrains.exposed.v1.core.eq
44
import org.jetbrains.exposed.v1.jdbc.transactions.transaction
5+
import ua.pp.lumivoid.iwtcms.server.cookie.UserSession
56
import ua.pp.lumivoid.iwtcms.server.tables.UserEntity
67
import ua.pp.lumivoid.iwtcms.server.tables.UsersTable
78

89
internal fun createTestSession() = transaction {
9-
UserEntity.find { UsersTable.username eq "admin" }.single().uniqueId
10+
val id = UserEntity.find { UsersTable.username eq "admin" }.single().uniqueId
11+
UserSession("admin", id)
1012
}

server/src/test/kotlin/ua/pp/lumivoid/iwtcms/server/api/requests/api/user/DeleteUserTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class DeleteUserTest: AuthBasedTest() {
5050
companion object {
5151
@JvmStatic
5252
@BeforeAll
53-
internal suspend fun `insert users for test`() {
53+
internal fun `insert users for test`(): Unit = runBlocking {
5454
CreateUser.create("test", "test", false, emptyList())
5555
}
5656

server/src/test/kotlin/ua/pp/lumivoid/iwtcms/server/api/requests/api/user/EditPermissionsTest.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,22 @@ class EditPermissionsTest: AuthBasedTest() {
4040
assertEquals(expectedStatus, response.status)
4141

4242
if (response.status == HttpStatusCode.OK) {
43-
val user = transaction {
44-
UserEntity.find { UsersTable.username eq "test" }.single()
45-
}
46-
val permissions = user.permissions.map { it.permissionName }
43+
transaction {
44+
val user = UserEntity.find { UsersTable.username eq "test" }.single()
45+
val permissions = user.permissions.map { it.permissionName }
4746

48-
assertEquals(testPayload.admin, user.admin)
49-
assertContains(permissions, "one")
50-
assertContains(permissions, "two")
51-
assertContains(permissions, "three")
47+
assertEquals(testPayload.admin, user.admin)
48+
assertContains(permissions, "one")
49+
assertContains(permissions, "two")
50+
assertContains(permissions, "three")
51+
}
5252
}
5353
}
5454

5555
companion object {
5656
@JvmStatic
5757
@BeforeAll
58-
internal suspend fun `insert users for test`() {
58+
internal fun `insert users for test`(): Unit = runBlocking {
5959
CreateUser.create("test", "test", false, emptyList())
6060
}
6161

0 commit comments

Comments
 (0)