aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2016-02-17 15:56:04 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2016-02-17 15:56:04 +0100
commitdec2d1453e836a783ce0e3cd7d8aede5702188c2 (patch)
tree0b57a2b1ca1ddcae4649d5456ca9dfde517ef137
parentfff9cbfc9e7919723349e18c4b9aea89bcc48c1a (diff)
downloadthermoprint-dec2d1453e836a783ce0e3cd7d8aede5702188c2.tar
thermoprint-dec2d1453e836a783ce0e3cd7d8aede5702188c2.tar.gz
thermoprint-dec2d1453e836a783ce0e3cd7d8aede5702188c2.tar.bz2
thermoprint-dec2d1453e836a783ce0e3cd7d8aede5702188c2.tar.xz
thermoprint-dec2d1453e836a783ce0e3cd7d8aede5702188c2.zip
removed extraneous hunit dependency
-rw-r--r--server/test/Thermoprint/ServerSpec.hs12
-rw-r--r--server/thermoprint-server.cabal2
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 @@
3 3
4module Thermoprint.ServerSpec (spec) where 4module Thermoprint.ServerSpec (spec) where
5 5
6import Test.HUnit
7import Test.Hspec 6import Test.Hspec
8import Test.Hspec.Contrib.HUnit
9 7
10import Thermoprint.API 8import Thermoprint.API
11import Thermoprint.Server 9import Thermoprint.Server
@@ -53,7 +51,9 @@ setup = withSystemTempFile "thermoprint.sqlite" $ \fp h -> hClose h >> do
53 (,,) <$> forkIO (thermoprintServer (Nat runSqlite) $ def `withPrinters` printers) <*> pure tPrinter <*> pure tManager 51 (,,) <$> forkIO (thermoprintServer (Nat runSqlite) $ def `withPrinters` printers) <*> pure tPrinter <*> pure tManager
54 52
55spec :: Spec 53spec :: Spec
56spec = do 54spec = beforeAll setup $ do
57 fromHUnitTest . test . ("blub" ~:) $ do 55 describe "blubTests" $ do
58 putStrLn "Blub." 56 it "prints Blub." $ \(tId, _, _) -> do
59 return True 57 putStrLn "Blub."
58 System.IO.print tId
59 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
65 , thermoprint-server -any 65 , thermoprint-server -any
66 , thermoprint-spec -any 66 , thermoprint-spec -any
67 , hspec >=2.2.1 && <3 67 , hspec >=2.2.1 && <3
68 , hspec-contrib >=0.3.0 && <1
69 , HUnit >=1.2.5 && <2
70 , QuickCheck >=2.8.1 && <3 68 , QuickCheck >=2.8.1 && <3
71 , quickcheck-instances >=0.3.11 && <4 69 , quickcheck-instances >=0.3.11 && <4
72 , temporary >=1.2.0 && <2 70 , temporary >=1.2.0 && <2