diff --git a/chatwork.cabal b/chatwork.cabal --- a/chatwork.cabal +++ b/chatwork.cabal @@ -2,10 +2,10 @@ -- -- see: https://github.com/sol/hpack -- --- hash: 421a3807b8f34719aa0095c9b4046dc4aec9ff8d6bafd0b51893c15f35bd1af4 +-- hash: a2cdc8b35ae0645ad0222f68df4333edc63a314080be399ffb633bfa6c36cbf4 name: chatwork -version: 0.1.3.0 +version: 0.1.3.1 synopsis: The ChatWork API in Haskell description: See README at category: Web @@ -37,26 +37,26 @@ , http-api-data >=0.3.5 && <0.3.8 , http-client >=0.5.5.0 && <0.6 , http-client-tls >=0.3.3.1 && <0.4 - , http-types >=0.9.1 && <0.12 + , http-types >=0.9.1 && <0.13 , req >=1.0.0 && <1.1.0 , text >=1.2.2.1 && <1.3 exposed-modules: ChatWork ChatWork.Client ChatWork.Endpoints + ChatWork.Endpoints.Contacts + ChatWork.Endpoints.IncomingRequests ChatWork.Endpoints.Me ChatWork.Endpoints.My - ChatWork.Endpoints.Contacts ChatWork.Endpoints.Rooms - ChatWork.Endpoints.IncomingRequests ChatWork.Types ChatWork.Types.Base + ChatWork.Types.Contacts ChatWork.Types.Error + ChatWork.Types.IncomingRequests ChatWork.Types.Me ChatWork.Types.My - ChatWork.Types.Contacts ChatWork.Types.Rooms - ChatWork.Types.IncomingRequests ChatWork.Utils other-modules: Paths_chatwork @@ -78,7 +78,7 @@ , http-api-data >=0.3.5 && <0.3.8 , http-client >=0.5.5.0 && <0.6 , http-client-tls >=0.3.3.1 && <0.4 - , http-types >=0.9.1 && <0.12 + , http-types >=0.9.1 && <0.13 , req >=1.0.0 && <1.1.0 , text >=1.2.2.1 && <1.3 other-modules: @@ -103,9 +103,9 @@ , http-api-data >=0.3.5 && <0.3.8 , http-client >=0.5.5.0 && <0.6 , http-client-tls >=0.3.3.1 && <0.4 - , http-types >=0.9.1 && <0.12 + , http-types >=0.9.1 && <0.13 , req >=1.0.0 && <1.1.0 - , servant-server >=0.9.1.1 && <0.13 + , servant-server >=0.9.1.1 && <0.14 , text >=1.2.2.1 && <1.3 , warp >=3.2.11 && <3.3 other-modules: diff --git a/src/ChatWork/Utils.hs b/src/ChatWork/Utils.hs --- a/src/ChatWork/Utils.hs +++ b/src/ChatWork/Utils.hs @@ -1,7 +1,5 @@ -{-# LANGUAGE DataKinds #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE DataKinds #-} +{-# LANGUAGE TypeFamilies #-} module ChatWork.Utils ( -- * DELETE HTTP method with paramater diff --git a/test/ChatWork/Endpoints/ContactsSpec.hs b/test/ChatWork/Endpoints/ContactsSpec.hs --- a/test/ChatWork/Endpoints/ContactsSpec.hs +++ b/test/ChatWork/Endpoints/ContactsSpec.hs @@ -1,23 +1,17 @@ module ChatWork.Endpoints.ContactsSpec - ( main - , spec + ( spec ) where import ChatWork.Endpoints.Contacts (getContacts) import ChatWork.Test.Client (TestClient (..)) -import ChatWork.Test.MockServer (runMockServer) import ChatWork.Test.MonadHttpIO () import ChatWork.Test.Values.Contacts (contacts) import Network.HTTP.Req (responseBody) -import Test.Hspec (Spec, around_, context, - describe, hspec, it, +import Test.Hspec (Spec, context, describe, it, shouldReturn) -main :: IO () -main = hspec spec - spec :: Spec -spec = around_ runMockServer $ do +spec = do describe "getContacts: endpoint GET /contacts" $ do context "correct responce" $ do it "should return Right contacts response body" $ do diff --git a/test/ChatWork/Endpoints/IncomingRequestsSpec.hs b/test/ChatWork/Endpoints/IncomingRequestsSpec.hs --- a/test/ChatWork/Endpoints/IncomingRequestsSpec.hs +++ b/test/ChatWork/Endpoints/IncomingRequestsSpec.hs @@ -1,26 +1,20 @@ module ChatWork.Endpoints.IncomingRequestsSpec - ( main - , spec + ( spec ) where import ChatWork.Endpoints.IncomingRequests (acceptIncomingRequest, getIncomingRequests, rejectIncomingRequest) import ChatWork.Test.Client (TestClient (..)) -import ChatWork.Test.MockServer (runMockServer) import ChatWork.Test.MonadHttpIO () import ChatWork.Test.Values.IncomingRequests (acceptedIncomingRequest, incomingRequests) import Network.HTTP.Req (responseBody) -import Test.Hspec (Spec, around_, context, - describe, hspec, it, - shouldReturn) - -main :: IO () -main = hspec spec +import Test.Hspec (Spec, context, describe, + it, shouldReturn) spec :: Spec -spec = around_ runMockServer $ do +spec = do describe "getIncomingRequests: endpoint GET /incoming_requests" $ do context"correct responce" $ do it "should return Right myStatus response body" $ do diff --git a/test/ChatWork/Endpoints/MeSpec.hs b/test/ChatWork/Endpoints/MeSpec.hs --- a/test/ChatWork/Endpoints/MeSpec.hs +++ b/test/ChatWork/Endpoints/MeSpec.hs @@ -1,22 +1,17 @@ module ChatWork.Endpoints.MeSpec - ( main - , spec + ( spec ) where import ChatWork.Endpoints.Me (getMe) import ChatWork.Test.Client (TestClient (..)) -import ChatWork.Test.MockServer (runMockServer) import ChatWork.Test.MonadHttpIO () import ChatWork.Test.Values.Me (me) import Network.HTTP.Req (responseBody) -import Test.Hspec (Spec, around_, context, describe, - hspec, it, shouldReturn) - -main :: IO () -main = hspec spec +import Test.Hspec (Spec, context, describe, it, + shouldReturn) spec :: Spec -spec = around_ runMockServer $ do +spec = do describe "getMe: endpoint GET /me" $ do context "correct responce" $ do it "should return Right me response body" $ do diff --git a/test/ChatWork/Endpoints/MySpec.hs b/test/ChatWork/Endpoints/MySpec.hs --- a/test/ChatWork/Endpoints/MySpec.hs +++ b/test/ChatWork/Endpoints/MySpec.hs @@ -1,22 +1,17 @@ module ChatWork.Endpoints.MySpec - ( main - , spec + ( spec ) where import ChatWork.Endpoints.My (getMyStatus, getMyTasks) import ChatWork.Test.Client (TestClient (..)) -import ChatWork.Test.MockServer (runMockServer) import ChatWork.Test.MonadHttpIO () import ChatWork.Test.Values.My (getMyTasksParams, myStatus, myTasks) import Network.HTTP.Req (responseBody) -import Test.Hspec (Spec, around_, context, describe, - hspec, it, shouldReturn) - -main :: IO () -main = hspec spec +import Test.Hspec (Spec, context, describe, it, + shouldReturn) spec :: Spec -spec = around_ runMockServer $ do +spec = do describe "getMyStatus: endpoint GET /my/status" $ do context "correct responce" $ do it "should return Right myStatus response body" $ do diff --git a/test/ChatWork/Endpoints/RoomsSpec.hs b/test/ChatWork/Endpoints/RoomsSpec.hs --- a/test/ChatWork/Endpoints/RoomsSpec.hs +++ b/test/ChatWork/Endpoints/RoomsSpec.hs @@ -1,8 +1,7 @@ {-# LANGUAGE OverloadedStrings #-} module ChatWork.Endpoints.RoomsSpec - ( main - , spec + ( spec ) where import ChatWork.Endpoints.Rooms (createRoom, createTask, deleteRoom, @@ -13,7 +12,6 @@ updateMembersPermission, updateRoom) import ChatWork.Test.Client (TestClient (..)) -import ChatWork.Test.MockServer (runMockServer) import ChatWork.Test.MonadHttpIO () import ChatWork.Test.Values.Rooms (createRoomParams, createTaskParams, file, files, getTasksParams, @@ -24,14 +22,11 @@ roomTasks, rooms, taskIds, updateRoomParams) import Network.HTTP.Req (responseBody) -import Test.Hspec (Spec, around_, context, describe, - hspec, it, shouldReturn) - -main :: IO () -main = hspec spec +import Test.Hspec (Spec, context, describe, it, + shouldReturn) spec :: Spec -spec = around_ runMockServer $ do +spec = do describe "getRooms: endpoint GET /rooms" $ do context "correct responce" $ do it "should return Right rooms response body" $ do diff --git a/test/ChatWork/Test/MockServer.hs b/test/ChatWork/Test/MockServer.hs --- a/test/ChatWork/Test/MockServer.hs +++ b/test/ChatWork/Test/MockServer.hs @@ -14,7 +14,6 @@ import ChatWork.Test.Values import ChatWork.Types import Control.Concurrent -import Control.Exception import Data.Aeson import qualified Data.ByteString.Lazy as LBS (length) import Data.Int (Int64) @@ -118,5 +117,5 @@ runMockServer :: IO () -> IO () runMockServer action = do - tid <- forkIO mockServer - action `finally` killThread tid + _ <- forkIO mockServer + action diff --git a/test/Spec.hs b/test/Spec.hs --- a/test/Spec.hs +++ b/test/Spec.hs @@ -1,1 +1,21 @@ -{-# OPTIONS_GHC -F -pgmF hspec-discover #-} +module Main where + +import Test.Hspec + +import qualified ChatWork.Endpoints.ContactsSpec +import qualified ChatWork.Endpoints.IncomingRequestsSpec +import qualified ChatWork.Endpoints.MeSpec +import qualified ChatWork.Endpoints.MySpec +import qualified ChatWork.Endpoints.RoomsSpec +import ChatWork.Test.MockServer (runMockServer) + +main :: IO () +main = hspec spec + +spec :: Spec +spec = around_ runMockServer $ do + describe "ChatWork.Endpoints.Contacts" ChatWork.Endpoints.ContactsSpec.spec + describe "ChatWork.Endpoints.IncomingRequests" ChatWork.Endpoints.IncomingRequestsSpec.spec + describe "ChatWork.Endpoints.Me" ChatWork.Endpoints.MeSpec.spec + describe "ChatWork.Endpoints.My" ChatWork.Endpoints.MySpec.spec + describe "ChatWork.Endpoints.Rooms" ChatWork.Endpoints.RoomsSpec.spec