From dec2d1453e836a783ce0e3cd7d8aede5702188c2 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 17 Feb 2016 15:56:04 +0100 Subject: removed extraneous hunit dependency --- server/test/Thermoprint/ServerSpec.hs | 12 ++++++------ server/thermoprint-server.cabal | 2 -- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/server/test/Thermoprint/ServerSpec.hs b/server/test/Thermoprint/ServerSpec.hs index aa654b1..0d698f0 100644 --- a/server/test/Thermoprint/ServerSpec.hs +++ b/server/test/Thermoprint/ServerSpec.hs @@ -3,9 +3,7 @@ module Thermoprint.ServerSpec (spec) where -import Test.HUnit import Test.Hspec -import Test.Hspec.Contrib.HUnit import Thermoprint.API import Thermoprint.Server @@ -53,7 +51,9 @@ setup = withSystemTempFile "thermoprint.sqlite" $ \fp h -> hClose h >> do (,,) <$> forkIO (thermoprintServer (Nat runSqlite) $ def `withPrinters` printers) <*> pure tPrinter <*> pure tManager spec :: Spec -spec = do - fromHUnitTest . test . ("blub" ~:) $ do - putStrLn "Blub." - return True +spec = beforeAll setup $ do + describe "blubTests" $ do + it "prints Blub." $ \(tId, _, _) -> do + putStrLn "Blub." + System.IO.print tId + True `shouldSatisfy` id diff --git a/server/thermoprint-server.cabal b/server/thermoprint-server.cabal index 849d35a..bfd5b9b 100644 --- a/server/thermoprint-server.cabal +++ b/server/thermoprint-server.cabal @@ -65,8 +65,6 @@ Test-Suite tests , thermoprint-server -any , thermoprint-spec -any , hspec >=2.2.1 && <3 - , hspec-contrib >=0.3.0 && <1 - , HUnit >=1.2.5 && <2 , QuickCheck >=2.8.1 && <3 , quickcheck-instances >=0.3.11 && <4 , temporary >=1.2.0 && <2 -- cgit v1.2.3