Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-08 06:25:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix test case

Browse Source
This commit is contained in:
Naoki Takezoe
2016-08-13 17:55:44 +09:00
parent c2538e772f
commit 2b5f74b9f3
3 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/scala/gitbucket/core/service/AccessTokenService.scala
View File

@@ -30,7 +30,8 @@ trait AccessTokenService {
do { do {
token = makeAccessTokenString token = makeAccessTokenString
hash = tokenToHash(token) hash = tokenToHash(token)
} while (AccessTokens.filter(_.tokenHash === hash.bind).exists.run) //} while (AccessTokens.filter(_.tokenHash === hash.bind).exists.run)
} while (Query(AccessTokens.filter(_.tokenHash === hash.bind).exists).first)
val newToken = AccessToken( val newToken = AccessToken(
userName = userName, userName = userName,
note = note, note = note,

3
src/main/scala/gitbucket/core/service/PullRequestService.scala
View File

@@ -111,7 +111,8 @@ trait PullRequestService { self: IssuesService =>
*/ */
def updatePullRequests(owner: String, repository: String, branch: String)(implicit s: Session): Unit = def updatePullRequests(owner: String, repository: String, branch: String)(implicit s: Session): Unit =
getPullRequestsByRequest(owner, repository, branch, false).foreach { pullreq => getPullRequestsByRequest(owner, repository, branch, false).foreach { pullreq =>
if(Repositories.filter(_.byRepository(pullreq.userName, pullreq.repositoryName)).exists.run){ if(Query(Repositories.filter(_.byRepository(pullreq.userName, pullreq.repositoryName)).exists).first){
//if(Repositories.filter(_.byRepository(pullreq.userName, pullreq.repositoryName)).exists.run){
val (commitIdTo, commitIdFrom) = JGitUtil.updatePullRequest( val (commitIdTo, commitIdFrom) = JGitUtil.updatePullRequest(
pullreq.userName, pullreq.repositoryName, pullreq.branch, pullreq.issueId, pullreq.userName, pullreq.repositoryName, pullreq.branch, pullreq.issueId,
pullreq.requestUserName, pullreq.requestRepositoryName, pullreq.requestBranch) pullreq.requestUserName, pullreq.requestRepositoryName, pullreq.requestBranch)

25
src/test/scala/gitbucket/core/service/IssuesServiceSpec.scala
View File

@@ -6,43 +6,42 @@ import org.scalatest.FunSuite
class IssuesServiceSpec extends FunSuite with ServiceSpecBase { class IssuesServiceSpec extends FunSuite with ServiceSpecBase {
test("getCommitStatues") { withTestDB { implicit session => test("getCommitStatues") {
withTestDB { implicit session =>
val user1 = generateNewUserWithDBRepository("user1","repo1") val user1 = generateNewUserWithDBRepository("user1","repo1")
def getCommitStatues = List( def getCommitStatues(issueId: Int) = dummyService.getCommitStatues("user1","repo1",issueId)
dummyService.getCommitStatues("user1","repo1",1),
dummyService.getCommitStatues("user1","repo1",2)
)
assert(getCommitStatues == Map.empty) assert(getCommitStatues(1) == None)
val now = new java.util.Date() val now = new java.util.Date()
val issueId = generateNewIssue("user1","repo1") val issueId = generateNewIssue("user1","repo1")
assert(issueId == 1) assert(issueId == 1)
assert(getCommitStatues == Map.empty) assert(getCommitStatues(1) == None)
val cs = dummyService.createCommitStatus("user1","repo1","shasha", "default", CommitState.SUCCESS, Some("http://exmple.com/ci"), Some("exampleService"), now, user1) val cs = dummyService.createCommitStatus("user1","repo1","shasha", "default", CommitState.SUCCESS, Some("http://exmple.com/ci"), Some("exampleService"), now, user1)
assert(getCommitStatues == Map.empty) assert(getCommitStatues(1) == None)
val (is2, pr2) = generateNewPullRequest("user1/repo1/master","user1/repo1/feature1") val (is2, pr2) = generateNewPullRequest("user1/repo1/master","user1/repo1/feature1")
assert(pr2.issueId == 2) assert(pr2.issueId == 2)
// if there are no statuses, state is none // if there are no statuses, state is none
assert(getCommitStatues == Map.empty) assert(getCommitStatues(2) == None)
// if there is a status, state is that // if there is a status, state is that
val cs2 = dummyService.createCommitStatus("user1","repo1","feature1", "default", CommitState.SUCCESS, Some("http://exmple.com/ci"), Some("exampleService"), now, user1) val cs2 = dummyService.createCommitStatus("user1","repo1","feature1", "default", CommitState.SUCCESS, Some("http://exmple.com/ci"), Some("exampleService"), now, user1)
assert(getCommitStatues == Map(("user1","repo1",2) -> CommitStatusInfo(1,1,Some("default"),Some(CommitState.SUCCESS),Some("http://exmple.com/ci"),Some("exampleService")))) assert(getCommitStatues(2) == Some(CommitStatusInfo(1,1,Some("default"),Some(CommitState.SUCCESS),Some("http://exmple.com/ci"),Some("exampleService"))))
// if there are two statuses, state is none // if there are two statuses, state is none
val cs3 = dummyService.createCommitStatus("user1","repo1","feature1", "pend", CommitState.PENDING, Some("http://exmple.com/ci"), Some("exampleService"), now, user1) val cs3 = dummyService.createCommitStatus("user1","repo1","feature1", "pend", CommitState.PENDING, Some("http://exmple.com/ci"), Some("exampleService"), now, user1)
assert(getCommitStatues == Map(("user1","repo1",2) -> CommitStatusInfo(2,1,None,None,None,None))) assert(getCommitStatues(2) == Some(CommitStatusInfo(2,1,None,None,None,None)))
// get only statuses in query issues // get only statuses in query issues
val (is3, pr3) = generateNewPullRequest("user1/repo1/master","user1/repo1/feature3") val (is3, pr3) = generateNewPullRequest("user1/repo1/master","user1/repo1/feature3")
val cs4 = dummyService.createCommitStatus("user1","repo1","feature3", "none", CommitState.PENDING, None, None, now, user1) val cs4 = dummyService.createCommitStatus("user1","repo1","feature3", "none", CommitState.PENDING, None, None, now, user1)
assert(getCommitStatues == Map(("user1","repo1",2) -> CommitStatusInfo(2,1,None,None,None,None))) assert(getCommitStatues(2) == Some(CommitStatusInfo(2,1,None,None,None,None)))
} } }
}
} }