diff --git a/src/test/scala/gitbucket/core/service/ProtectedBranchServiceSpec.scala b/src/test/scala/gitbucket/core/service/ProtectedBranchServiceSpec.scala index b839b60..ce91e28 100644 --- a/src/test/scala/gitbucket/core/service/ProtectedBranchServiceSpec.scala +++ b/src/test/scala/gitbucket/core/service/ProtectedBranchServiceSpec.scala @@ -53,7 +53,8 @@ it("getBranchProtectedReason on force push from admin") { withTestDB { implicit session => 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) generateNewUserWithDBRepository("user1", "repo1") assert(receiveHook.preReceive("user1", "repo1", rp, rc, "user1") == None) @@ -65,7 +66,8 @@ it("getBranchProtectedReason on force push from other") { withTestDB { implicit session => 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) generateNewUserWithDBRepository("user1", "repo1") assert(receiveHook.preReceive("user1", "repo1", rp, rc, "user2") == None) @@ -77,7 +79,8 @@ it("getBranchProtectedReason check status on push from other") { withTestDB { implicit session => 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 user1 = generateNewUserWithDBRepository("user1", "repo1") assert(receiveHook.preReceive("user1", "repo1", rp, rc, "user2") == None) @@ -97,7 +100,8 @@ it("getBranchProtectedReason check status on push from admin") { withTestDB { implicit session => 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 user1 = generateNewUserWithDBRepository("user1", "repo1") assert(receiveHook.preReceive("user1", "repo1", rp, rc, "user1") == None) diff --git a/src/test/scala/gitbucket/core/service/ServiceSpecBase.scala b/src/test/scala/gitbucket/core/service/ServiceSpecBase.scala index 87eb29a..d5ec292 100644 --- a/src/test/scala/gitbucket/core/service/ServiceSpecBase.scala +++ b/src/test/scala/gitbucket/core/service/ServiceSpecBase.scala @@ -28,7 +28,8 @@ org.h2.Driver.load() using(DriverManager.getConnection(url, user, pass)){ conn => 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) } Database.forURL(url, user, pass).withSession { session =>