Browse Source

Fix markdown_middleware example

Loïc Hoguin 9 years ago
parent
commit
352cfce663

+ 4 - 4
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) ->

+ 17 - 0
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.