diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-07-28 19:38:43 +0800 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-07-28 19:38:43 +0800 |
commit | 8b14cd206e008b4001f9b257f48870c8d40e8498 (patch) | |
tree | c335308af4e1ec2417368421bb97a5c56aaf686e /cask/test/src | |
parent | 755eb8cd839ef1c34886db12056ac1aa56c0caaa (diff) | |
download | cask-8b14cd206e008b4001f9b257f48870c8d40e8498.tar.gz cask-8b14cd206e008b4001f9b257f48870c8d40e8498.tar.bz2 cask-8b14cd206e008b4001f9b257f48870c8d40e8498.zip |
first pass at a readme
Diffstat (limited to 'cask/test/src')
-rw-r--r-- | cask/test/src/test/cask/Decorated.scala | 2 | ||||
-rw-r--r-- | cask/test/src/test/cask/ExampleTests.scala | 25 | ||||
-rw-r--r-- | cask/test/src/test/cask/FormJsonPost.scala | 9 | ||||
-rw-r--r-- | cask/test/src/test/cask/MultipartFileUploads.scala | 16 | ||||
-rw-r--r-- | cask/test/src/test/cask/VariableRoutes.scala | 4 |
5 files changed, 21 insertions, 35 deletions
diff --git a/cask/test/src/test/cask/Decorated.scala b/cask/test/src/test/cask/Decorated.scala index bd27647..ed377cf 100644 --- a/cask/test/src/test/cask/Decorated.scala +++ b/cask/test/src/test/cask/Decorated.scala @@ -1,6 +1,6 @@ package test.cask -import cask.model.ParamContext +import cask.model.ParamContext object Decorated extends cask.MainRoutes{ class User{ diff --git a/cask/test/src/test/cask/ExampleTests.scala b/cask/test/src/test/cask/ExampleTests.scala index e5be3bf..1a5cf23 100644 --- a/cask/test/src/test/cask/ExampleTests.scala +++ b/cask/test/src/test/cask/ExampleTests.scala @@ -38,17 +38,17 @@ object ExampleTests extends TestSuite{ requests.get(host + "/user").statusCode ==> 404 - requests.get(host + "/post/123?query=xyz&query=abc").text() ==> + requests.get(host + "/post/123?param=xyz¶m=abc").text() ==> "Post 123 ArrayBuffer(xyz, abc)" requests.get(host + "/post/123").text() ==> - """Missing argument: (query: Seq[String]) + """Missing argument: (param: Seq[String]) | |Arguments provided did not match expected signature: | |showPost | postId Int - | query Seq[String] + | param Seq[String] | |""".stripMargin @@ -67,15 +67,6 @@ object ExampleTests extends TestSuite{ resp.history.get.statusCode ==> 301 } - 'MultipartFileUploads - test(MultipartFileUploads){ host => - val resp = requests.post( - host + "/upload", - data = requests.MultiPart( - requests.MultiItem("image", "...", "my-best-image.txt") - ) - ) - resp.text() ==> "my-best-image.txt" - } 'FormJsonPost - test(FormJsonPost){ host => requests.post(host + "/json", data = """{"value1": true, "value2": [3]}""").text() ==> "OK true Vector(3)" @@ -84,7 +75,15 @@ object ExampleTests extends TestSuite{ host + "/form", data = Seq("value1" -> "hello", "value2" -> "1", "value2" -> "2") ).text() ==> - "OK Plain(hello,null) List(1, 2)" + "OK FormValue(hello,null) List(1, 2)" + + val resp = requests.post( + host + "/upload", + data = requests.MultiPart( + requests.MultiItem("image", "...", "my-best-image.txt") + ) + ) + resp.text() ==> "my-best-image.txt" } 'Decorated - test(Decorated){ host => requests.get(host + "/hello/woo").text() ==> "woo31337" diff --git a/cask/test/src/test/cask/FormJsonPost.scala b/cask/test/src/test/cask/FormJsonPost.scala index 0be4480..9db3d24 100644 --- a/cask/test/src/test/cask/FormJsonPost.scala +++ b/cask/test/src/test/cask/FormJsonPost.scala @@ -1,7 +1,5 @@ package test.cask -import cask.FormValue - object FormJsonPost extends cask.MainRoutes{ @cask.postJson("/json") def jsonEndpoint(value1: ujson.Js.Value, value2: Seq[Int]) = { @@ -9,10 +7,15 @@ object FormJsonPost extends cask.MainRoutes{ } @cask.postForm("/form") - def formEndpoint(value1: FormValue, value2: Seq[Int]) = { + def formEndpoint(value1: cask.FormValue, value2: Seq[Int]) = { "OK " + value1 + " " + value2 } + @cask.postForm("/upload") + def uploadFile(image: cask.FormFile) = { + image.fileName + } + initialize() } diff --git a/cask/test/src/test/cask/MultipartFileUploads.scala b/cask/test/src/test/cask/MultipartFileUploads.scala deleted file mode 100644 index 11b6ec6..0000000 --- a/cask/test/src/test/cask/MultipartFileUploads.scala +++ /dev/null @@ -1,16 +0,0 @@ -package test.cask - -import io.undertow.server.HttpServerExchange -import io.undertow.server.handlers.form.FormData - -object MultipartFileUploads extends cask.MainRoutes{ - // curl -F "image=@build.sc" localhost:8080/upload - @cask.post("/upload") - def uploadFile(formData: FormData) = { - val file = formData.getFirst("image") - file.getFileName - } - - initialize() -} - diff --git a/cask/test/src/test/cask/VariableRoutes.scala b/cask/test/src/test/cask/VariableRoutes.scala index d1816ab..c997d39 100644 --- a/cask/test/src/test/cask/VariableRoutes.scala +++ b/cask/test/src/test/cask/VariableRoutes.scala @@ -7,8 +7,8 @@ object VariableRoutes extends cask.MainRoutes{ } @cask.get("/post/:postId") - def showPost(postId: Int, query: Seq[String]) = { - s"Post $postId $query" + def showPost(postId: Int, param: Seq[String]) = { + s"Post $postId $param" } @cask.get("/path", subpath = true) |