Fix tests for 7.10

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"]

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")