@@ -3,6 +3,7 @@ module Test.Main where
3
3
import Prelude
4
4
5
5
import Bucketchain.Stream (convertToString )
6
+ import Bucketchain.Test (request , requestWithBody )
6
7
import Data.Either (Either (..))
7
8
import Data.Maybe (Maybe (..))
8
9
import Data.Options ((:=))
@@ -17,7 +18,6 @@ import Node.FS.Stream (createReadStream)
17
18
import Node.HTTP (Server , listen , close )
18
19
import Node.HTTP.Client as C
19
20
import Test.Assert (assert )
20
- import Test.Util as Util
21
21
22
22
main :: Effect Unit
23
23
main = do
@@ -43,7 +43,7 @@ handleAff s _ = close s $ pure unit
43
43
44
44
testMiddleware1 :: Aff Unit
45
45
testMiddleware1 = do
46
- res <- Util . request opts
46
+ res <- request opts
47
47
body <- convertToString $ C .responseAsStream res
48
48
liftEffect do
49
49
assert $ body == " Hello world :)"
@@ -58,7 +58,7 @@ testMiddleware1 = do
58
58
59
59
testMiddleware2 :: Aff Unit
60
60
testMiddleware2 = do
61
- res <- Util . requestWithBody opts " TEST BODY"
61
+ res <- requestWithBody opts " TEST BODY"
62
62
body <- convertToString $ C .responseAsStream res
63
63
liftEffect do
64
64
assert $ body == " TEST BODY"
@@ -73,7 +73,7 @@ testMiddleware2 = do
73
73
74
74
testMiddleware3 :: Aff Unit
75
75
testMiddleware3 = do
76
- res <- Util . request opts
76
+ res <- request opts
77
77
imgStream <- liftEffect $ createReadStream " example/300x300.png"
78
78
expected <- convertToString imgStream
79
79
body <- convertToString $ C .responseAsStream res
@@ -90,7 +90,7 @@ testMiddleware3 = do
90
90
91
91
testMiddleware4 :: Aff Unit
92
92
testMiddleware4 = do
93
- res <- Util . request opts
93
+ res <- request opts
94
94
liftEffect $ assert $ C .statusCode res == 500
95
95
where
96
96
opts = C .port := 3000
@@ -99,7 +99,7 @@ testMiddleware4 = do
99
99
100
100
test404 :: Aff Unit
101
101
test404 = do
102
- res <- Util . request opts
102
+ res <- request opts
103
103
liftEffect $ assert $ C .statusCode res == 404
104
104
where
105
105
opts = C .port := 3000
0 commit comments