From 0f6a433623126cc11b96bb5eb1bb798db8a8fe6c Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sun, 11 Dec 2016 16:49:47 +0900 Subject: [PATCH] (refs #1348)Fix testcase --- .../scala/gitbucket/core/service/PullRequestServiceSpec.scala | 2 +- src/test/scala/gitbucket/core/service/ServiceSpecBase.scala | 2 +- src/test/scala/gitbucket/core/service/WebHookServiceSpec.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/scala/gitbucket/core/service/PullRequestServiceSpec.scala b/src/test/scala/gitbucket/core/service/PullRequestServiceSpec.scala index d6ddff9e7..a7b8050ef 100644 --- a/src/test/scala/gitbucket/core/service/PullRequestServiceSpec.scala +++ b/src/test/scala/gitbucket/core/service/PullRequestServiceSpec.scala @@ -4,7 +4,7 @@ import gitbucket.core.model._ import org.scalatest.FunSpec class PullRequestServiceSpec extends FunSpec with ServiceSpecBase - with PullRequestService with IssuesService with AccountService with RepositoryService { + with PullRequestService with IssuesService with AccountService with RepositoryService with CommitsService { def swap(r: (Issue, PullRequest)) = (r._2 -> r._1) diff --git a/src/test/scala/gitbucket/core/service/ServiceSpecBase.scala b/src/test/scala/gitbucket/core/service/ServiceSpecBase.scala index 0bf208ba1..16fd952bc 100644 --- a/src/test/scala/gitbucket/core/service/ServiceSpecBase.scala +++ b/src/test/scala/gitbucket/core/service/ServiceSpecBase.scala @@ -44,7 +44,7 @@ trait ServiceSpecBase { def user(name:String)(implicit s:Session):Account = AccountService.getAccountByUserName(name).get lazy val dummyService = new RepositoryService with AccountService with IssuesService with PullRequestService - with CommitStatusService with LabelsService (){} + with CommitsService with CommitStatusService with LabelsService (){} def generateNewUserWithDBRepository(userName:String, repositoryName:String)(implicit s:Session):Account = { val ac = AccountService.getAccountByUserName(userName).getOrElse(generateNewAccount(userName)) diff --git a/src/test/scala/gitbucket/core/service/WebHookServiceSpec.scala b/src/test/scala/gitbucket/core/service/WebHookServiceSpec.scala index c4c2c7d3a..238cafb31 100644 --- a/src/test/scala/gitbucket/core/service/WebHookServiceSpec.scala +++ b/src/test/scala/gitbucket/core/service/WebHookServiceSpec.scala @@ -6,7 +6,7 @@ import gitbucket.core.model.WebHookContentType class WebHookServiceSpec extends FunSuite with ServiceSpecBase { - lazy val service = new WebHookPullRequestService with AccountService with RepositoryService with PullRequestService with IssuesService + lazy val service = new WebHookPullRequestService with AccountService with RepositoryService with PullRequestService with IssuesService with CommitsService test("WebHookPullRequestService.getPullRequestsByRequestForWebhook") { withTestDB { implicit session => val user1 = generateNewUserWithDBRepository("user1","repo1")