[Fix #28] Change catch-all path

inaka · Nov 30, 2015 · d0ddaa8 · d0ddaa8
1 parent 1f81947
commit d0ddaa8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/cowboy_swagger_handler.erl b/src/cowboy_swagger_handler.erl
@@ -69,7 +69,7 @@ trails() ->
     {file, StaticFiles ++ "/index.html"},
     #{get => #{tags => ["static-content"], description => "index.html"}}),
   Static2 = trails:trail(
-    "/[...]",
+    "/api-docs/[...]",
     cowboy_static,
     {dir, StaticFiles, [{mimetypes, cow_mimetypes, all}]},
     #{get => #{tags => ["static-content"], description => "Static Content"}}),

diff --git a/test/cowboy_swagger_handler_SUITE.erl b/test/cowboy_swagger_handler_SUITE.erl
@@ -62,4 +62,16 @@ handler_test(_Config) ->
   {ok, Index} = file:read_file("../../priv/swagger/index.html"),
   Index = Body1,
 
+  %% GET swagger-ui.js - test /api-docs/[...] trail
+  ct:comment("GET /api-docs/swagger-ui-js should return 200 OK"),
+  #{status_code := 200, body := SwaggerUIBody} =
+    cowboy_swagger_test_utils:api_call(get, "/api-docs/swagger-ui.js"),
+  {ok, SwaggerUIBodySrc} = file:read_file("../../priv/swagger/swagger-ui.js"),
+  SwaggerUIBody = SwaggerUIBodySrc,
+
+  %% GET unknown-file.ext - test /api-docs/[...] trail
+  ct:comment("GET /api-docs/unknown-file.ext should return 404 NOT FOUND"),
+  #{status_code := 404} =
+    cowboy_swagger_test_utils:api_call(get, "/api-docs/unknown-file.ext"),
+
   {comment, ""}.