diff options
Diffstat (limited to 'example/todoDb')
| -rw-r--r-- | example/todoDb/app/src/TodoMvcDb.scala | 2 | ||||
| -rw-r--r-- | example/todoDb/app/test/src/ExampleTests.scala | 4 | ||||
| -rw-r--r-- | example/todoDb/build.sc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/example/todoDb/app/src/TodoMvcDb.scala b/example/todoDb/app/src/TodoMvcDb.scala index 7ce3c50..669b2b8 100644 --- a/example/todoDb/app/src/TodoMvcDb.scala +++ b/example/todoDb/app/src/TodoMvcDb.scala @@ -16,7 +16,7 @@ object TodoMvcDb extends cask.MainRoutes{ class transactional extends cask.Decorator{ class TransactionFailed(val value: Router.Result.Error) extends Exception - def wrapFunction(pctx: cask.Request, delegate: Delegate): Returned = { + def wrapFunction(pctx: cask.Request, delegate: Delegate): OuterReturned = { try ctx.transaction( delegate(Map()) match{ case Router.Result.Success(t) => Router.Result.Success(t) diff --git a/example/todoDb/app/test/src/ExampleTests.scala b/example/todoDb/app/test/src/ExampleTests.scala index eccd913..77cbbb3 100644 --- a/example/todoDb/app/test/src/ExampleTests.scala +++ b/example/todoDb/app/test/src/ExampleTests.scala @@ -4,7 +4,7 @@ import io.undertow.Undertow import utest._ object ExampleTests extends TestSuite{ - def test[T](example: cask.main.BaseMain)(f: String => T): T = { + def withServer[T](example: cask.main.BaseMain)(f: String => T): T = { val server = Undertow.builder .addHttpListener(8080, "localhost") .setHandler(example.defaultHandler) @@ -17,7 +17,7 @@ object ExampleTests extends TestSuite{ } val tests = Tests{ - 'TodoMvcDb - test(TodoMvcDb){ host => + test("TodoMvcDb") - withServer(TodoMvcDb){ host => requests.get(s"$host/list/all").text() ==> """[{"id":1,"checked":true,"text":"Get started with Cask"},{"id":2,"checked":false,"text":"Profit!"}]""" requests.get(s"$host/list/active").text() ==> diff --git a/example/todoDb/build.sc b/example/todoDb/build.sc index e2afdfc..589af39 100644 --- a/example/todoDb/build.sc +++ b/example/todoDb/build.sc @@ -12,7 +12,7 @@ trait AppModule extends ScalaModule{ def testFrameworks = Seq("utest.runner.Framework") def ivyDeps = Agg( - ivy"com.lihaoyi::utest::0.6.9", + ivy"com.lihaoyi::utest::0.7.1", ivy"com.lihaoyi::requests::0.2.0", ) } |