StaticFiles and RedirectAbort tests

4 files changed, 17 insertions, 5 deletions

diff --git a/cask/resources/cask/example.txt b/cask/resources/cask/example.txt
new file mode 100644
index 0000000..5184576
--- /dev/null
+++ b/cask/resources/cask/example.txt
@@ -0,0 +1 @@
+the quick brown fox jumps over the lazy dog
\ No newline at end of file
diff --git a/cask/src/cask/model/Response.scala b/cask/src/cask/model/Response.scala
index 3166656..23e029b 100644
--- a/cask/src/cask/model/Response.scala
+++ b/cask/src/cask/model/Response.scala
@@ -55,11 +55,11 @@ case class Abort(code: Int) extends BaseResponse {
 
 case class Static(path: String) extends BaseResponse {
   val relPath = java.nio.file.Paths.get(path)
-  val (data0: BaseResponse.Data, statusCode0) =
+  val (data0, statusCode0) =
     if (java.nio.file.Files.exists(relPath) && java.nio.file.Files.isRegularFile(relPath)){
-      (java.nio.file.Files.newInputStream(relPath), 200)
+      (java.nio.file.Files.newInputStream(relPath): BaseResponse.Data, 200)
     }else{
-      ("", 404)
+      ("": BaseResponse.Data, 404)
     }
   override def data = data0
 
diff --git a/cask/test/src/test/cask/ExampleTests.scala b/cask/test/src/test/cask/ExampleTests.scala
index f521660..2ecdcd6 100644
--- a/cask/test/src/test/cask/ExampleTests.scala
+++ b/cask/test/src/test/cask/ExampleTests.scala
@@ -41,7 +41,7 @@ object ExampleTests extends TestSuite{
       requests.get(host + "/user").statusCode ==> 404
 
 
-      requests.get(host + "/post/123?query=xyz&query=abc") ==>
+      requests.get(host + "/post/123?query=xyz&query=abc").text() ==>
         "Post 123 ArrayBuffer(xyz, abc)"
 
       requests.get(host + "/post/123").text() ==>
@@ -58,5 +58,16 @@ object ExampleTests extends TestSuite{
       requests.get(host + "/path/one/two/three").text() ==>
         "Subpath List(one, two, three)"
     }
+
+    'StaticFiles - test(StaticFiles){ host =>
+      requests.get(host + "/static/example.txt").text() ==>
+        "the quick brown fox jumps over the lazy dog"
+    }
+
+    'RedirectAbort - test(RedirectAbort){ host =>
+      val resp = requests.get(host + "/")
+      resp.statusCode ==> 401
+      resp.history.get.statusCode ==> 301
+    }
   }
 }
diff --git a/cask/test/src/test/cask/StaticFiles.scala b/cask/test/src/test/cask/StaticFiles.scala
index 378988a..d51b35a 100644
--- a/cask/test/src/test/cask/StaticFiles.scala
+++ b/cask/test/src/test/cask/StaticFiles.scala
@@ -7,7 +7,7 @@ object StaticFiles extends cask.MainRoutes{
   }
 
   @cask.static("/static")
-  def staticRoutes = "cask/test/src/test/cask"
+  def staticRoutes = "cask/resources/cask"
 
   initialize()
 }