Merge 3bd7a09 into 9c5dc87

scotty-web · Sep 24, 2014 · 92f537c · 92f537c
2 parents 9c5dc87 + 3bd7a09
commit 92f537c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/scotty.cabal b/scotty.cabal
@@ -99,7 +99,7 @@ test-suite spec
                        lifted-base,
                        wai,
                        hspec2,
-                       hspec-wai >= 0.4.1,
+                       hspec-wai >= 0.5,
                        scotty
   GHC-options:         -Wall -fno-warn-orphans
 

diff --git a/test/Web/ScottySpec.hs b/test/Web/ScottySpec.hs
@@ -98,11 +98,11 @@ spec = do
           get "/scotty" `shouldRespondWith` modernGreekText
 
         it "sets Content-Type header to \"text/plain; charset=utf-8\"" $ do
-          get "/scotty" `shouldRespondWith` 200 {matchHeaders = [("Content-Type", "text/plain; charset=utf-8")]}
+          get "/scotty" `shouldRespondWith` 200 {matchHeaders = ["Content-Type" <:> "text/plain; charset=utf-8"]}
 
       withApp (Scotty.get "/scotty" $ setHeader "Content-Type" "text/somethingweird" >> text modernGreekText) $ do
         it "doesn't override a previously set Content-Type header" $ do
-          get "/scotty" `shouldRespondWith` 200 {matchHeaders = [("Content-Type", "text/somethingweird")]}
+          get "/scotty" `shouldRespondWith` 200 {matchHeaders = ["Content-Type" <:> "text/somethingweird"]}
 
     describe "html" $ do
       let russianLanguageTextInHtml :: IsString a => a
@@ -113,13 +113,13 @@ spec = do
           get "/scotty" `shouldRespondWith` russianLanguageTextInHtml
 
         it "sets Content-Type header to \"text/html; charset=utf-8\"" $ do
-          get "/scotty" `shouldRespondWith` 200 {matchHeaders = [("Content-Type", "text/html; charset=utf-8")]}
+          get "/scotty" `shouldRespondWith` 200 {matchHeaders = ["Content-Type" <:> "text/html; charset=utf-8"]}
 
       withApp (Scotty.get "/scotty" $ setHeader "Content-Type" "text/somethingweird" >> html russianLanguageTextInHtml) $ do
         it "doesn't override a previously set Content-Type header" $ do
-          get "/scotty" `shouldRespondWith` 200 {matchHeaders = [("Content-Type", "text/somethingweird")]}
+          get "/scotty" `shouldRespondWith` 200 {matchHeaders = ["Content-Type" <:> "text/somethingweird"]}
 
     describe "json" $ do
       withApp (Scotty.get "/scotty" $ setHeader "Content-Type" "text/somethingweird" >> json (Just (5::Int))) $ do
         it "doesn't override a previously set Content-Type header" $ do
-          get "/scotty" `shouldRespondWith` 200 {matchHeaders = [("Content-Type", "text/somethingweird")]}
+          get "/scotty" `shouldRespondWith` 200 {matchHeaders = ["Content-Type" <:> "text/somethingweird"]}