Test psc-publish as part of the main test suite

hdgarrood · garyb · commit ab7e5f6bf641 · 2015-12-13T12:48:28.000Z
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "tests/support/prelude"]
+	path = tests/support/prelude
+	url = https://github.com/purescript/purescript-prelude
diff --git a/purescript.cabal b/purescript.cabal
@@ -261,10 +261,12 @@ test-suite tests
     build-depends: base >=4 && <5, containers -any, directory -any,
                    filepath -any, mtl -any, parsec -any, purescript -any,
                    transformers -any, process -any, transformers-compat -any, time -any,
-                   Glob -any, base-compat >=0.6.0
+                   Glob -any, aeson-better-errors -any, bytestring -any, aeson -any,
+                   base-compat -any
     type: exitcode-stdio-1.0
     main-is: Main.hs
     other-modules: TestsSetup
+                   TestPscPublish
     buildable: True
     hs-source-dirs: tests tests/common
 
diff --git a/tests/Main.hs b/tests/Main.hs
@@ -68,6 +68,7 @@ import qualified System.FilePath.Glob as Glob
 import Text.Parsec (ParseError)
 
 import TestsSetup
+import TestPscPublish
 
 modulesDir :: FilePath
 modulesDir = ".test_modules" </> "node_modules"
@@ -171,6 +172,11 @@ assertDoesNotCompile inputFiles foreigns = do
 
 main :: IO ()
 main = do
+  testCompiler
+  testPscPublish
+
+testCompiler :: IO ()
+testCompiler = do
   fetchSupportCode
   cwd <- getCurrentDirectory
 
@@ -203,6 +209,10 @@ main = do
         in putStrLn $ fp' ++ ": " ++ err
       exitFailure
 
+testPscPublish :: IO ()
+testPscPublish = do
+  testPackage "tests/support/prelude"
+
 supportModules :: [String]
 supportModules =
   [ "Control.Monad.Eff.Class"
diff --git a/tests/TestPscPublish.hs b/tests/TestPscPublish.hs
@@ -2,33 +2,24 @@
 {-# OPTIONS_GHC -fno-warn-unused-imports #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
--- | To run these tests:
---
--- * `cabal repl psc-publish`
--- * `:l psc-publish/tests/Test.hs`
--- * `test`
-
-module Test where
+module TestPscPublish where
 
 import Control.Monad
 import Control.Applicative
 import Control.Exception
 import System.Process
 import System.Directory
+import System.IO
+import System.Exit
 import qualified Data.ByteString.Lazy as BL
 import Data.ByteString.Lazy (ByteString)
 import qualified Data.Aeson as A
 import Data.Aeson.BetterErrors
 import Data.Version
 
-import Main
 import Language.PureScript.Docs
 import Language.PureScript.Publish
 
-pkgName = "purescript-prelude"
-packageUrl = "https://github.com/purescript/" ++ pkgName
-packageDir = "tmp/" ++ pkgName
-
 pushd :: forall a. FilePath -> IO a -> IO a
 pushd dir act = do
   original <- getCurrentDirectory
@@ -37,44 +28,12 @@ pushd dir act = do
   setCurrentDirectory original
   either throwIO return result
 
-clonePackage :: IO ()
-clonePackage = do
-  createDirectoryIfMissing True packageDir
-  pushd packageDir $ do
-    exists <- doesDirectoryExist ".git"
-    unless exists $ do
-      putStrLn ("Cloning " ++ pkgName ++ " into " ++ packageDir ++ "...")
-      readProcess "git" ["clone", packageUrl, "."] "" >>= putStr
-      readProcess "git" ["tag", "v999.0.0"] "" >>= putStr
-
-bowerInstall :: IO ()
-bowerInstall =
-  pushd packageDir $
-    readProcess "bower" ["install"] "" >>= putStr
-
-testRunOptions :: PublishOptions
-testRunOptions = defaultPublishOptions
-  { publishGetVersion = return testVersion
-  }
-  where testVersion = ("v999.0.0", Version [999,0,0] [])
-
-getPackage :: IO UploadedPackage
-getPackage = do
-  clonePackage
-  bowerInstall
-  pushd packageDir $ preparePackage testRunOptions
-
 data TestResult
   = ParseFailed String
   | Mismatch ByteString ByteString -- ^ encoding before, encoding after
   | Pass ByteString
   deriving (Show, Read)
 
--- | Test JSON encoding/decoding; parse the package, roundtrip to/from JSON,
--- and check we get the same string.
-test :: IO TestResult
-test = roundTrip <$> getPackage
-
 roundTrip :: UploadedPackage -> TestResult
 roundTrip pkg =
   let before = A.encode pkg
@@ -85,3 +44,22 @@ roundTrip pkg =
          if before == after
            then Pass before
            else Mismatch before after
+
+testRunOptions :: PublishOptions
+testRunOptions = defaultPublishOptions
+  { publishGetVersion = return testVersion
+  }
+  where testVersion = ("v999.0.0", Version [999,0,0] [])
+
+-- | Given a directory which contains a package, produce JSON from it, and then
+-- | attempt to parse it again, and ensure that it doesn't change.
+testPackage :: String -> IO ()
+testPackage dir = do
+  pushd dir $ do
+    r <- roundTrip <$> preparePackage testRunOptions
+    case r of
+      Pass _ -> pure ()
+      other -> do
+        hPutStrLn stderr ("psc-publish tests failed on " ++ dir ++ ":")
+        hPutStrLn stderr (show other)
+        exitFailure
diff --git a/tests/support/prelude b/tests/support/prelude
@@ -0,0 +1 @@
+Subproject commit 5b8da18fd7b8d57a85df49ec64099a81b13f42f7

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[submodule "tests/support/prelude"]`
	`2`	`+ path = tests/support/prelude`
	`3`	`+ url = https://github.com/purescript/purescript-prelude`