From 2e65cf175c711977405e5b1e214e0ffd3685d589 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 9 Oct 2017 17:16:08 +0200 Subject: [PATCH] minor cleanup --- models | 2 +- test/Handler/ZipSpec.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/models b/models index 45a202e9b..4f8b99f31 100644 --- a/models +++ b/models @@ -29,7 +29,7 @@ Course json shorthand Text owner UserId schoolId SchoolId - termId TermId -- TermId ist jetzt Text als Typ + termId TermId -- @data TermId = TermId TermIdentifier@ stored as text capacity Int Maybe created UTCTime changed UTCTime diff --git a/test/Handler/ZipSpec.hs b/test/Handler/ZipSpec.hs index 10a5ac901..bdaec75da 100644 --- a/test/Handler/ZipSpec.hs +++ b/test/Handler/ZipSpec.hs @@ -28,7 +28,7 @@ spec :: Spec spec = describe "Zip file handling" $ do it "has compatible encoding/decoding to/from zip files" . property $ \zipFiles -> do - (_, zipFiles') <- runConduit $ Conduit.sourceList zipFiles =$= produceZip def =$= consumeZip `fuseBoth` Conduit.consume + zipFiles' <- runConduit $ Conduit.sourceList zipFiles =$= produceZip def =$= void consumeZip =$= Conduit.consume forM_ (zipFiles `zip` zipFiles') $ \(file, file') -> do let acceptableFilenameChanges = makeValid . bool (dropWhileEnd isPathSeparator) addTrailingPathSeparator (isNothing $ fileContent file) . normalise . makeValid