on master help sign in
Merge pull request #67 from sol/master

Make sure that all tests work with hspec-1.1.0

commit22d4b752bd108796951f0cee6a25fcfe2ff181cb authorMichael Snoyman <michael@snoyman.com> dateMon 7 May 2012, 10:42 (14 years ago) parentcf90f436ee1a8a
3 files changed+2−6
wai-app-static/test/WaiAppStaticTest.hs−4 wai-app-static/wai-app-static.cabal+1−1 wai-extra/wai-extra.cabal+1−1
wai-app-static/test/WaiAppStaticTest.hs−4
@@ -11,7 +11,6 @@ import Data.List (isInfixOf)
1111import qualified Data.ByteString.Char8 as S8
1212-- import qualified Data.ByteString.Lazy.Char8 as L8
1313import qualified Data.Text as T
14−import qualified Data.Text.Encoding as TE
1514import System.PosixCompat.Files (getFileStatus, modificationTime)
1615
1716import Network.HTTP.Date
@@ -21,10 +20,7 @@ import Network.HTTP.Date
2120import Network.Wai
2221import Network.Wai.Test
2322
24−import Network.Socket.Internal as Sock
25−import qualified Network.HTTP.Types as H
2623import Control.Monad.IO.Class (liftIO)
27−import Data.Monoid (mempty)
2824
2925defRequest :: Request
3026defRequest = defaultRequest
wai-app-static/wai-app-static.cabal+1−1
@@ -65,7 +65,7 @@ test-suite runtests
6565 type: exitcode-stdio-1.0
6666
6767 build-depends: base >= 4 && < 5
68− , hspec >= 0.8 && < 0.10
68+ , hspec >= 0.8 && < 1.2
6969 , HUnit
7070 , unix-compat >= 0.2
7171 , time >= 1.1.4
wai-extra/wai-extra.cabal+1−1
@@ -63,7 +63,7 @@ test-suite tests
6363 build-depends: base >= 4 && < 5
6464 , wai-extra
6565 , wai-test
66− , hspec >= 0.8 && < 0.10
66+ , hspec >= 0.8 && < 1.2
6767 , HUnit
6868
6969 , wai