Fix build for ScriptSpec on Windows (#2457)

Author: Blaisorblade

src/Path/Extra.hs

@@ -9,8 +9,14 @@ module Path.Extra
   ,parseCollapsedAbsFile
   ,rejectMissingFile
   ,rejectMissingDir
+  ,pathToByteString
+  ,pathToLazyByteString
   ) where
 
+import qualified Data.ByteString.Lazy.Char8 as BSL
+import qualified Data.ByteString.Char8 as BS
+import qualified Data.Text as T
+import qualified Data.Text.Encoding as T
 import           Control.Monad (liftM)
 import           Control.Monad.Catch
 import           Control.Monad.IO.Class
@@ -94,3 +100,11 @@ rejectMissingDir :: MonadIO m
   -> m (Maybe (Path Abs Dir))
 rejectMissingDir Nothing = return Nothing
 rejectMissingDir (Just p) = bool Nothing (Just p) `liftM` doesDirExist p
+
+-- | Convert to a lazy ByteString using toFilePath and UTF8.
+pathToLazyByteString :: Path b t -> BSL.ByteString
+pathToLazyByteString = BSL.fromStrict . pathToByteString
+
+-- | Convert to a ByteString using toFilePath and UTF8.
+pathToByteString :: Path b t -> BS.ByteString
+pathToByteString = T.encodeUtf8 . T.pack . toFilePath

src/test/Stack/Ghci/PortableFakePaths.hs

@@ -0,0 +1,12 @@
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE CPP #-}
+
+-- | Helpers for writing fake paths for test suite for the GhciScript DSL
+module Stack.Ghci.PortableFakePaths where
+
+defaultDrive :: FilePath
+#ifdef WINDOWS
+defaultDrive = "C:\\"
+#else
+defaultDrive = "/"
+#endif

src/test/Stack/Ghci/ScriptSpec.hs

@@ -9,7 +9,10 @@ import           Data.Monoid
 import qualified Data.Set as S
 import           Distribution.ModuleName
 import           Test.Hspec
+import qualified System.FilePath as FP
+import           Stack.Ghci.PortableFakePaths
 import           Path
+import           Path.Extra (pathToLazyByteString)
 
 import           Stack.Ghci.Script
 
@@ -20,10 +23,11 @@ spec = do
 
       describe "script" $ do
         it "should seperate commands with a newline" $ do
-          let script = cmdCdGhc $(mkAbsDir "/src/package-a")
+          let dir = $(mkAbsDir $ defaultDrive FP.</> "src" FP.</> "package-a")
+              script = cmdCdGhc dir
                     <> cmdAdd [fromString "Lib.A"]
           scriptToLazyByteString script `shouldBe`
-            ":cd-ghc /src/package-a/\n:add Lib.A\n"
+            ":cd-ghc " <> pathToLazyByteString dir <> "\n:add Lib.A\n"
 
       describe ":add" $ do
         it "should not render empty add commands" $ do
@@ -36,15 +40,17 @@ spec = do
 
       describe ":add (by file)" $ do
         it "should render a full file path" $ do
-          let script = cmdAddFile $(mkAbsFile "/Users/someone/src/project/package-a/src/Main.hs")
+          let file = $(mkAbsFile $ defaultDrive FP.</> "Users" FP.</> "someone" FP.</> "src" FP.</> "project" FP.</> "package-a" FP.</> "src" FP.</> "Main.hs")
+              script = cmdAddFile file
           scriptToLazyByteString script `shouldBe`
-            ":add /Users/someone/src/project/package-a/src/Main.hs\n"
+            ":add " <> pathToLazyByteString file <> "\n"
 
       describe ":cd-ghc" $ do
         it "should render a full absolute path" $ do
-          let script = cmdCdGhc $(mkAbsDir "/Users/someone/src/project/package-a")
+          let dir = $(mkAbsDir $ defaultDrive FP.</> "Users" FP.</> "someone" FP.</> "src" FP.</> "project" FP.</> "package-a")
+              script = cmdCdGhc dir
           scriptToLazyByteString script `shouldBe`
-            ":cd-ghc /Users/someone/src/project/package-a/\n"
+            ":cd-ghc " <> pathToLazyByteString dir <> "\n"
 
       describe ":module" $ do
         it "should render empty module as ':module +'" $ do

stack.cabal

@@ -300,6 +300,7 @@ test-suite stack-test
                 , Stack.DotSpec
                 , Stack.GhciSpec
                 , Stack.Ghci.ScriptSpec
+                , Stack.Ghci.PortableFakePaths
                 , Stack.PackageDumpSpec
                 , Stack.ArgsSpec
                 , Stack.NixSpec