78280dc · typeable/servant

git.iko.soy/typeable/servant

Disable hspec colored output in servant-swagger doctests

Colored output is the default since hspec 2.9.5. This causes CI failures due to terminal escaping characters when running the doctests on GitHub Actions.

commit78280dc2672edac8551c5447d78203543ca0e0d4 authorGaël Deest <gael.deest@tweag.io> dateTue 19 Apr 2022, 10:46 (4 years ago) parentc19ed0f

2 files changed+4

compare with master

unifiedsplit

servant-swagger/src/Servant/Swagger.hs+2 servant-swagger/src/Servant/Swagger/Internal/Test.hs+2

servant-swagger/src/Servant/Swagger.hs+2

@@ -55,6 +55,7 @@ import Servant.Swagger.Internal.Orphans ()

5555-- >>> import Data.Typeable

5656-- >>> import GHC.Generics

5757-- >>> import Servant.API

58+-- >>> import System.Environment

5859-- >>> import Test.Hspec

5960-- >>> import Test.QuickCheck

6061-- >>> import qualified Data.ByteString.Lazy.Char8 as BSL8

@@ -64,6 +65,7 @@ import Servant.Swagger.Internal.Orphans ()

6465-- >>> :set -XGeneralizedNewtypeDeriving

6566-- >>> :set -XOverloadedStrings

6667-- >>> :set -XTypeOperators

68+-- >>> setEnv "HSPEC_COLOR" "no"

6769-- >>> data User = User { name :: String, age :: Int } deriving (Show, Generic, Typeable)

6870-- >>> newtype UserId = UserId Integer deriving (Show, Generic, Typeable, ToJSON)

6971-- >>> instance ToJSON User

servant-swagger/src/Servant/Swagger/Internal/Test.hs+2

@@ -29,10 +29,12 @@ import Servant.Swagger.Internal.TypeLevel

2929-- >>> import Control.Applicative

3030-- >>> import GHC.Generics

3131-- >>> import Test.QuickCheck

32+-- >>> import System.Environment (setEnv)

3233-- >>> :set -XDeriveGeneric

3334-- >>> :set -XGeneralizedNewtypeDeriving

3435-- >>> :set -XDataKinds

3536-- >>> :set -XTypeOperators

37+-- >>> setEnv "HSPEC_COLOR" "no"

3638

3739-- | Verify that every type used with @'JSON'@ content type in a servant API

3840-- has compatible @'ToJSON'@ and @'ToSchema'@ instances using @'validateToJSON'@.