Merge pull request #13 from lihaoyi-databricks/wip0.2.3

Upstream some fixes

2 files changed, 3 insertions, 3 deletions

diff --git a/example/todo/app/src/TodoServer.scala b/example/todo/app/src/TodoServer.scala
index 4adb55c..1a58d09 100644
--- a/example/todo/app/src/TodoServer.scala
+++ b/example/todo/app/src/TodoServer.scala
@@ -17,7 +17,7 @@ object TodoServer 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/todo/app/test/src/ExampleTests.scala b/example/todo/app/test/src/ExampleTests.scala
index e8ca7eb..e1be23c 100644
--- a/example/todo/app/test/src/ExampleTests.scala
+++ b/example/todo/app/test/src/ExampleTests.scala
@@ -1,7 +1,7 @@
 package app
 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 = io.undertow.Undertow.builder
       .addHttpListener(8080, "localhost")
       .setHandler(example.defaultHandler)
@@ -13,7 +13,7 @@ object ExampleTests extends TestSuite{
     res
   }
   val tests = Tests{
-    'TodoServer - test(TodoServer){ host =>
+    test("TodoServer") - withServer(TodoServer){ host =>
       val page = requests.get(host).text()
       assert(page.contains("What needs to be done?"))
     }