aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2014-06-10 08:38:54 +0200
committerLoïc Hoguin <[email protected]>2014-06-10 08:39:40 +0200
commitfc7e038fbab8ad1b5b11548f9d009c1b6ccd4be3 (patch)
tree4fc8ce506d07f8acf08ed545aaf0df18dbcd9d06 /test
parent7a808e0aa3e764d923da74e18f76790936d19a35 (diff)
parent6ed25fd60b0cc502ae79baf20456bb2d2b02973e (diff)
downloadcowboy-fc7e038fbab8ad1b5b11548f9d009c1b6ccd4be3.tar.gz
cowboy-fc7e038fbab8ad1b5b11548f9d009c1b6ccd4be3.tar.bz2
cowboy-fc7e038fbab8ad1b5b11548f9d009c1b6ccd4be3.zip
Merge branch 'binary-expires' of git://github.com/NineFX/cowboy
Diffstat (limited to 'test')
-rw-r--r--test/http_SUITE.erl8
-rw-r--r--test/http_SUITE_data/rest_expires_binary.erl18
2 files changed, 26 insertions, 0 deletions
diff --git a/test/http_SUITE.erl b/test/http_SUITE.erl
index 8ab99cb..0e115e0 100644
--- a/test/http_SUITE.erl
+++ b/test/http_SUITE.erl
@@ -207,6 +207,7 @@ init_dispatch(Config) ->
{"/patch", rest_patch_resource, []},
{"/resetags", rest_resource_etags, []},
{"/rest_expires", rest_expires, []},
+ {"/rest_expires_binary", rest_expires_binary, []},
{"/rest_empty_resource", rest_empty_resource, []},
{"/loop_stream_recv", http_loop_stream_recv, []},
{"/", http_handler, []}
@@ -687,6 +688,13 @@ rest_expires(Config) ->
Expires = LastModified = <<"Fri, 21 Sep 2012 22:36:14 GMT">>,
ok.
+rest_expires_binary(Config) ->
+ ConnPid = gun_open(Config),
+ Ref = gun:get(ConnPid, "/rest_expires_binary"),
+ {response, nofin, 200, Headers} = gun:await(ConnPid, Ref),
+ {_, <<"0">>} = lists:keyfind(<<"expires">>, 1, Headers),
+ ok.
+
rest_keepalive(Config) ->
ConnPid = gun_open(Config),
Refs = [gun:get(ConnPid, "/simple") || _ <- lists:seq(1, 10)],
diff --git a/test/http_SUITE_data/rest_expires_binary.erl b/test/http_SUITE_data/rest_expires_binary.erl
new file mode 100644
index 0000000..4cbd001
--- /dev/null
+++ b/test/http_SUITE_data/rest_expires_binary.erl
@@ -0,0 +1,18 @@
+-module(rest_expires_binary).
+
+-export([init/3]).
+-export([content_types_provided/2]).
+-export([get_text_plain/2]).
+-export([expires/2]).
+
+init(_Transport, _Req, _Opts) ->
+ {upgrade, protocol, cowboy_rest}.
+
+content_types_provided(Req, State) ->
+ {[{{<<"text">>, <<"plain">>, []}, get_text_plain}], Req, State}.
+
+get_text_plain(Req, State) ->
+ {<<"This is REST!">>, Req, State}.
+
+expires(Req, State) ->
+ {<<"0">>, Req, State}.