Taught StepTests to accept any HttpServlet as a route

scalatra · May 5, 2010 · 705b57a · 705b57a
1 parent e538444
commit 705b57a
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/core/src/main/scala/com/thinkminimo/step/StepTests.scala b/core/src/main/scala/com/thinkminimo/step/StepTests.scala
@@ -5,7 +5,9 @@ import java.net.URLEncoder.encode
 import org.mortbay.jetty.testing.HttpTester
 import org.mortbay.jetty.testing.ServletTester
 import org.mortbay.jetty.Handler
+import org.mortbay.jetty.servlet.ServletHolder
 import java.nio.charset.Charset
+import javax.servlet.http.HttpServlet
 
 trait StepTests {
   implicit def httpTesterToStepHttpTester(t: HttpTester) = new StepHttpTester(t)
@@ -57,6 +59,8 @@ trait StepTests {
   // map a servlet to the path
   def route(servlet: Class[_], path: String) = tester.addServlet(servlet, path)
 
+  def route(servlet: HttpServlet, path: String) = tester.getContext().addServlet(new ServletHolder(servlet), path)
+
   def routeFilter(filter: Class[_], path: String) = tester.addFilter(filter, path, Handler.DEFAULT)
 
   def get(uri: String)(f: => Unit): Unit = withResponse(httpRequest("GET", uri), f)