diff --git a/src/test/scala/gitbucket/core/service/AccessTokenServiceSpec.scala b/src/test/scala/gitbucket/core/service/AccessTokenServiceSpec.scala index 2df4822..7202b7c 100644 --- a/src/test/scala/gitbucket/core/service/AccessTokenServiceSpec.scala +++ b/src/test/scala/gitbucket/core/service/AccessTokenServiceSpec.scala @@ -2,7 +2,9 @@ import gitbucket.core.model._ import org.scalatest.FunSuite - +import gitbucket.core.model.Profile._ +import profile._ +import profile.blockingApi._ class AccessTokenServiceSpec extends FunSuite with ServiceSpecBase { @@ -66,8 +68,7 @@ test("when update Account.userName then AccessToken.userName changed") { withTestDB { implicit session => val user2 = generateNewAccount("user2") val (id, token) = AccessTokenService.generateAccessToken("user2", "note") - import gitbucket.core.model.Profile._ - import profile.simple._ + Accounts.filter(_.userName === "user2".bind).map(_.userName).update("user3") assert(AccessTokenService.getAccountByAccessToken(token) match { diff --git a/src/test/scala/gitbucket/core/service/CommitStatusServiceSpec.scala b/src/test/scala/gitbucket/core/service/CommitStatusServiceSpec.scala index 8c3d36b..54cc670 100644 --- a/src/test/scala/gitbucket/core/service/CommitStatusServiceSpec.scala +++ b/src/test/scala/gitbucket/core/service/CommitStatusServiceSpec.scala @@ -2,7 +2,8 @@ import gitbucket.core.model._ import gitbucket.core.model.Profile._ -import profile.simple._ +import profile._ +import profile.blockingApi._ import org.scalatest.FunSuite diff --git a/src/test/scala/gitbucket/core/service/IssuesServiceSpec.scala b/src/test/scala/gitbucket/core/service/IssuesServiceSpec.scala index ec4e5fc..5be477c 100644 --- a/src/test/scala/gitbucket/core/service/IssuesServiceSpec.scala +++ b/src/test/scala/gitbucket/core/service/IssuesServiceSpec.scala @@ -9,7 +9,10 @@ test("getCommitStatues") { withTestDB { implicit session => val user1 = generateNewUserWithDBRepository("user1","repo1") - def getCommitStatues = dummyService.getCommitStatues(List(("user1","repo1",1),("user1","repo1",2))) + def getCommitStatues = List( + dummyService.getCommitStatues("user1","repo1",1), + dummyService.getCommitStatues("user1","repo1",2) + ) assert(getCommitStatues == Map.empty) diff --git a/src/test/scala/gitbucket/core/service/ServiceSpecBase.scala b/src/test/scala/gitbucket/core/service/ServiceSpecBase.scala index 87eb29a..921901c 100644 --- a/src/test/scala/gitbucket/core/service/ServiceSpecBase.scala +++ b/src/test/scala/gitbucket/core/service/ServiceSpecBase.scala @@ -8,7 +8,8 @@ import io.github.gitbucket.solidbase.Solidbase import liquibase.database.core.H2Database import liquibase.database.jvm.JdbcConnection -import profile.simple._ +import profile._ +import profile.blockingApi._ import scalaz._ import Scalaz._