diff --git a/src/tests/IHaskell/Test/Eval.hs b/src/tests/IHaskell/Test/Eval.hs index b2d3cffe..b1aa6f42 100644 --- a/src/tests/IHaskell/Test/Eval.hs +++ b/src/tests/IHaskell/Test/Eval.hs @@ -6,7 +6,6 @@ module IHaskell.Test.Eval (testEval) where import Prelude -import Data.List (stripPrefix) import Control.Monad (when, forM_) import Data.IORef (newIORef, modifyIORef, readIORef) import System.Directory (getTemporaryDirectory, setCurrentDirectory) @@ -18,7 +17,6 @@ import qualified GHC.Paths import Test.Hspec import IHaskell.Eval.Evaluate (interpret, evaluate) -import IHaskell.IPython (defaultKernelSpecOptions) import IHaskell.Test.Util (strip) import IHaskell.Types (Display(..), DisplayData(..), EvaluationResult(..), KernelState(..), LintStatus(..), MimeType(..), defaultKernelState, extractPlain) @@ -157,16 +155,23 @@ testEval = it "evaluates :in directive" $ do #if MIN_VERSION_ghc(8,10,0) - (displays, output) <- eval ":in String" + (displays, _output) <- eval ":in String" displays `shouldBe` [ManyDisplay [Display [ DisplayData PlainText "type String :: *\ntype String = [Char]\n \t-- Defined in \8216GHC.Base\8217" , DisplayData MimeHtml "
type String :: *
\ntype String = [Char]
\t
-- Defined in \8216GHC.Base\8217
" ]]] +#elif MIN_VERSION_ghc(8,6,0) + (displays, _output) <- eval ":in String" + displays `shouldBe` [ManyDisplay [Display [ + DisplayData PlainText "type String = [Char] \t-- Defined in `GHC.Base'" + , DisplayData MimeHtml "
type String = [Char] \t-- Defined in `GHC.Base'
" + ]]] #else - ":in String" `becomes` [ManyDisplay [Display [ - DisplayData PlainText "type String :: *\ntype String = [Char]\n \t-- Defined in \8216GHC.Base\8217"] - ]] + (displays, _output) <- eval ":in String" + displays `shouldBe` [ManyDisplay [Display [ + DisplayData PlainText "type String :: *\ntype String = [Char]\n \t-- Defined in \8216GHC.Base\8217"] + ]] #endif it "captures stderr" $ do