Supporting sandbox sharing.
Braking backword compatibility of findCradle.
This commit is contained in:
@@ -3,7 +3,7 @@ module CradleSpec where
|
||||
import Control.Applicative
|
||||
import Language.Haskell.GhcMod
|
||||
import System.Directory (canonicalizePath)
|
||||
import System.FilePath (addTrailingPathSeparator, (</>))
|
||||
import System.FilePath ((</>))
|
||||
import Test.Hspec
|
||||
|
||||
import Dir
|
||||
@@ -14,7 +14,7 @@ spec = do
|
||||
it "returns the current directory" $ do
|
||||
withDirectory_ "/" $ do
|
||||
curDir <- canonicalizePath "/"
|
||||
res <- findCradle Nothing "7.4.1"
|
||||
res <- findCradle
|
||||
res `shouldBe` Cradle {
|
||||
cradleCurrentDir = curDir
|
||||
, cradleCabalDir = Nothing
|
||||
@@ -24,7 +24,7 @@ spec = do
|
||||
|
||||
it "finds a cabal file" $ do
|
||||
withDirectory "test/data/subdir1/subdir2" $ \dir -> do
|
||||
res <- relativeCradle dir <$> findCradle Nothing "7.4.1"
|
||||
res <- relativeCradle dir <$> findCradle
|
||||
res `shouldBe` Cradle {
|
||||
cradleCurrentDir = "test" </> "data" </> "subdir1" </> "subdir2"
|
||||
, cradleCabalDir = Just ("test" </> "data")
|
||||
@@ -34,7 +34,7 @@ spec = do
|
||||
|
||||
it "finds a sandbox" $ do
|
||||
withDirectory "test/data/subdir1/subdir2" $ \dir -> do
|
||||
res <- relativeCradle dir <$> findCradle Nothing "7.6.3"
|
||||
res <- relativeCradle dir <$> findCradle
|
||||
res `shouldBe` Cradle {
|
||||
cradleCurrentDir = "test" </> "data" </> "subdir1" </> "subdir2"
|
||||
, cradleCabalDir = Just ("test" </> "data")
|
||||
@@ -42,21 +42,17 @@ spec = do
|
||||
, cradlePackageConf = Just ("test" </> "data" </> ".cabal-sandbox" </> "i386-osx-ghc-7.6.3-packages.conf.d")
|
||||
}
|
||||
|
||||
it "finds a sandbox if exists" $ do
|
||||
it "works even if no cabal and no sandbox exist" $ do
|
||||
withDirectory "/" $ \dir -> do
|
||||
curDir <- canonicalizePath "/"
|
||||
res <- relativeCradle dir <$> findCradle (Just $ addTrailingPathSeparator dir ++ ("test" </> "data" </> ".cabal-sandbox")) "7.6.3"
|
||||
res <- relativeCradle dir <$> findCradle
|
||||
res `shouldBe` Cradle {
|
||||
cradleCurrentDir = curDir
|
||||
, cradleCabalDir = Nothing
|
||||
, cradleCabalFile = Nothing
|
||||
, cradlePackageConf = Just ("test" </> "data" </> ".cabal-sandbox" </> "i386-osx-ghc-7.6.3-packages.conf.d")
|
||||
, cradlePackageConf = Nothing
|
||||
}
|
||||
|
||||
it "throws an error if the sandbox does not exist" $ do
|
||||
withDirectory_ "/" $
|
||||
findCradle (Just "/") "7.4.1" `shouldThrow` anyIOException
|
||||
|
||||
relativeCradle :: FilePath -> Cradle -> Cradle
|
||||
relativeCradle dir cradle = Cradle {
|
||||
cradleCurrentDir = toRelativeDir dir $ cradleCurrentDir cradle
|
||||
|
||||
Reference in New Issue
Block a user