Hello community, here is the log from the commit of package ghc-wai-extra for openSUSE:Factory checked in at 2020-09-30 19:53:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-wai-extra (Old) and /work/SRC/openSUSE:Factory/.ghc-wai-extra.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-wai-extra" Wed Sep 30 19:53:43 2020 rev:3 rq:838497 version:3.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-wai-extra/ghc-wai-extra.changes 2020-08-28 21:41:07.084881515 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-wai-extra.new.4249/ghc-wai-extra.changes 2020-09-30 19:53:49.440754276 +0200 @@ -1,0 +2,21 @@ +Tue Sep 22 09:35:49 UTC 2020 - psim...@suse.com + +- Update wai-extra to version 3.1.0. + Upstream has edited the change log file since the last release in + a non-trivial way, i.e. they did more than just add a new entry + at the top. You can review the file at: + http://hackage.haskell.org/package/wai-extra-3.1.0/src/ChangeLog.md + +------------------------------------------------------------------- +Fri Sep 18 02:00:38 UTC 2020 - psim...@suse.com + +- Update wai-extra to version 3.0.31. + ## 3.0.31 + + * Undo WaiTestFailure change in previous release + + ## 3.0.30 + + * `Network.Wai.Test`: Add support source locations to assertion primitives [#812](https://github.com/yesodweb/wai/pull/812) + +------------------------------------------------------------------- Old: ---- wai-extra-3.0.29.2.tar.gz New: ---- wai-extra-3.1.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-wai-extra.spec ++++++ --- /var/tmp/diff_new_pack.VdpOPs/_old 2020-09-30 19:53:50.196754952 +0200 +++ /var/tmp/diff_new_pack.VdpOPs/_new 2020-09-30 19:53:50.200754955 +0200 @@ -19,17 +19,19 @@ %global pkg_name wai-extra %bcond_with tests Name: ghc-%{pkg_name} -Version: 3.0.29.2 +Version: 3.1.0 Release: 0 Summary: Provides some basic WAI handlers and middleware License: MIT URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-HUnit-devel BuildRequires: ghc-aeson-devel BuildRequires: ghc-ansi-terminal-devel BuildRequires: ghc-base64-bytestring-devel BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-call-stack-devel BuildRequires: ghc-case-insensitive-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-cookie-devel @@ -57,7 +59,6 @@ BuildRequires: ghc-word8-devel BuildRequires: ghc-zlib-devel %if %{with tests} -BuildRequires: ghc-HUnit-devel BuildRequires: ghc-hspec-devel %endif ++++++ wai-extra-3.0.29.2.tar.gz -> wai-extra-3.1.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-extra-3.0.29.2/ChangeLog.md new/wai-extra-3.1.0/ChangeLog.md --- old/wai-extra-3.0.29.2/ChangeLog.md 2020-05-26 05:33:27.000000000 +0200 +++ new/wai-extra-3.1.0/ChangeLog.md 2020-09-21 12:43:49.000000000 +0200 @@ -1,5 +1,21 @@ # Changelog for wai-extra +## 3.1.0 + +* `Network.Wai.Test`: Add support for source locations to assertion primitives [#817](https://github.com/yesodweb/wai/pull/817) + +## 3.0.32 + +* Undo previous two release, restore code from 3.0.29.2 + +## 3.0.31 + +* Undo WaiTestFailure change in previous release + +## 3.0.30 + +* `Network.Wai.Test`: Add support for source locations to assertion primitives [#812](https://github.com/yesodweb/wai/pull/812) + ## 3.0.29.2 * flush SSE headers early [#804](https://github.com/yesodweb/wai/pull/804) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-extra-3.0.29.2/Network/Wai/Test.hs new/wai-extra-3.1.0/Network/Wai/Test.hs --- old/wai-extra-3.0.29.2/Network/Wai/Test.hs 2020-02-17 08:07:12.000000000 +0100 +++ new/wai-extra-3.1.0/Network/Wai/Test.hs 2020-09-21 12:43:49.000000000 +0200 @@ -29,7 +29,6 @@ , assertClientCookieExists , assertNoClientCookieExists , assertClientCookieValue - , WaiTestFailure (..) ) where #if __GLASGOW_HASKELL__ < 710 @@ -62,6 +61,8 @@ import qualified Data.Text.Encoding as TE import Data.IORef import Data.Time.Clock (getCurrentTime) +import qualified Test.HUnit as HUnit +import Data.CallStack (HasCallStack) -- | -- @@ -206,20 +207,16 @@ where (s, h, withBody) = responseToStream res -assertBool :: String -> Bool -> Session () +assertBool :: HasCallStack => String -> Bool -> Session () assertBool s b = unless b $ assertFailure s -assertString :: String -> Session () +assertString :: HasCallStack => String -> Session () assertString s = unless (null s) $ assertFailure s -assertFailure :: String -> Session () -assertFailure msg = msg `deepseq` liftIO (throwIO (WaiTestFailure msg)) +assertFailure :: HasCallStack => String -> Session () +assertFailure = liftIO . HUnit.assertFailure -data WaiTestFailure = WaiTestFailure String - deriving (Show, Eq, Typeable) -instance Exception WaiTestFailure - -assertContentType :: ByteString -> SResponse -> Session () +assertContentType :: HasCallStack => ByteString -> SResponse -> Session () assertContentType ct SResponse{simpleHeaders = h} = case lookup "content-type" h of Nothing -> assertString $ concat @@ -236,7 +233,7 @@ where go = S8.takeWhile (/= ';') -assertStatus :: Int -> SResponse -> Session () +assertStatus :: HasCallStack => Int -> SResponse -> Session () assertStatus i SResponse{simpleStatus = s} = assertBool (concat [ "Expected status code " , show i @@ -246,7 +243,7 @@ where sc = H.statusCode s -assertBody :: L.ByteString -> SResponse -> Session () +assertBody :: HasCallStack => L.ByteString -> SResponse -> Session () assertBody lbs SResponse{simpleBody = lbs'} = assertBool (concat [ "Expected response body " , show $ L8.unpack lbs @@ -254,7 +251,7 @@ , show $ L8.unpack lbs' ]) $ lbs == lbs' -assertBodyContains :: L.ByteString -> SResponse -> Session () +assertBodyContains :: HasCallStack => L.ByteString -> SResponse -> Session () assertBodyContains lbs SResponse{simpleBody = lbs'} = assertBool (concat [ "Expected response body to contain " , show $ L8.unpack lbs @@ -264,7 +261,7 @@ where strict = S.concat . L.toChunks -assertHeader :: CI ByteString -> ByteString -> SResponse -> Session () +assertHeader :: HasCallStack => CI ByteString -> ByteString -> SResponse -> Session () assertHeader header value SResponse{simpleHeaders = h} = case lookup header h of Nothing -> assertString $ concat @@ -283,7 +280,7 @@ , show value' ]) (value == value') -assertNoHeader :: CI ByteString -> SResponse -> Session () +assertNoHeader :: HasCallStack => CI ByteString -> SResponse -> Session () assertNoHeader header SResponse{simpleHeaders = h} = case lookup header h of Nothing -> return () @@ -297,7 +294,7 @@ -- | -- -- Since 3.0.6 -assertClientCookieExists :: String -> ByteString -> Session () +assertClientCookieExists :: HasCallStack => String -> ByteString -> Session () assertClientCookieExists s cookieName = do cookies <- getClientCookies assertBool s $ Map.member cookieName cookies @@ -305,7 +302,7 @@ -- | -- -- Since 3.0.6 -assertNoClientCookieExists :: String -> ByteString -> Session () +assertNoClientCookieExists :: HasCallStack => String -> ByteString -> Session () assertNoClientCookieExists s cookieName = do cookies <- getClientCookies assertBool s $ not $ Map.member cookieName cookies @@ -313,7 +310,7 @@ -- | -- -- Since 3.0.6 -assertClientCookieValue :: String -> ByteString -> ByteString -> Session () +assertClientCookieValue :: HasCallStack => String -> ByteString -> ByteString -> Session () assertClientCookieValue s cookieName cookieValue = do cookies <- getClientCookies case Map.lookup cookieName cookies of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-extra-3.0.29.2/wai-extra.cabal new/wai-extra-3.1.0/wai-extra.cabal --- old/wai-extra-3.0.29.2/wai-extra.cabal 2020-05-26 05:33:27.000000000 +0200 +++ new/wai-extra-3.1.0/wai-extra.cabal 2020-09-21 12:43:49.000000000 +0200 @@ -1,5 +1,5 @@ Name: wai-extra -Version: 3.0.29.2 +Version: 3.1.0 Synopsis: Provides some basic WAI handlers and middleware. description: Provides basic WAI handler and middleware functionality: @@ -87,7 +87,7 @@ default: False Library - Build-Depends: base >= 4.8 && < 5 + Build-Depends: base >= 4.10 && < 5 , bytestring >= 0.10.4 , wai >= 3.0.3.0 && < 3.3 , old-locale >= 1.0.0.2 && < 1.1 @@ -116,6 +116,8 @@ , aeson , iproute , http2 + , HUnit + , call-stack if os(windows) cpp-options: -DWINDOWS
