aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2013-01-29 22:27:50 +0100
committerLoïc Hoguin <[email protected]>2013-01-29 22:33:03 +0100
commitd9b3727a628975dfcc8707e143e45884873e42cb (patch)
tree780dff043589c4c03e4075423749a28189de4738 /test
parentf710ac86f87cd9a6a6daa36a9d3c28f397f32397 (diff)
parentf1b4acbb441f665f7387ad30dda5bb861ec0400a (diff)
downloadcowboy-d9b3727a628975dfcc8707e143e45884873e42cb.tar.gz
cowboy-d9b3727a628975dfcc8707e143e45884873e42cb.tar.bz2
cowboy-d9b3727a628975dfcc8707e143e45884873e42cb.zip
Merge branch 'patch-1' of https://github.com/CamShaft/cowboy
Conflicts: src/cowboy_rest.erl
Diffstat (limited to 'test')
-rw-r--r--test/http_SUITE.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/http_SUITE.erl b/test/http_SUITE.erl
index 0b35cf3..afe62c3 100644
--- a/test/http_SUITE.erl
+++ b/test/http_SUITE.erl
@@ -855,7 +855,7 @@ rest_nodelete(Config) ->
rest_patch(Config) ->
Tests = [
{204, [{<<"content-type">>, <<"text/plain">>}], <<"whatever">>},
- {500, [{<<"content-type">>, <<"text/plain">>}], <<"false">>},
+ {422, [{<<"content-type">>, <<"text/plain">>}], <<"false">>},
{400, [{<<"content-type">>, <<"text/plain">>}], <<"halt">>},
{415, [{<<"content-type">>, <<"application/json">>}], <<"bad_content_type">>}
],