From 6248372477cf3ab1a00bfe068abc90d606a750ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gr=C3=B6ber?= Date: Fri, 14 Aug 2015 09:50:20 +0200 Subject: [PATCH] Fix tests for 7.10 --- test/FindSpec.hs | 3 ++- test/TargetSpec.hs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/FindSpec.hs b/test/FindSpec.hs index 55e84df..99fe3aa 100644 --- a/test/FindSpec.hs +++ b/test/FindSpec.hs @@ -1,6 +1,7 @@ module FindSpec where import Language.Haskell.GhcMod.Find +import Control.Monad import Test.Hspec import TestUtils @@ -8,5 +9,5 @@ spec :: Spec spec = do describe "db <- loadSymbolDb" $ do it "lookupSymbol' db \"head\" contains at least `Data.List'" $ do - db <- runD loadSymbolDb + db <- runD $ loadSymbolDb =<< (cradleTempDir `liftM` cradle) lookupSym "head" db `shouldContain` [ModuleString "Data.List"] diff --git a/test/TargetSpec.hs b/test/TargetSpec.hs index 5fc1466..9207b65 100644 --- a/test/TargetSpec.hs +++ b/test/TargetSpec.hs @@ -41,6 +41,6 @@ spec = do it "Works when a module given as path uses CPP" $ do dir <- getCurrentDirectory let srcDirs = [dir "test/data/target/src"] - x <- withLightHscEnv [] $ \env -> runNullLog $ do + x <- withLightHscEnv [] $ \env -> runD $ do resolveModule env srcDirs (Left $ dir "test/data/target/Cpp.hs") liftIO $ x `shouldBe` Just (ModulePath "Cpp" $ dir "test/data/target/Cpp.hs")