Fix faulty flash map test. Main code unaffected.

Flash maps are only swept if the outermost handler says to do so.
scalatra · Jun 29, 2012 · cf76b02 · cf76b02
1 parent 7b940f7
commit cf76b02
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/core/src/test/scala/org/scalatra/FlashMapSupportTest.scala b/core/src/test/scala/org/scalatra/FlashMapSupportTest.scala
@@ -18,11 +18,6 @@ class FlashMapSupportTestServlet extends ScalatraServlet with FlashMapSupport {
   }
 
   get("/unused") {}
-
-  override def sweepUnusedFlashEntries(req: HttpServletRequest) = req.getParameter("sweep") match {
-    case null => false
-    case x => x.toBoolean
-  }
 }
 
 class FlashMapSupportSecondTestServlet extends ScalatraServlet with FlashMapSupport {
@@ -36,6 +31,11 @@ class FlashMapSupportTestFilter extends ScalatraFilter with FlashMapSupport {
   get("/filter") {
     flash.get("message") foreach { x => response.setHeader("message", x.toString) }
   }
+
+  override def sweepUnusedFlashEntries(req: HttpServletRequest) = req.getParameter("sweep") match {
+    case null => false
+    case x => x.toBoolean
+  }
 }
 
 class FlashMapSupportTest extends ScalatraFunSuite {
@@ -102,7 +102,7 @@ class FlashMapSupportTest extends ScalatraFunSuite {
       get("/unused", "sweep" -> "true") {}
 
       get("/message") {
-        header("message") should equal ("posted")
+        header("message") should equal (null)
       }
     }
   }