aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2016-06-13 17:35:26 +0200
committerLoïc Hoguin <[email protected]>2016-06-13 17:35:26 +0200
commit352cfce6635fde32348173110f35539bb8459d3f (patch)
treebebb35b203064c2b9fe0cb1b1d3bda6ecc4e7e77
parent6f75598b70801bbfb6828e5367bc7ed7477ad915 (diff)
downloadcowboy-352cfce6635fde32348173110f35539bb8459d3f.tar.gz
cowboy-352cfce6635fde32348173110f35539bb8459d3f.tar.bz2
cowboy-352cfce6635fde32348173110f35539bb8459d3f.zip
Fix markdown_middleware example
-rw-r--r--examples/markdown_middleware/src/markdown_middleware_app.erl8
-rw-r--r--test/examples_SUITE.erl17
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, <<"<h1>", _/bits >>} = do_get(Transport, Protocol, "/video.html", Config),
+ {_, <<"text/html">>} = lists:keyfind(<<"content-type">>, 1, Headers),
+ ok.