diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index b5da12e..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-language: elixir
-notifications:
- email:
- recipients:
- - eduardo@gurgel.me
-cache:
- directories:
- - _build
- - deps
-sudo: false
-script: mix test
-matrix:
- include:
- - elixir: '1.7'
- otp_release: '19.3'
- - elixir: '1.7'
- otp_release: '20.3'
- - elixir: '1.7'
- otp_release: '21.0'
- - elixir: '1.8'
- otp_release: '20.3'
- - elixir: '1.8'
- otp_release: '21.0'
- - elixir: '1.8'
- otp_release: '22.0.1'
- - elixir: '1.15.8'
- otp_release: '25.3.2.12'
- - elixir: '1.16.3'
- otp_release: '26.2.5'
diff --git a/config/releases.exs b/config/releases.exs
index d05ffba..4bb5f83 100644
--- a/config/releases.exs
+++ b/config/releases.exs
@@ -14,4 +14,3 @@ config :httparrot,
https_port: ssl_port,
unix_socket: unix_socket,
socket_path: System.get_env("SOCKET_PATH", "httparrot.sock")
-
diff --git a/lib/httparrot.ex b/lib/httparrot.ex
index bab8739..d815889 100644
--- a/lib/httparrot.ex
+++ b/lib/httparrot.ex
@@ -7,7 +7,7 @@ defmodule HTTParrot do
end
def init(_) do
- Supervisor.start_link([], [strategy: :one_for_one])
+ Supervisor.start_link([], strategy: :one_for_one)
end
def start(_type, _args) do
@@ -71,9 +71,9 @@ defmodule HTTParrot do
:https,
[
port: https_port,
- cacertfile: priv_dir ++ '/ssl/server-ca.crt',
- certfile: priv_dir ++ '/ssl/server.crt',
- keyfile: priv_dir ++ '/ssl/server.key'
+ cacertfile: priv_dir ++ ~c"/ssl/server-ca.crt",
+ certfile: priv_dir ++ ~c"/ssl/server.crt",
+ keyfile: priv_dir ++ ~c"/ssl/server.key"
],
%{env: %{dispatch: dispatch}}
)
diff --git a/lib/httparrot/redirect_handler.ex b/lib/httparrot/redirect_handler.ex
index 463b55b..3e16a00 100644
--- a/lib/httparrot/redirect_handler.ex
+++ b/lib/httparrot/redirect_handler.ex
@@ -19,7 +19,11 @@ defmodule HTTParrot.RedirectHandler do
def previously_existed(req, state), do: {true, req, state}
def moved_permanently(req, n) do
- host_url = IO.iodata_to_binary(:cowboy_req.uri(req, %{path: :undefined, qs: :undefined, fragment: :undefined}))
+ host_url =
+ IO.iodata_to_binary(
+ :cowboy_req.uri(req, %{path: :undefined, qs: :undefined, fragment: :undefined})
+ )
+
url = if n > 1, do: "/redirect/#{n - 1}", else: "/get"
{{true, host_url <> url}, req, nil}
end
diff --git a/lib/httparrot/store_request_handler.ex b/lib/httparrot/store_request_handler.ex
index 316b28e..39f0d34 100644
--- a/lib/httparrot/store_request_handler.ex
+++ b/lib/httparrot/store_request_handler.ex
@@ -23,7 +23,7 @@ defmodule HTTParrot.StoreRequestHandler do
{info, req} = GeneralRequestInfo.retrieve(req)
key = :cowboy_req.binding(:key, req)
HTTParrot.RequestStore.store(key, info)
- {'{"saved": "true"}', req, state}
+ {~c'{"saved": "true"}', req, state}
end
def post_binary(req, _state) do
diff --git a/lib/httparrot/stream_bytes_handler.ex b/lib/httparrot/stream_bytes_handler.ex
index 05cdf27..5a0af6a 100644
--- a/lib/httparrot/stream_bytes_handler.ex
+++ b/lib/httparrot/stream_bytes_handler.ex
@@ -31,13 +31,15 @@ defmodule HTTParrot.StreamBytesHandler do
end
defp stream_response!(n, chunk_size, req) do
- req = :cowboy_req.stream_reply(200, %{ "content-type" => "application/octet-stream" }, req)
+ req = :cowboy_req.stream_reply(200, %{"content-type" => "application/octet-stream"}, req)
+
Stream.repeatedly(fn -> :rand.uniform(255) end)
|> Stream.take(n)
|> Enum.chunk_every(chunk_size, chunk_size, [])
|> Enum.each(fn chunk ->
:cowboy_req.stream_body(List.to_string(chunk), :nofin, req)
end)
+
:cowboy_req.stream_body("", :fin, req)
req
end
diff --git a/lib/httparrot/stream_handler.ex b/lib/httparrot/stream_handler.ex
index 753900f..8b490f1 100644
--- a/lib/httparrot/stream_handler.ex
+++ b/lib/httparrot/stream_handler.ex
@@ -25,11 +25,13 @@ defmodule HTTParrot.StreamHandler do
def get_json(req, n) do
{info, req} = GeneralRequestInfo.retrieve(req)
- req = :cowboy_req.stream_reply(200, %{ "content-type" => "application/json" }, req)
+ req = :cowboy_req.stream_reply(200, %{"content-type" => "application/json"}, req)
+
Enum.each(0..(n - 1), fn i ->
body = JSX.encode!([id: i] ++ info)
:cowboy_req.stream_body(body, :nofin, req)
end)
+
:cowboy_req.stream_body("", :fin, req)
{:stop, req, nil}
end
diff --git a/priv/ssl/server-ca.crt b/priv/ssl/server-ca.crt
index a35ac39..b78d61f 100644
--- a/priv/ssl/server-ca.crt
+++ b/priv/ssl/server-ca.crt
@@ -1,16 +1,27 @@
-----BEGIN CERTIFICATE-----
-MIICeDCCAeGgAwIBAgIJAOvpU0y2e5J4MA0GCSqGSIb3DQEBBQUAMFUxCzAJBgNV
-BAYTAlVTMQ4wDAYDVQQIDAVUZXhhczETMBEGA1UECgwKTmluZSBOaW5lczEPMA0G
-A1UECwwGQ293Ym95MRAwDgYDVQQDDAdST09UIENBMB4XDTEzMDIyODA1MTAwMVoX
-DTMzMDIyMzA1MTAwMVowVTELMAkGA1UEBhMCVVMxDjAMBgNVBAgMBVRleGFzMRMw
-EQYDVQQKDApOaW5lIE5pbmVzMQ8wDQYDVQQLDAZDb3dib3kxEDAOBgNVBAMMB1JP
-T1QgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMzmY7Us06yjyUbpqwPx
-Iv+xh/g3V7we07ClC9GEYnvr3OQvdA1jFEHccMBUUjRoQ8DPd6uSyK5UkixABs08
-Tt5B3VsnGKr0DIN+IO4SN2PkmBqIU/BN3KdcwN65YNr3iM0KsKWeFtAZdYx4CakX
-7REbO0wjK20AH3xSBn3uFGiBAgMBAAGjUDBOMB0GA1UdDgQWBBRKfZ8KF2jlLBDm
-NL6IuEuGY0pdbzAfBgNVHSMEGDAWgBRKfZ8KF2jlLBDmNL6IuEuGY0pdbzAMBgNV
-HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAG1I0kBxXiLkM1b7rl2zPLizREYg
-1m+ajb6rWzPOBg6TXjv58Be+H4tqoHIL/M/crixew5emftBkuAGjiKMhbIokjvan
-aPTCV8U6HHvNvz9c68HpESWbd+56cHqfsS5XCKp1OpW5tbL2UQYpFKMP4qmbv3Ea
-pBfPPmSFMBb1i2AI
+MIIEqjCCAxKgAwIBAgIRANXKM01Lqak+6N93VnHgkl4wDQYJKoZIhvcNAQELBQAw
+bTEeMBwGA1UEChMVbWtjZXJ0IGRldmVsb3BtZW50IENBMSEwHwYDVQQLDBhlZHVh
+cmRvQHBvcC1vcyAoRWR1YXJkbykxKDAmBgNVBAMMH21rY2VydCBlZHVhcmRvQHBv
+cC1vcyAoRWR1YXJkbykwHhcNMjQwNjIzMDU1MzA0WhcNMzQwNjIzMDU1MzA0WjBt
+MR4wHAYDVQQKExVta2NlcnQgZGV2ZWxvcG1lbnQgQ0ExITAfBgNVBAsMGGVkdWFy
+ZG9AcG9wLW9zIChFZHVhcmRvKTEoMCYGA1UEAwwfbWtjZXJ0IGVkdWFyZG9AcG9w
+LW9zIChFZHVhcmRvKTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAK6p
+DThGWoUHwCVf8DqHDFthUTvNIKRJzyxArh4GF71dHehiLVBZQ9i/jA1nRASzsVcu
+UGyZT18N+XvCCeoPevHXOPjUJZtMkhPqlt55N9gzrniEsmRRQOPzIt8+BiFjJ5Jn
+RzRD9S+9AwNIaZKUjiQ1Oexxgvd7pbWy3S/IzXCyFsKIZqYcvvpBY6FroDSEZbrk
+xMA4Fhvy2370nTrlKzuoVTGZ8WdHOsh7Ef+mCZp1QwTtCkIPHdCa3OMs5F7u4q8P
+tB4QgaWnvEmRtDwsst/CCQr4nIrQzjDwCMS41x0DZwMrQ8lzSjnAHxayWoll9aJK
+38jaDviT9qvnIjjdMHN9jJ7fDBZeonrGqdGSs/754oxpSFAiErpBY6dPGYgzkjQM
+IxKi4zqYW9ZWPSYacAmRwZsYWp50tvtwxtdY63GslFrnVjtG7e+H1rJJWsQ2Eq5w
+sQekS/EqOpufBuoildwGMiyW1CEhXezW5lCiA++kyA6DkVA2zQRi0huJ4LPvDQID
+AQABo0UwQzAOBgNVHQ8BAf8EBAMCAgQwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNV
+HQ4EFgQUSGXO0OyaSJ4ztTJkQt8atnaqe7MwDQYJKoZIhvcNAQELBQADggGBAA6c
+pCJO1U2S79McbKZylJ13Nv+qMSWvTF5ax+/tSahAgvauaQiDInLa9wOUHfiTqNwH
+q42UUexfm04Yre+R9NR9jOVHCFwT9uq3MOPKDuRS3UUUCCUjy0b0CSDc1uCi9BGu
+jykYViGNCDvTeOI8AZfIEtD77TGJt/8kn7Z6Qe9EFe1N+k8PtbFJgt1/rjIOtFz0
+638iHBSky+U4ozznxQmwwseR3KSSNS0JWQDxm/gWqy4MP1m0pW5Pd543ms2BPUzO
+2P1PkEV4jz8J4j2C3EctdoiCudqa8BCFMXIE+t/hKQ+LgbW6phoIN6DLp65Yhs7Z
+DHPq64f8005EXB8GDHLoP/HL/wnO60e+hjjvsumvCWc7EZeZiHl2QwFMQ6csExeZ
+9bky+h1WiQeV2poEyJSPOVAXThaxf3GOV+V/zrnY+DHNio/IRa4Z+/1Fwxs26+o7
+Qnkf9UqSZrKr/B7ilQ/Cb1sv3dLzIPAmfNuDjqPWb4eYT+B26n264znHlhvmWw==
-----END CERTIFICATE-----
diff --git a/priv/ssl/server.crt b/priv/ssl/server.crt
index 0bdfaed..a777145 100644
--- a/priv/ssl/server.crt
+++ b/priv/ssl/server.crt
@@ -1,17 +1,26 @@
-----BEGIN CERTIFICATE-----
-MIICpTCCAg6gAwIBAgIJAOvpU0y2e5J5MA0GCSqGSIb3DQEBBQUAMFUxCzAJBgNV
-BAYTAlVTMQ4wDAYDVQQIDAVUZXhhczETMBEGA1UECgwKTmluZSBOaW5lczEPMA0G
-A1UECwwGQ293Ym95MRAwDgYDVQQDDAdST09UIENBMB4XDTEzMDIyODA1MjMzNFoX
-DTMzMDIyMzA1MjMzNFowVzELMAkGA1UEBhMCVVMxDjAMBgNVBAgMBVRleGFzMRMw
-EQYDVQQKDApOaW5lIE5pbmVzMQ8wDQYDVQQLDAZDb3dib3kxEjAQBgNVBAMMCWxv
-Y2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAzbW1GjECzHUc/WST
-qLiAGqjCNccR5saVS+yoz2SPRhpoyf0/qBrX5BY0tzmgozoTiRfE4wCiVD99Cc+D
-rp/FM49r4EpZdocIovprmOmv/gwkoj95zaA6PKNn1OdmDp2hwJsX2Zm3kpbGUZTx
-jDkkccmgUb4EjL7qNHq7saQtivUCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB
-hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
-FB6jTEIWI8T1ckORA4GezbyYxtbvMB8GA1UdIwQYMBaAFEp9nwoXaOUsEOY0voi4
-S4ZjSl1vMA0GCSqGSIb3DQEBBQUAA4GBACMboVQjrx8u/fk3gl/sR0tbA0Wf/NcS
-2Dzsy2czndgVUAG4Sqb+hfgn0dqAyUKghRrj3JDcYxYksGPIklDfPzZb7yJ39l16
-6x5ZiIzhp8CAVdPvRxRznw5rZwaXesryXu1jVSZxTr3MYZdkG6KaAM0t90+YlGLZ
-UG8fAicx0Bf+
+MIIEZTCCAs2gAwIBAgIQIJarIG+LC7mjP0IRrFcI0zANBgkqhkiG9w0BAQsFADBt
+MR4wHAYDVQQKExVta2NlcnQgZGV2ZWxvcG1lbnQgQ0ExITAfBgNVBAsMGGVkdWFy
+ZG9AcG9wLW9zIChFZHVhcmRvKTEoMCYGA1UEAwwfbWtjZXJ0IGVkdWFyZG9AcG9w
+LW9zIChFZHVhcmRvKTAeFw0yNDA2MjMwNTU0MTBaFw0yNjA5MjMwNTU0MTBaMEwx
+JzAlBgNVBAoTHm1rY2VydCBkZXZlbG9wbWVudCBjZXJ0aWZpY2F0ZTEhMB8GA1UE
+CwwYZWR1YXJkb0Bwb3Atb3MgKEVkdWFyZG8pMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAx8lf20sm9KkWh/u6ehJ4YpDlx7DGaebBok3JR6rdV42c9flu
+pXdi0Uu7tq4utk4rGu6gotIlPFDeRxokqNIaCUmpIW2msG6KzPBp2Lf+AR0EbdQS
+EvqiMLx5dU3yEafGKeH1z4qMobhEWIWU9F0V8zuuJvCeHRCdBkse1XQ64X6gyN1m
+5lYEEIlGfOj7rrAFdCkv63W5dUeph9yoIF//T9yhTx0yNGUeCOuqQEL5HsSdD6HL
+hqIsjmlI33uHWJd9fr72ZTjmxawRca3tS4ljR6QeZw8zE51lh5P4f1pTGa2vUPxX
+A11O8jmuXkflgLyDNlm1Pob0tuoNOpa2Zi+mAQIDAQABo4GhMIGeMA4GA1UdDwEB
+/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAfBgNVHSMEGDAWgBRIZc7Q7JpI
+njO1MmRC3xq2dqp7szBWBgNVHREETzBNggtleGFtcGxlLmNvbYINKi5leGFtcGxl
+LmNvbYIMZXhhbXBsZS50ZXN0gglsb2NhbGhvc3SHBH8AAAGHEAAAAAAAAAAAAAAA
+AAAAAAEwDQYJKoZIhvcNAQELBQADggGBAKuzr0Vb6NZV5XlByLgMb1sddIhl3DWq
+RGcAf556am51zvZQFz9W/SBm0Ww7+W1fLx7lasyawsxNhfgNHgP05WKZqghodqIw
+1tQJAu8PRuXClrvADUnvMz4a3ELCkygSZNn1Oo84YXssEBe1vy70ZTGZS8hhq5qJ
+uKTwN0/UtJXXF0dapd4T+N0kuWuoB1xsf7U9Hdn0Bmw5idWe+U2xvb4/Eo0rPUKa
++GJafosfJ17zV5D4oUbuf1uPg8MqQJzEcQDEOcVDgds7tyy3A3igQ+v1WYDkUcUZ
+IfOoQxMfHF7mGDbAETGnn0pSRztgKdobpg7MItbdiI04XSIwgGZL4puLJZfSkRDC
+ZLqZk9JJc8DpLRjGmH7lRcKkq8TkbrKGsYOQ3bWV6rLP1xH++rE7Sld7P8bLhapQ
+hIwcy1rg38v6u2OmApfEbp+VBa62h7RqBDsW0JSNo8Ut1d0VS2HxHMNZ+pr0WVqO
+nGcNj0IS+dchbyqN7WF4X9h1iqD09qWeaw==
-----END CERTIFICATE-----
diff --git a/priv/ssl/server.key b/priv/ssl/server.key
index b6f7374..0696d47 100644
--- a/priv/ssl/server.key
+++ b/priv/ssl/server.key
@@ -1,15 +1,28 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDNtbUaMQLMdRz9ZJOouIAaqMI1xxHmxpVL7KjPZI9GGmjJ/T+o
-GtfkFjS3OaCjOhOJF8TjAKJUP30Jz4Oun8Uzj2vgSll2hwii+muY6a/+DCSiP3nN
-oDo8o2fU52YOnaHAmxfZmbeSlsZRlPGMOSRxyaBRvgSMvuo0eruxpC2K9QIDAQAB
-AoGAaD85c/h6bpq7Aj7CBbLaWKhFI3OqwsTITB22vsM7SE+B4zsP02UnG1OVi3UM
-zytTUxpUkKV1njQ+bYZYOVqGWF4Up8tTqUglHn0FTPok1AIemELWtz3sXvdSHC1T
-lqvFBAZ9kibn13qGyVOiyCFaMwfOM/05RvV7p3jfUMTWnNECQQDs7yCJZ8Ol8MyH
-TGZzvkjoN2zg1KwmTbSD1hkP6QAJtPdRuqFbjlEru0/PefgOXsWLRIa3/3v0qw2G
-xGkV6AXTAkEA3kNbFisqUydjPnZIYv/P6SvPdUimHJEjXbAbfNfzS9dzszrOVJd2
-XqGH7z5yzjoH3IyaIMW8GnubVzGDSjrHFwJAKSU5vELlygpwKkrNO+pelN0TLlQg
-dSJnZ8GlZorq88SWcn37iX/EftivenNO7YftvEqxLoDSkOGnnrC7Iw/A+wJBAIEe
-L/QY72WPJCBNJpAce/PA96vyoE1II3txqwZDjZspdpVQPDz4IFOpEwbxCFC1dYuy
-Qnd3Z2cbF4r3wIWGz9ECQQCJGNhUNtY+Om1ELdqPcquxE2VRV/pucnvJSTKwyo2C
-Rvm6H7kFDwPDuN23YnTOlTiho0zzCkclcIukhIVJ+dKz
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDHyV/bSyb0qRaH
++7p6EnhikOXHsMZp5sGiTclHqt1XjZz1+W6ld2LRS7u2ri62Tisa7qCi0iU8UN5H
+GiSo0hoJSakhbaawborM8GnYt/4BHQRt1BIS+qIwvHl1TfIRp8Yp4fXPioyhuERY
+hZT0XRXzO64m8J4dEJ0GSx7VdDrhfqDI3WbmVgQQiUZ86PuusAV0KS/rdbl1R6mH
+3KggX/9P3KFPHTI0ZR4I66pAQvkexJ0PocuGoiyOaUjfe4dYl31+vvZlOObFrBFx
+re1LiWNHpB5nDzMTnWWHk/h/WlMZra9Q/FcDXU7yOa5eR+WAvIM2WbU+hvS26g06
+lrZmL6YBAgMBAAECggEAY2zlJnZdGa84hk4RfITKoornv5xK8hMj1EkP3Xm8E8Fn
+FsaeePxUEkK1VXGTz6hRLWMKUF1yqHS6Wfo5ukZtLKga4ob2SKGKs/kFRBQ09Yri
+VGIQ6J8Qrl5tt6Il0QGEzf0k3rddy3GvmbpI6d+Vd+oAfmKK3X4SFzq1SpdAYk1H
+RcC+VLfu60v7yFMtk0IMKMvtXBNY4TPmvJFKv439mLDyIRA5Dsk8P6TZrf473PVJ
+JpofVVIKtug8z++CFojhiQYX2bcyIxHWdbUer/snJq4UV+0pOjVYqtB+cVjToBSV
+BGNcR+qe8Sg0HXVjpSpKUl3d3GOmCTjKeFzHbu4yTQKBgQD498zP1pW4jH1RVxo8
+RVsZWKmZip7iD9MhrUakMW9G9pUrWzl6DG7Na8pnYi5TsZXXak/f5sWhhCPxkae0
+0x4Pp7qnSqPvGuTMZQsuG8bvFBWg5XwwrLbx8AzKQ6WggnRumamV5KEwQ8pHMa20
+b2fZWPEn3KNR5LASzp9QW3cS2wKBgQDNbfYZOmrEAZw9c53VJG9S1JiqClYHg99T
+oTlklsfdNfot78odTto29LO9Tr997ZX0w93jDrxSdLyyiIdZEDVSSkbS3HSdSjfm
+nqwlogNXf5TnH88j+EkVvQWs63Q7lyrFNcEftT44ebYXH5ehzPkVbKlocztY0AWw
+iVgD8AlrUwKBgQCHE8L+fJks0KRpTk3Ap4x+mvkhgfEkC5vsaJusF9oc8UoLhOoR
+Ss+PCk19e+pQpEf84QRHIWjWceAif3kzBVwI+GKvwzJgVwIN10CSmqV7LzVw3zFb
+I0n6x9fYoY0qIb1UCHDXD31Yt17284AgJlV8ueHVU8MUenQBMDOFoKphAwKBgGGc
+/5SLSpIqhbg5iOTvtCoytPwPf0OA6QyPDnt6nivB60gKqgp1HoGAkyvAEIPg8iFl
+NLkglmHD8KoQ7+dlKUEZ5D9r28mlq5xdB0W2j0nzaKjOV5oq72dx8xFwrEFomj0t
+RsAvWgpx4xFnxKBwimcgw/rKzodsCVgSWw078O3bAoGBAOyz3sgE9c6mv5jwg2bt
+59rqGfHZizMRH0gxiC8P1Ui9dlZfnvdeBLUR/FD6XBSb450vRdcgG4AQ+HPECKkb
+kECHkBb542ymb/GqgutNLPzQ8n0Q1zO92CSX5KKmY2B+lEfer5NSc2c9gY261YMH
+AApeuDGbws/XXVLWnR1fGbH0
+-----END PRIVATE KEY-----
diff --git a/test/base64_handler_test.exs b/test/base64_handler_test.exs
index 3a19062..15e04dc 100644
--- a/test/base64_handler_test.exs
+++ b/test/base64_handler_test.exs
@@ -4,8 +4,8 @@ defmodule HTTParrot.Base64HandlerTest do
import HTTParrot.Base64Handler
setup do
- new :cowboy_req
- on_exit fn -> unload() end
+ new(:cowboy_req)
+ on_exit(fn -> unload() end)
:ok
end
diff --git a/test/basic_auth_handler_test.exs b/test/basic_auth_handler_test.exs
index e4170d4..0e7609c 100644
--- a/test/basic_auth_handler_test.exs
+++ b/test/basic_auth_handler_test.exs
@@ -4,32 +4,33 @@ defmodule HTTParrot.BasicAuthHandlerTest do
import HTTParrot.BasicAuthHandler
setup do
- new :cowboy_req
- new JSX
- on_exit fn -> unload() end
+ new(:cowboy_req)
+ new(JSX)
+ on_exit(fn -> unload() end)
:ok
end
test "is_authorized returns true if user and passwd match" do
- expect(:cowboy_req, :binding, [{[:user, :req1], :user},
- {[:passwd, :req1], :passwd}])
+ expect(:cowboy_req, :binding, [{[:user, :req1], :user}, {[:passwd, :req1], :passwd}])
expect(:cowboy_req, :parse_header, [{["authorization", :req1], {:basic, :user, :passwd}}])
assert is_authorized(:req1, :state) == {true, :req1, :user}
- assert validate :cowboy_req
- assert validate JSX
+ assert validate(:cowboy_req)
+ assert validate(JSX)
end
- test "is_authorized returns false if user and passwd doesn't match" do
- expect(:cowboy_req, :binding, [{[:user, :req1], :user},
- {[:passwd, :req1], :passwd}])
- expect(:cowboy_req, :parse_header, [{["authorization", :req1], {:basic, :not_the_user, :passwd}}])
+ test "is_authorized returns false if user and passwd doesnt match" do
+ expect(:cowboy_req, :binding, [{[:user, :req1], :user}, {[:passwd, :req1], :passwd}])
+
+ expect(:cowboy_req, :parse_header, [
+ {["authorization", :req1], {:basic, :not_the_user, :passwd}}
+ ])
assert is_authorized(:req1, :state) == {{false, "Basic realm=\"Fake Realm\""}, :req1, :state}
- assert validate :cowboy_req
- assert validate JSX
+ assert validate(:cowboy_req)
+ assert validate(JSX)
end
test "returns user and if it's authenticated" do
@@ -37,6 +38,6 @@ defmodule HTTParrot.BasicAuthHandlerTest do
assert get_json(:req1, :user) == {:json, :req1, nil}
- assert validate JSX
+ assert validate(JSX)
end
end
diff --git a/test/cache_handler_test.exs b/test/cache_handler_test.exs
index fea21ec..68eb658 100644
--- a/test/cache_handler_test.exs
+++ b/test/cache_handler_test.exs
@@ -4,9 +4,9 @@ defmodule HTTParrot.CacheHandlerTest do
import HTTParrot.CacheHandler
setup do
- new HTTParrot.GeneralRequestInfo
- new JSX
- on_exit fn -> unload() end
+ new(HTTParrot.GeneralRequestInfo)
+ new(JSX)
+ on_exit(fn -> unload() end)
:ok
end
@@ -16,7 +16,7 @@ defmodule HTTParrot.CacheHandlerTest do
assert get_json(:req1, :state) == {:json, :req2, :state}
- assert validate HTTParrot.GeneralRequestInfo
- assert validate JSX
+ assert validate(HTTParrot.GeneralRequestInfo)
+ assert validate(JSX)
end
end
diff --git a/test/deflate_handler_test.exs b/test/deflate_handler_test.exs
index 667b717..7c4043c 100644
--- a/test/deflate_handler_test.exs
+++ b/test/deflate_handler_test.exs
@@ -4,9 +4,9 @@ defmodule HTTParrot.DeflateHandlerTest do
import HTTParrot.DeflateHandler
setup do
- new HTTParrot.GeneralRequestInfo
- new JSX
- on_exit fn -> unload() end
+ new(HTTParrot.GeneralRequestInfo)
+ new(JSX)
+ on_exit(fn -> unload() end)
:ok
end
@@ -16,15 +16,15 @@ defmodule HTTParrot.DeflateHandlerTest do
expect(JSX, :prettify!, [{[:json], "json"}])
expect(:cowboy_req, :set_resp_header, 3, :req3)
- opened_zlib = :zlib.open
+ opened_zlib = :zlib.open()
:zlib.deflateInit(opened_zlib)
body = :zlib.deflate(opened_zlib, "json", :finish)
:zlib.deflateEnd(opened_zlib)
assert get_json(:req1, :state) == {body, :req3, :state}
- assert validate HTTParrot.GeneralRequestInfo
- assert validate JSX
- assert validate :cowboy_req
+ assert validate(HTTParrot.GeneralRequestInfo)
+ assert validate(JSX)
+ assert validate(:cowboy_req)
end
end
diff --git a/test/delete_handler_test.exs b/test/delete_handler_test.exs
index 2700492..bf3e21e 100644
--- a/test/delete_handler_test.exs
+++ b/test/delete_handler_test.exs
@@ -4,10 +4,10 @@ defmodule HTTParrot.DeleteHandlerTest do
import HTTParrot.DeleteHandler
setup do
- new :cowboy_req
- new HTTParrot.GeneralRequestInfo
- new JSX
- on_exit fn -> unload() end
+ new(:cowboy_req)
+ new(HTTParrot.GeneralRequestInfo)
+ new(JSX)
+ on_exit(fn -> unload() end)
:ok
end
@@ -18,8 +18,8 @@ defmodule HTTParrot.DeleteHandlerTest do
assert delete_resource(:req1, :state) == {true, :req3, :state}
- assert validate :cowboy_req
- assert validate HTTParrot.GeneralRequestInfo
- assert validate JSX
+ assert validate(:cowboy_req)
+ assert validate(HTTParrot.GeneralRequestInfo)
+ assert validate(JSX)
end
end
diff --git a/test/get_handler_test.exs b/test/get_handler_test.exs
index a455817..2d342b3 100644
--- a/test/get_handler_test.exs
+++ b/test/get_handler_test.exs
@@ -4,9 +4,9 @@ defmodule HTTParrot.GetHandlerTest do
import HTTParrot.GetHandler
setup do
- new HTTParrot.GeneralRequestInfo
- new JSX
- on_exit fn -> unload() end
+ new(HTTParrot.GeneralRequestInfo)
+ new(JSX)
+ on_exit(fn -> unload() end)
:ok
end
@@ -16,7 +16,7 @@ defmodule HTTParrot.GetHandlerTest do
assert get_json(:req1, :state) == {:json, :req2, :state}
- assert validate HTTParrot.GeneralRequestInfo
- assert validate JSX
+ assert validate(HTTParrot.GeneralRequestInfo)
+ assert validate(JSX)
end
end
diff --git a/test/gzip_handler_test.exs b/test/gzip_handler_test.exs
index 9b73a31..cde3844 100644
--- a/test/gzip_handler_test.exs
+++ b/test/gzip_handler_test.exs
@@ -4,9 +4,9 @@ defmodule HTTParrot.GzipHandlerTest do
import HTTParrot.GzipHandler
setup do
- new HTTParrot.GeneralRequestInfo
- new JSX
- on_exit fn -> unload() end
+ new(HTTParrot.GeneralRequestInfo)
+ new(JSX)
+ on_exit(fn -> unload() end)
:ok
end
@@ -20,8 +20,8 @@ defmodule HTTParrot.GzipHandlerTest do
assert get_json(:req1, :state) == {body, :req3, :state}
- assert validate HTTParrot.GeneralRequestInfo
- assert validate JSX
- assert validate :cowboy_req
+ assert validate(HTTParrot.GeneralRequestInfo)
+ assert validate(JSX)
+ assert validate(:cowboy_req)
end
end
diff --git a/test/httparrot_test.exs b/test/httparrot_test.exs
index 1ac208b..e3e4bab 100644
--- a/test/httparrot_test.exs
+++ b/test/httparrot_test.exs
@@ -11,10 +11,10 @@ defmodule HTTParrotTest do
test "'prettify_json' prettifies body response if it's a JSON" do
expect(:cowboy_req, :reply, [
- {[:status, %{"content-length" => '14'}, "{\n \"a\": \"b\"\n}", :req1], :req2}
+ {[:status, %{"content-length" => ~c"14"}, "{\n \"a\": \"b\"\n}", :req1], :req2}
])
- assert prettify_json(:status, %{"content-length" => '12'}, "{\"a\":\"b\"}", :req1) == :req2
+ assert prettify_json(:status, %{"content-length" => ~c"12"}, "{\"a\":\"b\"}", :req1) == :req2
assert validate(:cowboy_req)
end
diff --git a/test/request_store_test.exs b/test/request_store_test.exs
index 8c4ac68..f3e9457 100644
--- a/test/request_store_test.exs
+++ b/test/request_store_test.exs
@@ -1,12 +1,13 @@
defmodule HTTParrot.RequestStoreTest do
alias HTTParrot.RequestStore
use ExUnit.Case
+
test "save, retrieve, clear" do
request = %{req: 1}
RequestStore.clear(:test)
RequestStore.store(:test, request)
assert RequestStore.retrieve(:test) == [request]
- RequestStore.clear(:test)
+ RequestStore.clear(:test)
assert RequestStore.retrieve(:test) == []
end
end
diff --git a/test/retrieve_request_handler_tests.exs b/test/retrieve_request_handler_tests.exs
index f353c6a..1ee7da3 100644
--- a/test/retrieve_request_handler_tests.exs
+++ b/test/retrieve_request_handler_tests.exs
@@ -5,7 +5,7 @@ defmodule HTTParrot.RetrieveRequestHandlerTests do
setup do
HTTParrot.RequestStore.clear(:test)
- on_exit fn -> unload() end
+ on_exit(fn -> unload() end)
:ok
end
diff --git a/test/store_request_handler_test.exs b/test/store_request_handler_test.exs
index 698de59..84e516f 100644
--- a/test/store_request_handler_test.exs
+++ b/test/store_request_handler_test.exs
@@ -12,15 +12,15 @@ defmodule HTTParrot.StoreRequestHandlerTests do
test "store a request" do
expect(:cowboy_req, :binding, [:key, :req1], :test)
expect(HTTParrot.GeneralRequestInfo, :retrieve, 1, {:info, :req1})
- assert get(:req1, :state) == {'{"saved": "true"}', :req1, :state}
+ assert get(:req1, :state) == {~c'{"saved": "true"}', :req1, :state}
assert HTTParrot.RequestStore.retrieve(:test) == [:info]
end
test "store multiple requests" do
expect(:cowboy_req, :binding, [:key, :req1], :test)
expect(HTTParrot.GeneralRequestInfo, :retrieve, 1, {:info, :req1})
- assert get(:req1, :state) == {'{"saved": "true"}', :req1, :state}
- assert get(:req2, :state) == {'{"saved": "true"}', :req1, :state}
+ assert get(:req1, :state) == {~c'{"saved": "true"}', :req1, :state}
+ assert get(:req2, :state) == {~c'{"saved": "true"}', :req1, :state}
assert HTTParrot.RequestStore.retrieve(:test) == [:info, :info]
end
end
diff --git a/test/user_agent_test.exs b/test/user_agent_test.exs
index d04d5fa..7d6d45c 100644
--- a/test/user_agent_test.exs
+++ b/test/user_agent_test.exs
@@ -4,9 +4,9 @@ defmodule HTTParrot.UserAgentHandlerTest do
import HTTParrot.UserAgentHandler
setup do
- new :cowboy_req
- new JSX
- on_exit fn -> unload() end
+ new(:cowboy_req)
+ new(JSX)
+ on_exit(fn -> unload() end)
:ok
end
@@ -16,7 +16,7 @@ defmodule HTTParrot.UserAgentHandlerTest do
assert get_json(:req1, :state) == {:json, :req1, :state}
- assert validate :cowboy_req
- assert validate JSX
+ assert validate(:cowboy_req)
+ assert validate(JSX)
end
end