Update compilers (0.15.11, 0.15.12) (#664)

Author: thomashoneyman

app/test/App/API.purs

@@ -105,15 +105,15 @@ spec = do
     -- the fixtures directory.
     enterCleanEnv :: FilePath -> Aff PipelineEnv
     enterCleanEnv workdir = do
-      Env.loadEnvFile (Path.concat [ "..", ".env.example" ])
+      Env.loadEnvFile ".env.example"
 
       -- FIXME: The publish pipeline probably shouldn't require this. But...the
       -- publish pipeline requires that there be a 'types' directory containing
       -- dhall types for the registry in the current working directory.
-      FS.Extra.copy { from: Path.concat [ "..", "types" ], to: Path.concat [ workdir, "types" ], preserveTimestamps: true }
+      FS.Extra.copy { from: "types", to: Path.concat [ workdir, "types" ], preserveTimestamps: true }
 
       testFixtures <- liftAff Tmp.mkTmpDir
-      let copyFixture path = FS.Extra.copy { from: Path.concat [ "fixtures", path ], to: Path.concat [ testFixtures, path ], preserveTimestamps: true }
+      let copyFixture path = FS.Extra.copy { from: Path.concat [ "app", "fixtures", path ], to: Path.concat [ testFixtures, path ], preserveTimestamps: true }
 
       -- Set up a clean fixtures environment.
       liftAff do

app/test/App/CLI/Licensee.purs

@@ -10,7 +10,7 @@ import Test.Spec as Spec
 
 spec :: Spec.Spec Unit
 spec = do
-  let fixtures = Path.concat [ "fixtures", "manifest-files", "halogen-hooks" ]
+  let fixtures = Path.concat [ "app", "fixtures", "manifest-files", "halogen-hooks" ]
 
   Spec.it "Detects from directory" do
     detected <- Licensee.detect fixtures
@@ -62,7 +62,7 @@ readFiles = do
   pure { license, packageJson, spagoDhall, bowerJson }
 
 fixtureFile :: FilePath -> FilePath
-fixtureFile file = Path.concat [ "fixtures", "manifest-files", "halogen-hooks", file ]
+fixtureFile file = Path.concat [ "app", "fixtures", "manifest-files", "halogen-hooks", file ]
 
 readLicense :: Aff String
 readLicense = FS.Aff.readTextFile UTF8 $ fixtureFile "LICENSE"

app/test/App/CLI/PursVersions.purs

@@ -41,6 +41,8 @@ knownCompilers = map (unsafeFromRight <<< Version.parse)
   , "0.15.8"
   , "0.15.9"
   , "0.15.10"
+  , "0.15.11"
+  , "0.15.12"
   ]
 
 spec :: Spec.Spec Unit

app/test/App/GitHubIssue.purs

@@ -7,6 +7,7 @@ import Registry.App.Prelude
 import Data.Argonaut.Parser as Argonaut.Parser
 import Data.Codec.Argonaut as CA
 import Data.Map as Map
+import Node.Path as Path
 import Registry.App.GitHubIssue as GitHubIssue
 import Registry.Foreign.Octokit (IssueNumber(..))
 import Registry.Operation (PackageOperation(..), PackageSetOperation(..))
@@ -35,7 +36,7 @@ decodeEventsToOps = do
         , location: Nothing
         }
 
-    res <- GitHubIssue.readOperation "fixtures/update_issue_comment.json"
+    res <- GitHubIssue.readOperation $ Path.concat [ "app", "fixtures", "update_issue_comment.json" ]
     res `Assert.shouldEqual` GitHubIssue.DecodedOperation issueNumber username (Right operation)
 
   Spec.it "decodes an Addition operation" do
@@ -50,7 +51,7 @@ decodeEventsToOps = do
         , resolutions: Just $ Map.fromFoldable [ Utils.unsafePackageName "prelude" /\ Utils.unsafeVersion "1.0.0" ]
         }
 
-    res <- GitHubIssue.readOperation "fixtures/addition_issue_created.json"
+    res <- GitHubIssue.readOperation $ Path.concat [ "app", "fixtures", "addition_issue_created.json" ]
     res `Assert.shouldEqual` GitHubIssue.DecodedOperation issueNumber username (Right operation)
 
   Spec.it "decodes a Package Set Update operation" do
@@ -65,7 +66,7 @@ decodeEventsToOps = do
             ]
         }
 
-    res <- GitHubIssue.readOperation "fixtures/package-set-update_issue_created.json"
+    res <- GitHubIssue.readOperation $ Path.concat [ "app", "fixtures", "package-set-update_issue_created.json" ]
     res `Assert.shouldEqual` GitHubIssue.DecodedOperation issueNumber username (Left operation)
 
   Spec.it "decodes lenient JSON" do

flake.lock

@@ -15,7 +15,7 @@ import Test.Spec as Spec
 spec :: Spec Unit
 spec = do
   Spec.it "Round-trips manifest fixtures" do
-    let manifestFixturesPath = Path.concat [ "fixtures", "manifests" ]
+    let manifestFixturesPath = Path.concat [ "lib", "fixtures", "manifests" ]
     fixturePaths <- FS.Aff.readdir manifestFixturesPath
     fixtures <- for fixturePaths \path -> do
       rawManifest <- FS.Aff.readTextFile UTF8 $ Path.concat [ manifestFixturesPath, path ]

lib/test/Registry/Manifest.purs

@@ -47,15 +47,15 @@ hooksSpagoHash :: Sha256.Sha256
 hooksSpagoHash = Utils.fromRight "Failed to parse Sha256" $ Sha256.parse "sha256-fN9RUAzN21ZY4Y0UwqUSxwUPVz1g7/pcqoDvbJZoT04="
 
 hooksSpago :: FilePath
-hooksSpago = Path.concat [ "fixtures", "packages", "halogen-hooks-0.5.0", "spago.dhall" ]
+hooksSpago = Path.concat [ "lib", "fixtures", "packages", "halogen-hooks-0.5.0", "spago.dhall" ]
 
 -- Test hash produced by `openssl`:
 -- openssl dgst -sha256 -binary < fixtures/packages/halogen-hooks-0.5.0/LICENSE | openssl base64 -A
 hooksLicenseHash :: Sha256.Sha256
 hooksLicenseHash = Utils.fromRight "Failed to parse Sha256" $ Sha256.parse "sha256-wOzNcCq20TAL/LMT1lYIiaoEIFGDBw+yp14bj7qK9v4="
 
 hooksLicense :: FilePath
-hooksLicense = Path.concat [ "fixtures", "packages", "halogen-hooks-0.5.0", "LICENSE" ]
+hooksLicense = Path.concat [ "lib", "fixtures", "packages", "halogen-hooks-0.5.0", "LICENSE" ]
 
 sha256Nix :: FilePath -> ExceptT String Aff Sha256.Sha256
 sha256Nix path = ExceptT do