Merge branch 'master' into step-suite

mumoshu · Dec 30, 2009 · 5d2fa0b · 5d2fa0b
2 parents a2f0c49 + 6ae29b0
commit 5d2fa0b
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 3 deletions.
diff --git a/src/main/scala/Step.scala b/src/main/scala/Step.scala
@@ -63,7 +63,7 @@ abstract class Step extends HttpServlet
 	_request.withValue(request) {
 	  _response.withValue(response) {
 	    _session.withValue(request) {
-              paramsMap.withValue(args ++ realParams) {
+              paramsMap.withValue(args ++ realParams withDefaultValue(null)) {
 		response.getWriter print route.action()
               }
 	    }
@@ -79,7 +79,7 @@ abstract class Step extends HttpServlet
   }
 
   def before(fun: => Any) = fun
-  def params(name: String) = paramsMap value name
+  def params = paramsMap value
   def redirect(uri: String) = (_response value) sendRedirect uri
   def request = _request value
   def session = _session value

diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
@@ -14,5 +14,11 @@
     <url-pattern>/*</url-pattern>
   </servlet-mapping>
 
+  <servlet-mapping>
+    <servlet-name>default</servlet-name>
+    <url-pattern>/images/*</url-pattern>
+    <url-pattern>/css/*</url-pattern>
+    <url-pattern>/js/*</url-pattern>
+  </servlet-mapping>
 
 </web-app>
diff --git a/src/main/webapp/css/put_css_here b/src/main/webapp/css/put_css_here
@@ -0,0 +1 @@
+
diff --git a/src/main/webapp/images/put_images_here b/src/main/webapp/images/put_images_here
@@ -0,0 +1 @@
+
diff --git a/src/main/webapp/js/put_js_here b/src/main/webapp/js/put_js_here
@@ -0,0 +1 @@
+
diff --git a/src/test/scala/StepTest.scala b/src/test/scala/StepTest.scala
@@ -24,7 +24,10 @@ class TestServlet extends Step {
   }
 
   post("/post/test") {
-    params("posted_value")
+    params("posted_value") match {
+      case null => "posted_value is null"
+      case s => s
+    }
   }
 
   post("/post/:test/val") {
@@ -213,4 +216,13 @@ class StepTest extends FunSuite with ShouldMatchers {
     response.parse(tester.getResponses(request.generate))
     response.getContent should equal ("host:1.2.3.4,port:")
   }
+
+  test("POST /post/test without params return \"posted_value is null\"") {
+    request.setMethod("POST")
+    request.setURI("/post/test")
+    request.addHeader("Content-Type", "application/x-www-form-urlencoded")
+    request.setContent("")
+    response.parse(tester.getResponses(request.generate()))
+    response.getContent should equal ("posted_value is null")
+  }
 }