Use new ?= operator instead of Assertions.shouldEqual (#45)

This commit is contained in:
Connor Prussin
2017-07-18 22:36:56 -07:00
committed by GitHub
parent be26faa803
commit 4f11f25d03
6 changed files with 23 additions and 23 deletions

View File

@@ -5,11 +5,11 @@ import Prelude
import Control.Monad.Eff.Class as EffClass
import Data.StrMap as StrMap
import Test.Spec as Spec
import Test.Spec.Assertions as Assertions
import HTTPure.Body as Body
import HTTPure.SpecHelpers as SpecHelpers
import HTTPure.SpecHelpers ((?=))
readSpec :: SpecHelpers.Test
readSpec = Spec.describe "read" do
@@ -17,7 +17,7 @@ readSpec = Spec.describe "read" do
let req = SpecHelpers.mockRequest "GET" "" "test" StrMap.empty
request <- EffClass.liftEff req
body <- Body.read request
body `Assertions.shouldEqual` "test"
body ?= "test"
writeSpec :: SpecHelpers.Test
writeSpec = Spec.describe "write" do
@@ -26,7 +26,7 @@ writeSpec = Spec.describe "write" do
resp <- SpecHelpers.mockResponse
Body.write resp "test"
pure $ SpecHelpers.getResponseBody resp
body `Assertions.shouldEqual` "test"
body ?= "test"
bodySpec :: SpecHelpers.Test
bodySpec = Spec.describe "Body" do

View File

@@ -5,24 +5,24 @@ import Prelude
import Control.Monad.Eff.Class as EffClass
import Data.StrMap as StrMap
import Test.Spec as Spec
import Test.Spec.Assertions as Assertions
import HTTPure.Headers as Headers
import HTTPure.SpecHelpers as SpecHelpers
import HTTPure.SpecHelpers ((?=))
lookupSpec :: SpecHelpers.Test
lookupSpec = Spec.describe "lookup" do
Spec.describe "when the string is in the header set" do
Spec.describe "when searching with lowercase" do
Spec.it "is the string" do
Headers.lookup mockHeaders "x-test" `Assertions.shouldEqual` "test"
Headers.lookup mockHeaders "x-test" ?= "test"
Spec.describe "when searching with uppercase" do
Spec.it "is the string" do
Headers.lookup mockHeaders "X-Test" `Assertions.shouldEqual` "test"
Headers.lookup mockHeaders "X-Test" ?= "test"
Spec.describe "when the string is not in the header set" do
Spec.it "is an empty string" do
Headers.lookup StrMap.empty "X-Test" `Assertions.shouldEqual` ""
Headers.lookup StrMap.empty "X-Test" ?= ""
where
mockHeaders = StrMap.singleton "x-test" "test"
@@ -33,7 +33,7 @@ writeSpec = Spec.describe "write" do
mock <- SpecHelpers.mockResponse
Headers.write mock $ StrMap.singleton "X-Test" "test"
pure $ SpecHelpers.getResponseHeader "X-Test" mock
header `Assertions.shouldEqual` "test"
header ?= "test"
headersSpec :: SpecHelpers.Test
headersSpec = Spec.describe "Headers" do

View File

@@ -5,9 +5,9 @@ import Prelude
import Control.Monad.Eff.Class as EffClass
import Data.StrMap as StrMap
import Test.Spec as Spec
import Test.Spec.Assertions as Assertions
import HTTPure.SpecHelpers as SpecHelpers
import HTTPure.SpecHelpers ((?=))
import Headers as Headers
import HelloWorld as HelloWorld
@@ -18,29 +18,29 @@ headersSpec :: SpecHelpers.Test
headersSpec = Spec.it "runs the headers example" do
EffClass.liftEff Headers.main
header <- SpecHelpers.getHeader 8082 StrMap.empty "/" "X-Example"
header `Assertions.shouldEqual` "hello world!"
header ?= "hello world!"
response <- SpecHelpers.get 8082 (StrMap.singleton "X-Input" "test") "/"
response `Assertions.shouldEqual` "test"
response ?= "test"
helloWorldSpec :: SpecHelpers.Test
helloWorldSpec = Spec.it "runs the hello world example" do
EffClass.liftEff HelloWorld.main
response <- SpecHelpers.get 8080 StrMap.empty "/"
response `Assertions.shouldEqual` "hello world!"
response ?= "hello world!"
multiRouteSpec :: SpecHelpers.Test
multiRouteSpec = Spec.it "runs the multi route example" do
EffClass.liftEff MultiRoute.main
hello <- SpecHelpers.get 8081 StrMap.empty "/hello"
hello `Assertions.shouldEqual` "hello"
hello ?= "hello"
goodbye <- SpecHelpers.get 8081 StrMap.empty "/goodbye"
goodbye `Assertions.shouldEqual` "goodbye"
goodbye ?= "goodbye"
postSpec :: SpecHelpers.Test
postSpec = Spec.it "runs the post example" do
EffClass.liftEff Post.main
response <- SpecHelpers.post 8084 StrMap.empty "/" "test"
response `Assertions.shouldEqual` "test"
response ?= "test"
integrationSpec :: SpecHelpers.Test
integrationSpec = Spec.describe "Integration" do

View File

@@ -5,11 +5,11 @@ import Prelude
import Control.Monad.Eff.Class as EffClass
import Data.StrMap as StrMap
import Test.Spec as Spec
import Test.Spec.Assertions as Assertions
import HTTPure.Response as Response
import HTTPure.SpecHelpers as SpecHelpers
import HTTPure.SpecHelpers ((?=))
sendSpec :: SpecHelpers.Test
sendSpec = Spec.describe "send" do
@@ -19,19 +19,19 @@ sendSpec = Spec.describe "send" do
resp <- SpecHelpers.mockResponse
Response.send resp $ Response.OK (StrMap.singleton "X-Test" "test") ""
pure $ SpecHelpers.getResponseHeader "X-Test" resp
header `Assertions.shouldEqual` "test"
header ?= "test"
Spec.it "writes the status" do
status <- EffClass.liftEff do
resp <- SpecHelpers.mockResponse
Response.send resp $ Response.OK StrMap.empty ""
pure $ SpecHelpers.getResponseStatus resp
status `Assertions.shouldEqual` 200
status ?= 200
Spec.it "writes the body" do
body <- EffClass.liftEff do
resp <- SpecHelpers.mockResponse
Response.send resp $ Response.OK StrMap.empty "test"
pure $ SpecHelpers.getResponseBody resp
body `Assertions.shouldEqual` "test"
body ?= "test"
responseSpec :: SpecHelpers.Test
responseSpec = Spec.describe "Response" do

View File

@@ -5,13 +5,13 @@ import Prelude
import Control.Monad.Eff.Class as EffClass
import Data.StrMap as StrMap
import Test.Spec as Spec
import Test.Spec.Assertions as Assertions
import HTTPure.Request as Request
import HTTPure.Response as Response
import HTTPure.Server as Server
import HTTPure.SpecHelpers as SpecHelpers
import HTTPure.SpecHelpers ((?=))
mockRouter :: forall e. Request.Request -> Response.ResponseM e
mockRouter (Request.Get _ path) = pure $ Response.OK StrMap.empty path
@@ -22,7 +22,7 @@ serveSpec = Spec.describe "serve" do
Spec.it "boots a server on the given port" do
EffClass.liftEff $ Server.serve 7901 mockRouter $ pure unit
out <- SpecHelpers.get 7901 StrMap.empty "/test"
out `Assertions.shouldEqual` "/test"
out ?= "/test"
serverSpec :: SpecHelpers.Test
serverSpec = Spec.describe "Server" do

View File

@@ -4,11 +4,11 @@ import Prelude
import Control.Monad.Eff.Class as EffClass
import Test.Spec as Spec
import Test.Spec.Assertions as Assertions
import HTTPure.Status as Status
import HTTPure.SpecHelpers as SpecHelpers
import HTTPure.SpecHelpers ((?=))
writeSpec :: SpecHelpers.Test
writeSpec = Spec.describe "write" do
@@ -17,7 +17,7 @@ writeSpec = Spec.describe "write" do
mock <- SpecHelpers.mockResponse
Status.write mock 123
pure $ SpecHelpers.getResponseStatus mock
status `Assertions.shouldEqual` 123
status ?= 123
statusSpec :: SpecHelpers.Test
statusSpec = Spec.describe "Status" do