umgeher/cowboy
0
Fork 0
mirror of https://github.com/ninenines/cowboy.git synced 2025-07-16 05:00:24 +00:00
Code Issues Wiki Activity

Merge branch 'serve-static-file' of https://github.com/klaar/cowboy

Browse source 
Fix alphabetical order since @klaar seems to have issues with it. ;)
This commit is contained in:
Loïc Hoguin 2012-05-21 15:53:31 +02:00
commit 295dc64eaa
2 changed files with 82 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

26
test/http_SUITE.erl
View file

@ -59,6 +59,8 @@
-export([static_attribute_etag/1]).
-export([static_function_etag/1]).
-export([static_mimetypes_function/1]).
-export([static_specify_file/1]).
-export([static_specify_file_catchall/1]).
-export([static_test_file/1]).
-export([static_test_file_css/1]).
-export([stream_body_set_resp/1]).
@ -102,6 +104,8 @@ groups() ->
static_attribute_etag,
static_function_etag,
static_mimetypes_function,
static_specify_file,
static_specify_file_catchall,
static_test_file,
static_test_file_css,
stream_body_set_resp,
@ -243,6 +247,10 @@ init_dispatch(Config) ->
{[<<"static_function_etag">>, '...'], cowboy_http_static,
[{directory, ?config(static_dir, Config)},
{etag, {fun static_function_etag/2, etag_data}}]},
{[<<"static_specify_file">>, '...'], cowboy_http_static,
[{directory, ?config(static_dir, Config)},
{mimetypes, [{<<".css">>, [<<"text/css">>]}]},
{file, <<"test_file.css">>}]},
{[<<"multipart">>], http_handler_multipart, []},
{[<<"echo">>, <<"body">>], http_handler_echo_body, []},
{[<<"simple">>], rest_simple_resource, []},
@ -805,6 +813,24 @@ static_mimetypes_function(Config) ->
{<<"content-type">>, <<"text/html">>}
= lists:keyfind(<<"content-type">>, 1, Headers).
static_specify_file(Config) ->
Client = ?config(client, Config),
{ok, Client2} = cowboy_client:request(<<"GET">>,
build_url("/static_specify_file", Config), Client),
{ok, 200, Headers, Client3} = cowboy_client:response(Client2),
{<<"content-type">>, <<"text/css">>}
= lists:keyfind(<<"content-type">>, 1, Headers),
{ok, <<"test_file.css\n">>, _} = cowboy_client:response_body(Client3).
static_specify_file_catchall(Config) ->
Client = ?config(client, Config),
{ok, Client2} = cowboy_client:request(<<"GET">>,
build_url("/static_specify_file/none", Config), Client),
{ok, 200, Headers, Client3} = cowboy_client:response(Client2),
{<<"content-type">>, <<"text/css">>}
= lists:keyfind(<<"content-type">>, 1, Headers),
{ok, <<"test_file.css\n">>, _} = cowboy_client:response_body(Client3).
static_test_file(Config) ->
Client = ?config(client, Config),
{ok, Client2} = cowboy_client:request(<<"GET">>,