Fix tests, this time, this time for sure.

DanielG · Sep 8, 2015 · dbf215a · dbf215a
1 parent 7ae22a9
commit dbf215a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/Language/Haskell/GhcMod/Utils.hs b/Language/Haskell/GhcMod/Utils.hs
@@ -216,6 +216,5 @@ findFilesWith' f (d:ds) fileName = do
 makeAbsolute' :: FilePath -> IO FilePath
 makeAbsolute' = (normalise <$>) . absolutize
   where absolutize path -- avoid the call to `getCurrentDirectory` if we can
-          | isRelative path = (</> path) . addTrailingPathSeparator <$>
-                              getCurrentDirectory
+          | isRelative path = (</> path) <$> getCurrentDirectory
           | otherwise       = return path
diff --git a/test/CabalHelperSpec.hs b/test/CabalHelperSpec.hs
@@ -9,7 +9,6 @@ import Language.Haskell.GhcMod.Error
 import Test.Hspec
 import System.Directory
 import System.FilePath
-import System.Process (readProcess, system)
 import Prelude
 
 import Dir

diff --git a/test/PathsAndFilesSpec.hs b/test/PathsAndFilesSpec.hs
@@ -35,13 +35,14 @@ spec = do
 
     describe "findStackConfigFile" $ do
         it "works" $ do
-            findStackConfigFile "test/data/stack-project" `shouldReturn` Just "test/data/stack-project/stack.yaml"
+            p <- U.makeAbsolute' "test/data/stack-project/stack.yaml"
+            findStackConfigFile "test/data/stack-project" `shouldReturn` Just p
 
     describe "findCabalSandboxDir" $ do
         it "works" $ do
-            p <- U.makeAbsolute' "test/data/cabal-project/cabalapi.cabal"
+            p <- U.makeAbsolute' "test/data/cabal-project"
             findCabalSandboxDir "test/data/cabal-project" `shouldReturn` Just p
 
         it "finds sandboxes in parent directories" $ do
-            p <- U.makeAbsolute' "test/data/cabal-project/"
+            p <- U.makeAbsolute' "test/data/cabal-project"
             findCabalSandboxDir "test/data/cabal-project/subdir1/subdir2" `shouldReturn` Just p