117a2cc · servant · git.iko.soy

git.iko.soy/servant

on master help sign in

Merge pull request #1583 from haskell-servant/hspec-no-color

117a2ccGaël Deest4 years ago

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

compare with master

unifiedsplit

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

55-- >>> import Data.Typeable

56-- >>> import GHC.Generics

57-- >>> import Servant.API

58+-- >>> import System.Environment

58-- >>> import Test.Hspec

59-- >>> import Test.Hspec

59-- >>> import Test.QuickCheck

60-- >>> import Test.QuickCheck

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

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

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

64-- >>> :set -XGeneralizedNewtypeDeriving

65-- >>> :set -XGeneralizedNewtypeDeriving

65-- >>> :set -XOverloadedStrings

66-- >>> :set -XOverloadedStrings

66-- >>> :set -XTypeOperators

67-- >>> :set -XTypeOperators

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

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

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

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

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

69-- >>> instance ToJSON User

71-- >>> instance ToJSON User

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

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

29-- >>> import Control.Applicative

30-- >>> import GHC.Generics

31-- >>> import Test.QuickCheck

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

32-- >>> :set -XDeriveGeneric

33-- >>> :set -XDeriveGeneric

33-- >>> :set -XGeneralizedNewtypeDeriving

34-- >>> :set -XGeneralizedNewtypeDeriving

34-- >>> :set -XDataKinds

35-- >>> :set -XDataKinds

35-- >>> :set -XTypeOperators

36-- >>> :set -XTypeOperators

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

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

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

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

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