diff --git a/src/main/scala/gitbucket/core/controller/IssuesController.scala b/src/main/scala/gitbucket/core/controller/IssuesController.scala index 5dd7711..711b96e 100644 --- a/src/main/scala/gitbucket/core/controller/IssuesController.scala +++ b/src/main/scala/gitbucket/core/controller/IssuesController.scala @@ -1,7 +1,6 @@ package gitbucket.core.controller import gitbucket.core.issues.html -import gitbucket.core.model.Issue import gitbucket.core.service.IssuesService._ import gitbucket.core.service._ import gitbucket.core.util.ControlUtil._ diff --git a/src/test/scala/gitbucket/core/service/CommitStatusServiceSpec.scala b/src/test/scala/gitbucket/core/service/CommitStatusServiceSpec.scala index 64eeb19..8c3d36b 100644 --- a/src/test/scala/gitbucket/core/service/CommitStatusServiceSpec.scala +++ b/src/test/scala/gitbucket/core/service/CommitStatusServiceSpec.scala @@ -33,7 +33,7 @@ now = fixture1.registeredDate) test("createCommitState can insert and update") { withTestDB { implicit session => val tester = generateNewAccount(fixture1.creator) - createRepository(fixture1.repositoryName,fixture1.userName,None,false) + insertRepository(fixture1.repositoryName,fixture1.userName,None,false) val id = generateFixture1(tester:Account) assert(getCommitStatus(fixture1.userName, fixture1.repositoryName, id) == Some(fixture1.copy(commitStatusId=id))) // other one can update @@ -60,14 +60,14 @@ test("getCommitStatus can find by commitId and context") { withTestDB { implicit session => val tester = generateNewAccount(fixture1.creator) - createRepository(fixture1.repositoryName,fixture1.userName,None,false) + insertRepository(fixture1.repositoryName,fixture1.userName,None,false) val id = generateFixture1(tester:Account) assert(getCommitStatus(fixture1.userName, fixture1.repositoryName, fixture1.commitId, fixture1.context) == Some(fixture1.copy(commitStatusId=id))) }} test("getCommitStatus can find by commitStatusId") { withTestDB { implicit session => val tester = generateNewAccount(fixture1.creator) - createRepository(fixture1.repositoryName,fixture1.userName,None,false) + insertRepository(fixture1.repositoryName,fixture1.userName,None,false) val id = generateFixture1(tester:Account) assert(getCommitStatus(fixture1.userName, fixture1.repositoryName, id) == Some(fixture1.copy(commitStatusId=id))) }} diff --git a/src/test/scala/gitbucket/core/service/RepositoryServiceSpec.scala b/src/test/scala/gitbucket/core/service/RepositoryServiceSpec.scala index 9a343bd..0b13b4b 100644 --- a/src/test/scala/gitbucket/core/service/RepositoryServiceSpec.scala +++ b/src/test/scala/gitbucket/core/service/RepositoryServiceSpec.scala @@ -6,7 +6,7 @@ class RepositoryServiceSpec extends FunSuite with ServiceSpecBase with RepositoryService with AccountService{ test("renameRepository can rename CommitState, ProtectedBranches") { withTestDB { implicit session => val tester = generateNewAccount("tester") - createRepository("repo", "root", None, false) + insertRepository("repo", "root", None, false) val service = new CommitStatusService with ProtectedBranchService {} val id = service.createCommitStatus( userName = "root", diff --git a/src/test/scala/gitbucket/core/service/ServiceSpecBase.scala b/src/test/scala/gitbucket/core/service/ServiceSpecBase.scala index a7b383d..06aaaf7 100644 --- a/src/test/scala/gitbucket/core/service/ServiceSpecBase.scala +++ b/src/test/scala/gitbucket/core/service/ServiceSpecBase.scala @@ -42,7 +42,7 @@ def generateNewUserWithDBRepository(userName:String, repositoryName:String)(implicit s:Session):Account = { val ac = AccountService.getAccountByUserName(userName).getOrElse(generateNewAccount(userName)) - dummyService.createRepository(repositoryName, userName, None, false) + dummyService.insertRepository(repositoryName, userName, None, false) ac }