Update tests to select libdir based on cradle

Author: fendor

haskell-ide-engine.cabal

@@ -246,6 +246,8 @@ test-suite plugin-dispatcher-test
   main-is:             Main.hs
   build-depends:       base
                      , data-default
+                     , directory
+                     , filepath
                      , haskell-ide-engine
                      , haskell-lsp-types
                      , hie-plugin-api

test/dispatcher/Main.hs

@@ -13,6 +13,7 @@ import qualified Data.Text as T
 import           Data.Default
 import           GHC                            ( TypecheckedModule )
 import           GHC.Generics
+import qualified Haskell.Ide.Engine.Cradle as Bios
 import           Haskell.Ide.Engine.MonadTypes
 import           Haskell.Ide.Engine.PluginUtils
 import           Haskell.Ide.Engine.Scheduler
@@ -25,7 +26,7 @@ import           System.FilePath
 
 import           Test.Hspec
 import           Test.Hspec.Runner
-import System.IO
+import           System.IO
 
 -- ---------------------------------------------------------------------
 -- plugins
@@ -71,14 +72,16 @@ startServer :: IO (Scheduler IO, TChan LogVal, ThreadId)
 startServer = do
   scheduler <- newScheduler plugins testOptions
   logChan  <- newTChanIO
+  cwd <- getCurrentDirectory
+  crdl <- Bios.findLocalCradle (cwd </> "File.hs")
   dispatcher <- forkIO $ do
     flushStackEnvironment
     runScheduler
       scheduler
       (\lid errCode e -> logToChan logChan ("received an error", Left (lid, errCode, e)))
       (\g x -> g x)
       def
-      Nothing
+      (Just crdl)
 
   return (scheduler, logChan, dispatcher)
 

test/plugin-dispatcher/Main.hs

@@ -7,13 +7,16 @@ import           Control.Concurrent.STM.TChan
 import           Control.Monad.STM
 import qualified Data.Text as T
 import           Data.Default
+import qualified Haskell.Ide.Engine.Cradle as Bios
 import           Haskell.Ide.Engine.MonadTypes
 import           Haskell.Ide.Engine.Scheduler
 import           Haskell.Ide.Engine.Types
 import           Language.Haskell.LSP.Types
 import           TestUtils
 import           Test.Hspec
 import           Test.Hspec.Runner
+import           System.Directory (getCurrentDirectory)
+import           System.FilePath
 
 -- ---------------------------------------------------------------------
 
@@ -42,11 +45,14 @@ newPluginSpec = do
 
       let makeReq = sendRequest scheduler
 
+      cwd <- getCurrentDirectory
+      crdl <- Bios.findLocalCradle (cwd </> "File.hs")
+
       pid <- forkIO $ runScheduler scheduler
                               (\_ _ _ -> return ())
                               (\f x -> f x)
                               def
-                              Nothing
+                              (Just crdl)
 
       updateDocument scheduler (filePathToUri "test") 3
       sendRequest scheduler req0

test/utils/TestUtils.hs

@@ -31,6 +31,7 @@ import           Data.Maybe
 -- import qualified GhcMod.Types as GM
 import qualified Language.Haskell.LSP.Core as Core
 import           Haskell.Ide.Engine.MonadTypes
+import qualified Haskell.Ide.Engine.Cradle as Bios
 import           System.Directory
 import           System.Environment
 import           System.FilePath
@@ -74,7 +75,10 @@ makeRequest plugin com arg = runPluginCommand plugin com (toJSON arg)
 runIGM :: IdePlugins -> IdeGhcM a -> IO a
 runIGM testPlugins f = do
   stateVar <- newTVarIO $ IdeState emptyModuleCache Map.empty Map.empty Nothing
-  runIdeGhcM Nothing testPlugins Nothing stateVar f
+  cwd <- getCurrentDirectory
+  crdl <- Bios.findLocalCradle (cwd </> "File.hs")
+  mlibdir <- Bios.getProjectGhcLibDir crdl
+  runIdeGhcM mlibdir testPlugins Nothing stateVar f
 
 withFileLogging :: FilePath -> IO a -> IO a
 withFileLogging logFile f = do