From 352cfce6635fde32348173110f35539bb8459d3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Mon, 13 Jun 2016 17:35:26 +0200 Subject: Fix markdown_middleware example --- .../markdown_middleware/src/markdown_middleware_app.erl | 8 ++++---- test/examples_SUITE.erl | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/examples/markdown_middleware/src/markdown_middleware_app.erl b/examples/markdown_middleware/src/markdown_middleware_app.erl index 0c1ea74..06253bf 100644 --- a/examples/markdown_middleware/src/markdown_middleware_app.erl +++ b/examples/markdown_middleware/src/markdown_middleware_app.erl @@ -16,10 +16,10 @@ start(_Type, _Args) -> {"/[...]", cowboy_static, {priv_dir, markdown_middleware, ""}} ]} ]), - {ok, _} = cowboy:start_http(http, 100, [{port, 8080}], [ - {env, [{dispatch, Dispatch}]}, - {middlewares, [cowboy_router, markdown_converter, cowboy_handler]} - ]), + {ok, _} = cowboy:start_clear(http, 100, [{port, 8080}], #{ + env => #{dispatch => Dispatch}, + middlewares => [cowboy_router, markdown_converter, cowboy_handler] + }), markdown_middleware_sup:start_link(). stop(_State) -> diff --git a/test/examples_SUITE.erl b/test/examples_SUITE.erl index 40a8b9c..096be02 100644 --- a/test/examples_SUITE.erl +++ b/test/examples_SUITE.erl @@ -232,3 +232,20 @@ do_file_server(Transport, Protocol, Config) -> {200, _, _} = do_get(Transport, Protocol, "/test.txt", Config), {200, _, _} = do_get(Transport, Protocol, "/video.html", Config), ok. + +%% Markdown middleware. + +markdown_middleware(Config) -> + doc("Markdown middleware example."), + try + do_compile_and_start(markdown_middleware), + do_markdown_middleware(tcp, http, Config), + do_markdown_middleware(tcp, http2, Config) + after + do_stop(markdown_middleware) + end. + +do_markdown_middleware(Transport, Protocol, Config) -> + {200, Headers, <<"

", _/bits >>} = do_get(Transport, Protocol, "/video.html", Config), + {_, <<"text/html">>} = lists:keyfind(<<"content-type">>, 1, Headers), + ok. -- cgit v1.2.3