diff --git a/.travis.yml b/.travis.yml index a70dd04..263c309 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ otp_release: install: mix deps.get before_install: - mkdir -p vendor/elixir - - wget -q https://github.com/elixir-lang/elixir/releases/download/v0.14.0/Precompiled.zip && unzip -qq Precompiled.zip -d vendor/elixir + - wget -q https://github.com/elixir-lang/elixir/releases/download/v0.14.1/Precompiled.zip && unzip -qq Precompiled.zip -d vendor/elixir - export PATH="$PATH:$PWD/vendor/elixir/bin" - export MIX_ENV=test - mix local.hex --force diff --git a/mix.exs b/mix.exs index b6cf22a..ff49b6b 100644 --- a/mix.exs +++ b/mix.exs @@ -5,7 +5,7 @@ defmodule Httparrot.Mixfile do [ app: :httparrot, version: "0.2.1", name: "HTTParrot", - elixir: "~> 0.14.0", + elixir: "~> 0.14.1", deps: deps ] end diff --git a/test/base64_handler_test.exs b/test/base64_handler_test.exs index d5f8f47..fad414a 100644 --- a/test/base64_handler_test.exs +++ b/test/base64_handler_test.exs @@ -5,10 +5,8 @@ defmodule HTTParrot.Base64HandlerTest do setup do new :cowboy_req - end - - teardown do - unload :cowboy_req + on_exit fn -> unload end + :ok end test "halts with error" do diff --git a/test/basic_auth_handler_test.exs b/test/basic_auth_handler_test.exs index cdd85c6..a98d42e 100644 --- a/test/basic_auth_handler_test.exs +++ b/test/basic_auth_handler_test.exs @@ -6,11 +6,8 @@ defmodule HTTParrot.BasicAuthHandlerTest do setup do new :cowboy_req new JSEX - end - - teardown do - unload :cowboy_req - unload JSEX + on_exit fn -> unload end + :ok end test "is_authorized returns true if user and passwd match" do diff --git a/test/cache_handler_test.exs b/test/cache_handler_test.exs index ca6f8c2..d939dc7 100644 --- a/test/cache_handler_test.exs +++ b/test/cache_handler_test.exs @@ -6,11 +6,8 @@ defmodule HTTParrot.CacheHandlerTest do setup do new HTTParrot.GeneralRequestInfo new JSEX - end - - teardown do - unload HTTParrot.GeneralRequestInfo - unload JSEX + on_exit fn -> unload end + :ok end test "returns prettified json with query values, headers, url and origin" do diff --git a/test/cookies_handler_test.exs b/test/cookies_handler_test.exs index 6f30288..c61a52c 100644 --- a/test/cookies_handler_test.exs +++ b/test/cookies_handler_test.exs @@ -6,11 +6,8 @@ defmodule HTTParrot.CookiesHandlerTest do setup do new :cowboy_req new JSEX - end - - teardown do - unload :cowboy_req - unload JSEX + on_exit fn -> unload end + :ok end test "returns a JSON with all the cookies o/" do diff --git a/test/delayed_handler_test.exs b/test/delayed_handler_test.exs index e5059d6..b58f931 100644 --- a/test/delayed_handler_test.exs +++ b/test/delayed_handler_test.exs @@ -7,12 +7,8 @@ defmodule HTTParrot.DelayedHandlerTest do new HTTParrot.GeneralRequestInfo new JSEX new :cowboy_req - end - - teardown do - unload HTTParrot.GeneralRequestInfo - unload JSEX - unload :cowboy_req + on_exit fn -> unload end + :ok end test "malformed_request returns false if it's not an integer" do diff --git a/test/delete_cookies_handler_test.exs b/test/delete_cookies_handler_test.exs index 764f616..d5ee573 100644 --- a/test/delete_cookies_handler_test.exs +++ b/test/delete_cookies_handler_test.exs @@ -5,10 +5,8 @@ defmodule HTTParrot.DeleteCookiesHandlerTest do setup do new :cowboy_req - end - - teardown do - unload :cowboy_req + on_exit fn -> unload end + :ok end test "delete cookies and redirect to /cookies " do diff --git a/test/delete_handler_test.exs b/test/delete_handler_test.exs index f13cecd..c409a44 100644 --- a/test/delete_handler_test.exs +++ b/test/delete_handler_test.exs @@ -7,12 +7,8 @@ defmodule HTTParrot.DeleteHandlerTest do new :cowboy_req new HTTParrot.GeneralRequestInfo new JSEX - end - - teardown do - unload :cowboy_req - unload HTTParrot.GeneralRequestInfo - unload JSEX + on_exit fn -> unload end + :ok end test "returns prettified json with query values, headers, url and origin" do diff --git a/test/general_request_info_test.exs b/test/general_request_info_test.exs index 67a40c9..b33be01 100644 --- a/test/general_request_info_test.exs +++ b/test/general_request_info_test.exs @@ -5,10 +5,8 @@ defmodule HTTParrot.GeneralRequestInfoTest do setup do new :cowboy_req - end - - teardown do - unload :cowboy_req + on_exit fn -> unload end + :ok end doctest HTTParrot.GeneralRequestInfo diff --git a/test/get_handler_test.exs b/test/get_handler_test.exs index 4bc4e1d..65a5d8a 100644 --- a/test/get_handler_test.exs +++ b/test/get_handler_test.exs @@ -6,11 +6,8 @@ defmodule HTTParrot.GetHandlerTest do setup do new HTTParrot.GeneralRequestInfo new JSEX - end - - teardown do - unload HTTParrot.GeneralRequestInfo - unload JSEX + on_exit fn -> unload end + :ok end test "returns prettified json with query values, headers, url and origin" do diff --git a/test/headers_handler_test.exs b/test/headers_handler_test.exs index 7489524..1c74cca 100644 --- a/test/headers_handler_test.exs +++ b/test/headers_handler_test.exs @@ -6,11 +6,8 @@ defmodule HTTParrot.HeadersHandlerTest do setup do new :cowboy_req new JSEX - end - - teardown do - unload :cowboy_req - unload JSEX + on_exit fn -> unload end + :ok end test "returns prettified json with headers list" do diff --git a/test/hidden_basic_auth_handler_test.exs b/test/hidden_basic_auth_handler_test.exs index de82c73..e0406fb 100644 --- a/test/hidden_basic_auth_handler_test.exs +++ b/test/hidden_basic_auth_handler_test.exs @@ -6,11 +6,8 @@ defmodule HTTParrot.HiddenBasicAuthHandlerTest do setup do new :cowboy_req new JSEX - end - - teardown do - unload :cowboy_req - unload JSEX + on_exit fn -> unload end + :ok end test "resource_exists returns true if user and passwd match" do diff --git a/test/httparrot_test.exs b/test/httparrot_test.exs index 8387af3..ba8be5e 100644 --- a/test/httparrot_test.exs +++ b/test/httparrot_test.exs @@ -5,11 +5,10 @@ defmodule HTTParrotTest do setup do new :cowboy_req + on_exit fn -> unload end + :ok end - teardown do - unload :cowboy_req - end 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], {:ok, :req2}}]) diff --git a/test/ip_handler_test.exs b/test/ip_handler_test.exs index c08d1aa..efc1592 100644 --- a/test/ip_handler_test.exs +++ b/test/ip_handler_test.exs @@ -6,11 +6,8 @@ defmodule HTTParrot.IPHandlerTest do setup do new :cowboy_req new JSEX - end - - teardown do - unload :cowboy_req - unload JSEX + on_exit fn -> unload end + :ok end test "returns prettified json with origin" do diff --git a/test/p_handler_test.exs b/test/p_handler_test.exs index ae76932..279a875 100644 --- a/test/p_handler_test.exs +++ b/test/p_handler_test.exs @@ -7,12 +7,8 @@ defmodule HTTParrot.PHandlerTest do new HTTParrot.GeneralRequestInfo new JSEX new :cowboy_req - end - - teardown do - unload HTTParrot.GeneralRequestInfo - unload JSEX - unload :cowboy_req + on_exit fn -> unload end + :ok end Enum.each [{"/post", "POST"}, diff --git a/test/redirect_handler_test.exs b/test/redirect_handler_test.exs index e04a627..a3549cb 100644 --- a/test/redirect_handler_test.exs +++ b/test/redirect_handler_test.exs @@ -5,10 +5,8 @@ defmodule HTTParrot.RedirectHandlerTest do setup do new :cowboy_req - end - - teardown do - unload :cowboy_req + on_exit fn -> unload end + :ok end test "malformed_request returns false if it's not an integer" do diff --git a/test/redirect_to_handler_test.exs b/test/redirect_to_handler_test.exs index 782e5ae..68e5c6e 100644 --- a/test/redirect_to_handler_test.exs +++ b/test/redirect_to_handler_test.exs @@ -5,10 +5,8 @@ defmodule HTTParrot.RedirectToHandlerTest do setup do new :cowboy_req - end - - teardown do - unload :cowboy_req + on_exit fn -> unload end + :ok end test "malformed_request returns true if no 'url' is defined" do diff --git a/test/relative_redirect_handler_test.exs b/test/relative_redirect_handler_test.exs index 628de58..4ba318a 100644 --- a/test/relative_redirect_handler_test.exs +++ b/test/relative_redirect_handler_test.exs @@ -5,10 +5,8 @@ defmodule HTTParrot.RelativeRedirectHandlerTest do setup do new :cowboy_req - end - - teardown do - unload :cowboy_req + on_exit fn -> unload end + :ok end test "malformed_request returns false if it's not an integer" do diff --git a/test/set_cookies_handler_test.exs b/test/set_cookies_handler_test.exs index bcd376f..baf1761 100644 --- a/test/set_cookies_handler_test.exs +++ b/test/set_cookies_handler_test.exs @@ -5,10 +5,8 @@ defmodule HTTParrot.SetCookiesHandlerTest do setup do new :cowboy_req - end - - teardown do - unload :cowboy_req + on_exit fn -> unload end + :ok end test "malformed_request returns false if /name/value is sent" do diff --git a/test/status_code_handler_test.exs b/test/status_code_handler_test.exs index e5bb995..b0f0887 100644 --- a/test/status_code_handler_test.exs +++ b/test/status_code_handler_test.exs @@ -5,10 +5,8 @@ defmodule HTTParrot.StatusCodeHandlerTest do setup do new :cowboy_req - end - - teardown do - unload :cowboy_req + on_exit fn -> unload end + :ok end test "reply with 'code' as status code" do diff --git a/test/stream_handler_test.exs b/test/stream_handler_test.exs index de0e200..632fb78 100644 --- a/test/stream_handler_test.exs +++ b/test/stream_handler_test.exs @@ -1,5 +1,5 @@ defmodule HTTParrot.StreamHandlerTest do - use ExUnit.Case + use ExUnit.Case, async: false import :meck import HTTParrot.StreamHandler @@ -7,12 +7,8 @@ defmodule HTTParrot.StreamHandlerTest do new :cowboy_req new HTTParrot.GeneralRequestInfo new JSEX - end - - teardown do - unload :cowboy_req - unload HTTParrot.GeneralRequestInfo - unload JSEX + on_exit fn -> unload end + :ok end test "malformed_request returns false if it's not an integer" do diff --git a/test/user_agent_test.exs b/test/user_agent_test.exs index c3bf046..cf436f1 100644 --- a/test/user_agent_test.exs +++ b/test/user_agent_test.exs @@ -6,11 +6,8 @@ defmodule HTTParrot.UserAgentHandlerTest do setup do new :cowboy_req new JSEX - end - - teardown do - unload :cowboy_req - unload JSEX + on_exit fn -> unload end + :ok end test "returns prettified json with user agent" do