From 80c55789b55d58009099a290c9eea6e325cc12f6 Mon Sep 17 00:00:00 2001 From: Joe Nelson Date: Tue, 14 Oct 2014 10:30:23 -0700 Subject: [PATCH] Remove getHeader, fixes #77 --- test/Feature/InsertSpec.hs | 2 +- test/SpecHelper.hs | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/test/Feature/InsertSpec.hs b/test/Feature/InsertSpec.hs index 607b834b3..de85d7442 100644 --- a/test/Feature/InsertSpec.hs +++ b/test/Feature/InsertSpec.hs @@ -39,7 +39,7 @@ spec = around appWithFixture $ do simpleBody p `shouldBe` "" simpleHeaders p `shouldSatisfy` matchHeader hLocation "/auto_incrementing_pk\\?id=eq\\.[0-9]+" simpleStatus p `shouldBe` created201 - let Just location = getHeader hLocation $ simpleHeaders p + let Just location = lookup hLocation $ simpleHeaders p r <- get location let [record] = fromJust (JSON.decode $ simpleBody r :: Maybe [IncPK]) liftIO $ do diff --git a/test/SpecHelper.hs b/test/SpecHelper.hs index c8e886a20..46c8264b8 100644 --- a/test/SpecHelper.hs +++ b/test/SpecHelper.hs @@ -75,12 +75,9 @@ rangeHdrs r = [rangeUnit, (hRange, renderByteRange r)] rangeUnit :: Header rangeUnit = ("Range-Unit" :: CI BS.ByteString, "items") -getHeader :: CI BS.ByteString -> [Header] -> Maybe BS.ByteString -getHeader = lookup - matchHeader :: CI BS.ByteString -> String -> [Header] -> Bool matchHeader name valRegex headers = - maybe False (=~ valRegex) $ getHeader name headers + maybe False (=~ valRegex) $ lookup name headers authHeader :: String -> String -> Header authHeader user pass =