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

Fix testcase

Browse Source
This commit is contained in:
Naoki Takezoe
2017-12-12 12:04:24 +09:00
parent e3c7eb092f
commit dd2e5bfedf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/scala/gitbucket/core/service/MergeServiceSpec.scala
View File

@@ -33,7 +33,7 @@ class MergeServiceSpec extends FunSpec {
assert(service.checkConflictCache("user1", "repo1", branch, issueId) == None) assert(service.checkConflictCache("user1", "repo1", branch, issueId) == None)
val conflicted = service.checkConflict("user1", "repo1", branch, issueId) val conflicted = service.checkConflict("user1", "repo1", branch, issueId)
assert(service.checkConflictCache("user1", "repo1", branch, issueId) == Some(false)) assert(service.checkConflictCache("user1", "repo1", branch, issueId) == Some(false))
assert(conflicted == false) assert(conflicted.isEmpty)
} }
it("checkConflict true if not conflicted, and create cache") { it("checkConflict true if not conflicted, and create cache") {
val repo2Dir = initRepository("user1","repo2") val repo2Dir = initRepository("user1","repo2")
@@ -42,7 +42,7 @@ class MergeServiceSpec extends FunSpec {
} }
assert(service.checkConflictCache("user1", "repo2", branch, issueId) == None) assert(service.checkConflictCache("user1", "repo2", branch, issueId) == None)
val conflicted = service.checkConflict("user1", "repo2", branch, issueId) val conflicted = service.checkConflict("user1", "repo2", branch, issueId)
assert(conflicted == true) assert(conflicted.isDefined)
assert(service.checkConflictCache("user1", "repo2", branch, issueId) == Some(true)) assert(service.checkConflictCache("user1", "repo2", branch, issueId) == Some(true))
} }
} }