Restructure test

Blaisorblade · Blaisorblade · commit bd3436b92ad0 · 2016-07-19T00:20:56.000+02:00
Now we always add a test containining the whole action, instead of
adding the test only at the end if everything succeeded.
diff --git a/src/test/Stack/Untar/UntarSpec.hs b/src/test/Stack/Untar/UntarSpec.hs
@@ -1,5 +1,6 @@
+{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE OverloadedStrings #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
-{-# LANGUAGE OverloadedStrings     #-}
 
 module Stack.Untar.UntarSpec where
 
@@ -24,11 +25,15 @@ spec = do
                , ("test2", [ ("test2" </> "bar", "named pipe")
                            , ("test2" </> "devB", "block device")
                            , ("test2" </> "devC", "character device")])]
-    testTarFile (name, expected) = do
+    testTarFile (name, expected) =
+      it ("works on test " ++ name) $
+        getEntries name `shouldReturn` sort expected
+
+    getEntries name = do
       let tarFP  = currentFolder </> name ++ ".tar.gz"
           expectedTarFolder = name
           dest = currentFolder
 
-      entries <- runIO $ untar tarFP expectedTarFolder dest
-      runIO $ removeDirectoryRecursive $ currentFolder </> expectedTarFolder
-      it ("works on test " ++ name) $ sort entries `shouldBe` sort expected
+      entries <- untar tarFP expectedTarFolder dest
+      removeDirectoryRecursive $ currentFolder </> expectedTarFolder
+      return $ sort entries
