(refs #815)Upgrade Scalatra to 2.4.0

This commit is contained in:
Naoki Takezoe
2015-12-30 05:16:22 +09:00
parent 990d082422
commit 4457a317e6
23 changed files with 18 additions and 19 deletions

View File

@@ -18,7 +18,7 @@ import java.util.Date
import java.io.File
object GitSpecUtil {
def withTestFolder[U](f: File => U) {
def withTestFolder[U](f: File => U): U = {
val folder = new File(System.getProperty("java.io.tmpdir"), "test-" + System.nanoTime)
if(!folder.mkdirs()){
throw new java.io.IOException("can't create folder "+folder.getAbsolutePath)
@@ -29,7 +29,7 @@ object GitSpecUtil {
FileUtils.deleteQuietly(folder)
}
}
def withTestRepository[U](f: Git => U) = withTestFolder(folder => using(Git.open(createTestRepository(folder)))(f))
def withTestRepository[U](f: Git => U): U = withTestFolder(folder => using(Git.open(createTestRepository(folder)))(f))
def createTestRepository(dir: File): File = {
RepositoryCache.clear()
FileUtils.deleteQuietly(dir)