Merge branch 'hspec-discover'

koterpillar · Jan 28, 2017 · 44dd535 · 44dd535
2 parents 60f3a19 + 29dc900
commit 44dd535
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 37 deletions.
diff --git a/test/TestFetcherArpansa.hs → test/Fetcher/ArpansaSpec.hs b/test/TestFetcherArpansa.hs → test/Fetcher/ArpansaSpec.hs
@@ -1,4 +1,4 @@
-module TestFetcherArpansa where
+module Fetcher.ArpansaSpec where
 
 import Control.Lens
 

diff --git a/test/TestFetcherJMA.hs → test/Fetcher/JMASpec.hs b/test/TestFetcherJMA.hs → test/Fetcher/JMASpec.hs
@@ -1,4 +1,4 @@
-module TestFetcherJMA where
+module Fetcher.JMASpec where
 
 import Control.Lens
 

diff --git a/test/TestFetcher.hs → test/FetcherSpec.hs b/test/TestFetcher.hs → test/FetcherSpec.hs
@@ -1,4 +1,4 @@
-module TestFetcher where
+module FetcherSpec where
 
 import Control.Lens
 

diff --git a/test/Integration/TestServer.hs → test/Integration/ServerSpec.hs b/test/Integration/TestServer.hs → test/Integration/ServerSpec.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE QuasiQuotes #-}
-module Integration.TestServer where
+module Integration.ServerSpec where
 
 import Control.Lens
 

diff --git a/test/Spec.hs b/test/Spec.hs
@@ -1,22 +1 @@
--- FIXME: Why doesn't hspec-discover work?
-import Test.Hspec
-
-import qualified TestFetcher
-import qualified TestFetcherArpansa
-import qualified TestFetcherJMA
-import qualified TestTypes
-import qualified TestTypesLocation
-import qualified TestUtils
-import qualified Integration.TestServer
-
-main :: IO ()
-main = hspec spec
-
-spec = do
-    describe "TestFetcher" TestFetcher.spec
-    describe "TestFetcherArpansa" TestFetcherArpansa.spec
-    describe "TestFetcherJMA" TestFetcherJMA.spec
-    describe "TestTypes" TestTypes.spec
-    describe "TestTypesLocation" TestTypesLocation.spec
-    describe "TestUtils" TestUtils.spec
-    describe "Integration.TestServer" Integration.TestServer.spec
+{-# OPTIONS_GHC -F -pgmF hspec-discover #-}
diff --git a/test/TestTypesLocation.hs → test/Types/LocationSpec.hs b/test/TestTypesLocation.hs → test/Types/LocationSpec.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE OverloadedStrings #-}
-module TestTypesLocation where
+module Types.LocationSpec where
 
 {- Test Types.Location module -}
 

diff --git a/test/TestTypes.hs → test/TypesSpec.hs b/test/TestTypes.hs → test/TypesSpec.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE OverloadedStrings #-}
-module TestTypes where
+module TypesSpec where
 
 {- Test Types module -}
 

diff --git a/test/TestUtils.hs → test/UtilsSpec.hs b/test/TestUtils.hs → test/UtilsSpec.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE OverloadedStrings #-}
-module TestUtils where
+module UtilsSpec where
 
 {- Test Utils module -}
 

diff --git a/uv-alert-server.cabal b/uv-alert-server.cabal
@@ -105,16 +105,16 @@ test-suite uv-alert-server-test
                      , transformers
                      , vector
                      , wai
-  other-modules:       Images
+  other-modules:       Fetcher.ArpansaSpec
+                     , Fetcher.JMASpec
+                     , FetcherSpec
+                     , Images
                      , Integration.Base
-                     , Integration.TestServer
+                     , Integration.ServerSpec
                      , Misc
-                     , TestFetcher
-                     , TestFetcherArpansa
-                     , TestFetcherJMA
-                     , TestTypes
-                     , TestTypesLocation
-                     , TestUtils
+                     , Types.LocationSpec
+                     , TypesSpec
+                     , UtilsSpec
   ghc-options:         -threaded -rtsopts -with-rtsopts=-N
   default-language:    Haskell2010