Do some tidying up

diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
index e3409a3cd193f5f9d2f670b86b81641c1a1728ca..53827ca27f8f334701613b953ff2c10aa8c95053 100644 (file)
--- a/.github/workflows/haskell.yml
+++ b/.github/workflows/haskell.yml
@@ -49,13 +49,13 @@ jobs:
         cabal install hoogle
         hoogle generate
         popd
-        # cabal v1-install Cabal --constraint "Cabal == 3.0.0.0"
     - name: Install JS Language Server
-      run: npm install javascript-typescript-langserver
+      run: npm install -g javascript-typescript-langserver
     - name: Build
       run: cabal build
     - name: Test
       run: |
         echo $PATH
+        echo $(npm bin)
         export PATH=$PATH:$(npm bin) 
-        cabal run lsp-test:test:tests
+        cabal test

diff --git a/test/Test.hs b/test/Test.hs
index eff7404f0822ae6463467bc6308e5d5a9b92651c..db5124633b7582ea93f593cb2e2d59993e50396b 100644 (file)
--- a/test/Test.hs
+++ b/test/Test.hs
@@ -16,7 +16,7 @@ import           Control.Monad
 import           Control.Lens hiding (List)
 import           GHC.Generics
 import           Language.Haskell.LSP.Messages
-import           Language.Haskell.LSP.Test hiding (runSession)
+import           Language.Haskell.LSP.Test
 import           Language.Haskell.LSP.Test.Replay
 import           Language.Haskell.LSP.Types
 import           Language.Haskell.LSP.Types.Lens as LSP hiding
@@ -27,8 +27,6 @@ import           System.Timeout
 {-# ANN module ("HLint: ignore Reduce duplication" :: String) #-}
 {-# ANN module ("HLint: ignore Unnecessary hiding" :: String) #-}
 
-runSession = runSessionWithConfig (defaultConfig { logStdErr = True })
-
 main = hspec $ do
   describe "Session" $ do
     it "fails a test" $