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

Scalaz's <| is deprecated

Browse Source
This commit is contained in:
Naoki Takezoe
2016-09-28 14:05:40 +09:00
parent f73daaef44
commit 53f6190267
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/test/scala/gitbucket/core/service/ProtectedBranchServiceSpec.scala
View File

@@ -53,7 +53,8 @@ class ProtectedBranchServiceSpec extends FunSpec with ServiceSpecBase with Prote
it("getBranchProtectedReason on force push from admin") { it("getBranchProtectedReason on force push from admin") {
withTestDB { implicit session => withTestDB { implicit session =>
withTestRepository { git => withTestRepository { git =>
val rp = new ReceivePack(git.getRepository) <| { _.setAllowNonFastForwards(true) } val rp = new ReceivePack(git.getRepository)
rp.setAllowNonFastForwards(true)
val rc = new ReceiveCommand(ObjectId.fromString(sha), ObjectId.fromString(sha2), "refs/heads/branch", ReceiveCommand.Type.UPDATE_NONFASTFORWARD) val rc = new ReceiveCommand(ObjectId.fromString(sha), ObjectId.fromString(sha2), "refs/heads/branch", ReceiveCommand.Type.UPDATE_NONFASTFORWARD)
generateNewUserWithDBRepository("user1", "repo1") generateNewUserWithDBRepository("user1", "repo1")
assert(receiveHook.preReceive("user1", "repo1", rp, rc, "user1") == None) assert(receiveHook.preReceive("user1", "repo1", rp, rc, "user1") == None)
@@ -65,7 +66,8 @@ class ProtectedBranchServiceSpec extends FunSpec with ServiceSpecBase with Prote
it("getBranchProtectedReason on force push from other") { it("getBranchProtectedReason on force push from other") {
withTestDB { implicit session => withTestDB { implicit session =>
withTestRepository { git => withTestRepository { git =>
val rp = new ReceivePack(git.getRepository) <| { _.setAllowNonFastForwards(true) } val rp = new ReceivePack(git.getRepository)
rp.setAllowNonFastForwards(true)
val rc = new ReceiveCommand(ObjectId.fromString(sha), ObjectId.fromString(sha2), "refs/heads/branch", ReceiveCommand.Type.UPDATE_NONFASTFORWARD) val rc = new ReceiveCommand(ObjectId.fromString(sha), ObjectId.fromString(sha2), "refs/heads/branch", ReceiveCommand.Type.UPDATE_NONFASTFORWARD)
generateNewUserWithDBRepository("user1", "repo1") generateNewUserWithDBRepository("user1", "repo1")
assert(receiveHook.preReceive("user1", "repo1", rp, rc, "user2") == None) assert(receiveHook.preReceive("user1", "repo1", rp, rc, "user2") == None)
@@ -77,7 +79,8 @@ class ProtectedBranchServiceSpec extends FunSpec with ServiceSpecBase with Prote
it("getBranchProtectedReason check status on push from other") { it("getBranchProtectedReason check status on push from other") {
withTestDB { implicit session => withTestDB { implicit session =>
withTestRepository { git => withTestRepository { git =>
val rp = new ReceivePack(git.getRepository) <| { _.setAllowNonFastForwards(false) } val rp = new ReceivePack(git.getRepository)
rp.setAllowNonFastForwards(false)
val rc = new ReceiveCommand(ObjectId.fromString(sha), ObjectId.fromString(sha2), "refs/heads/branch", ReceiveCommand.Type.UPDATE) val rc = new ReceiveCommand(ObjectId.fromString(sha), ObjectId.fromString(sha2), "refs/heads/branch", ReceiveCommand.Type.UPDATE)
val user1 = generateNewUserWithDBRepository("user1", "repo1") val user1 = generateNewUserWithDBRepository("user1", "repo1")
assert(receiveHook.preReceive("user1", "repo1", rp, rc, "user2") == None) assert(receiveHook.preReceive("user1", "repo1", rp, rc, "user2") == None)
@@ -97,7 +100,8 @@ class ProtectedBranchServiceSpec extends FunSpec with ServiceSpecBase with Prote
it("getBranchProtectedReason check status on push from admin") { it("getBranchProtectedReason check status on push from admin") {
withTestDB { implicit session => withTestDB { implicit session =>
withTestRepository { git => withTestRepository { git =>
val rp = new ReceivePack(git.getRepository) <| { _.setAllowNonFastForwards(false) } val rp = new ReceivePack(git.getRepository)
rp.setAllowNonFastForwards(false)
val rc = new ReceiveCommand(ObjectId.fromString(sha), ObjectId.fromString(sha2), "refs/heads/branch", ReceiveCommand.Type.UPDATE) val rc = new ReceiveCommand(ObjectId.fromString(sha), ObjectId.fromString(sha2), "refs/heads/branch", ReceiveCommand.Type.UPDATE)
val user1 = generateNewUserWithDBRepository("user1", "repo1") val user1 = generateNewUserWithDBRepository("user1", "repo1")
assert(receiveHook.preReceive("user1", "repo1", rp, rc, "user1") == None) assert(receiveHook.preReceive("user1", "repo1", rp, rc, "user1") == None)

3
src/test/scala/gitbucket/core/service/ServiceSpecBase.scala
View File

@@ -28,7 +28,8 @@ trait ServiceSpecBase {
org.h2.Driver.load() org.h2.Driver.load()
using(DriverManager.getConnection(url, user, pass)){ conn => using(DriverManager.getConnection(url, user, pass)){ conn =>
val solidbase = new Solidbase() val solidbase = new Solidbase()
val db = new H2Database() <| { _.setConnection(new JdbcConnection(conn)) } // TODO Remove setConnection in the future val db = new H2Database()
db.setConnection(new JdbcConnection(conn)) // TODO Remove setConnection in the future
solidbase.migrate(conn, Thread.currentThread.getContextClassLoader, db, GitBucketCoreModule) solidbase.migrate(conn, Thread.currentThread.getContextClassLoader, db, GitBucketCoreModule)
} }
Database.forURL(url, user, pass).withSession { session => Database.forURL(url, user, pass).withSession { session =>