Merge pull request #32 from koterpillar/fix-asset-rendering

Fix asset rendering
koterpillar · Dec 26, 2018 · cc0937e · cc0937e
2 parents 4c1eefd + bbf6cc6
commit cc0937e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/src/Render.hs b/src/Render.hs
@@ -2,8 +2,6 @@
 
 module Render where
 
-import qualified Data.ByteString    as B
-
 import           Data.Text          (Text)
 import qualified Data.Text          as Text
 import           Data.Text.Encoding (encodeUtf8)
@@ -29,16 +27,16 @@ withContentType :: ContentType -> Response -> Response
 withContentType ct = setHeaderBS "Content-Type" (encodeUtf8 ct)
 
 newtype Stylesheet =
-    Stylesheet TL.Text
+    Stylesheet { unStylesheet :: TL.Text }
 
 instance ToMessage Stylesheet where
-    toResponse = withContentType css . toResponse
+    toResponse = withContentType css . toResponse . unStylesheet
 
 newtype JavaScript =
-    JavaScript TL.Text
+    JavaScript { unJavaScript :: TL.Text }
 
 instance ToMessage JavaScript where
-    toResponse = withContentType javaScript . toResponse
+    toResponse = withContentType javaScript . toResponse . unJavaScript
 
 data Export content = Export
     { exContent       :: content

diff --git a/testsuite/Integration/TestHome.hs b/testsuite/Integration/TestHome.hs
@@ -50,3 +50,13 @@ test_home_next_page = do
     assertTextContains "Very early article" home
     assertTextContains "Previous page" home
     assertTextNotContains "Next page" home
+
+test_css :: IO ()
+test_css = do
+    css <- makeRequestText $ simpleRequest "/code.css"
+    assertTextContains "color" css
+
+test_js :: IO ()
+test_js = do
+    js <- makeRequestText $ simpleRequest "/site.js"
+    assertTextContains "function" js