From c76794f7c895998e3ee0142be2f4e9629c50bafe Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 15 Feb 2021 15:31:23 +0100 Subject: [PATCH] chore: fix tests --- config/test-settings.yml | 1 + src/Handler/Sheet/PersonalisedFiles.hs | 2 ++ test/Handler/Sheet/PersonalisedFilesSpec.hs | 4 +++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/config/test-settings.yml b/config/test-settings.yml index 905639ac1..02db6b3fc 100644 --- a/config/test-settings.yml +++ b/config/test-settings.yml @@ -1,6 +1,7 @@ database: database: "_env:PGDATABASE_TEST:uniworx_test" upload-cache-bucket: "uni2work-test-uploads" +upload-tmp-bucket: "uni2work-test-tmp" log-settings: detailed: true diff --git a/src/Handler/Sheet/PersonalisedFiles.hs b/src/Handler/Sheet/PersonalisedFiles.hs index b53829933..6e97c10d8 100644 --- a/src/Handler/Sheet/PersonalisedFiles.hs +++ b/src/Handler/Sheet/PersonalisedFiles.hs @@ -50,6 +50,8 @@ import qualified Control.Monad.State as State import Control.Monad.Memo (MemoStateT, MonadMemo(..), for2) import Utils.Memo +{-# ANN module ("HLint: ignore Use newtype instead of data" :: String) #-} + data PersonalisedSheetFileUnresolved a = PSFUnresolvedDirectory a diff --git a/test/Handler/Sheet/PersonalisedFilesSpec.hs b/test/Handler/Sheet/PersonalisedFilesSpec.hs index bd41ca2e0..b6dc7f367 100644 --- a/test/Handler/Sheet/PersonalisedFilesSpec.hs +++ b/test/Handler/Sheet/PersonalisedFilesSpec.hs @@ -25,6 +25,8 @@ import Database.Persist.Sql (transactionUndo) import Data.Bitraversable +import qualified Data.Set as Set + instance Arbitrary (FileReferenceResidual PersonalisedSheetFile) where arbitrary = PersonalisedSheetFileResidual @@ -82,7 +84,7 @@ spec = withApp . describe "Personalised sheet file zip encoding" $ do loadResolved (f, fRes) = (, fRes) <$> traverse toPureFile f recoveredFiles <- runConduit $ - sourcePersonalisedSheetFiles cid (Just shid) Nothing anonMode + sourcePersonalisedSheetFiles cid (Just shid) Nothing anonMode Set.empty .| resolvePersonalisedSheetFiles fpL isDirectory cid shid .| C.mapM loadFile .| C.foldMap pure