From 90a56784eb6c1d9d8ae48a96b2c8d55bfae1c7d4 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 9 Aug 2010 17:53:33 +0300
Subject: [PATCH] Tests build again

---
 Yesod/Content.hs | 4 ++--
 Yesod/Json.hs    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Yesod/Content.hs b/Yesod/Content.hs
index b21e0f59..48ffd145 100644
--- a/Yesod/Content.hs
+++ b/Yesod/Content.hs
@@ -245,8 +245,8 @@ propExt s =
 
 caseTypeByExt :: Assertion
 caseTypeByExt = do
-    typeJavascript @=? typeByExt (ext "foo.js")
-    typeHtml @=? typeByExt (ext "foo.html")
+    Just typeJavascript @=? lookup (ext "foo.js") typeByExt
+    Just typeHtml @=? lookup (ext "foo.html") typeByExt
 #endif
 
 -- | Format a 'UTCTime' in W3 format; useful for setting cookies.
diff --git a/Yesod/Json.hs b/Yesod/Json.hs
index 0b78fc06..46b1ba00 100644
--- a/Yesod/Json.hs
+++ b/Yesod/Json.hs
@@ -130,10 +130,10 @@ caseSimpleOutput = do
     let j = do
         jsonMap
             [ ("foo" , jsonList
-                [ jsonScalar $ fromByteString "bar"
-                , jsonScalar $ fromByteString "baz"
+                [ jsonScalar "bar"
+                , jsonScalar "baz"
                 ])
             ]
-    "{\"foo\":[\"bar\",\"baz\"]}" @=? unpack (renderHtml $ unJson j)
+    "{\"foo\":[\"bar\",\"baz\"]}" @=? unpack (toLazyByteString $ unJson j)
 
 #endif