[fixup] Fix show tests to mock config modulefeat/csp-for-attachments

1 files changed, 54 insertions, 38 deletions

diff --git a/src/couch_mrview/src/couch_mrview_show.erl b/src/couch_mrview/src/couch_mrview_show.erl
index 12ff4004d..ba8cb1a3b 100644
--- a/src/couch_mrview/src/couch_mrview_show.erl
+++ b/src/couch_mrview/src/couch_mrview_show.erl
@@ -385,48 +385,63 @@ last_chunk(_Req, Resp) ->
 -ifdef(TEST).
 -include_lib("eunit/include/eunit.hrl").
 
+
+-define(TDEF_FE(Name), fun(Arg) -> {atom_to_list(Name), ?_test(Name(Arg))} end).
+
+
 apply_headers_test_() ->
-    [
-        should_apply_headers(),
-        should_apply_headers_with_merge(),
-        should_apply_headers_with_merge_overwrite()
-    ].
+    {
+        foreach,
+        fun setup_config_mock/0,
+        fun teardown_config_mock/1,
+        [
+            ?TDEF_FE(should_apply_headers),
+            ?TDEF_FE(should_apply_headers_with_merge),
+            ?TDEF_FE(should_apply_headers_with_merge_overwrite)
+        ]
+    }.
 
-should_apply_headers() ->
-    ?_test(begin
-        JsonResp = [{<<"code">>, 201}],
-        Headers  = [{<<"foo">>, <<"bar">>}],
-        {Props} = apply_headers(JsonResp, Headers),
-        JsonHeaders = couch_util:get_value(<<"headers">>, Props),
-        ?assertEqual({Headers}, JsonHeaders)
-    end).
 
-should_apply_headers_with_merge() ->
-    ?_test(begin
-        BaseHeaders = [{<<"bar">>, <<"baz">>}],
-        NewHeaders  = [{<<"foo">>, <<"bar">>}],
-        JsonResp = [
-            {<<"code">>, 201},
-            {<<"headers">>, {BaseHeaders}}
-        ],
-        {Props} = apply_headers(JsonResp, NewHeaders),
-        JsonHeaders = couch_util:get_value(<<"headers">>, Props),
-        ExpectedHeaders = {NewHeaders ++ BaseHeaders},
-        ?assertEqual(ExpectedHeaders, JsonHeaders)
-    end).
+should_apply_headers(_) ->
+    JsonResp = [{<<"code">>, 201}],
+    Headers  = [{<<"foo">>, <<"bar">>}],
+    {Props} = apply_headers(JsonResp, Headers),
+    JsonHeaders = couch_util:get_value(<<"headers">>, Props),
+    ?assertEqual({Headers}, JsonHeaders).
 
-should_apply_headers_with_merge_overwrite() ->
-    ?_test(begin
-        BaseHeaders = [{<<"foo">>, <<"bar">>}],
-        NewHeaders  = [{<<"foo">>, <<"baz">>}],
-        JsonResp = [
-            {<<"code">>, 201},
-            {<<"headers">>, {BaseHeaders}}
-        ],
-        {Props} = apply_headers(JsonResp, NewHeaders),
-        JsonHeaders = couch_util:get_value(<<"headers">>, Props),
-        ?assertEqual({NewHeaders}, JsonHeaders)
-    end).
+
+should_apply_headers_with_merge(_) ->
+    BaseHeaders = [{<<"bar">>, <<"baz">>}],
+    NewHeaders  = [{<<"foo">>, <<"bar">>}],
+    JsonResp = [
+        {<<"code">>, 201},
+        {<<"headers">>, {BaseHeaders}}
+    ],
+    {Props} = apply_headers(JsonResp, NewHeaders),
+    JsonHeaders = couch_util:get_value(<<"headers">>, Props),
+    ExpectedHeaders = {NewHeaders ++ BaseHeaders},
+    ?assertEqual(ExpectedHeaders, JsonHeaders).
+
+
+should_apply_headers_with_merge_overwrite(_) ->
+    BaseHeaders = [{<<"foo">>, <<"bar">>}],
+    NewHeaders  = [{<<"foo">>, <<"baz">>}],
+    JsonResp = [
+        {<<"code">>, 201},
+        {<<"headers">>, {BaseHeaders}}
+    ],
+    {Props} = apply_headers(JsonResp, NewHeaders),
+    JsonHeaders = couch_util:get_value(<<"headers">>, Props),
+    ?assertEqual({NewHeaders}, JsonHeaders).
+
+
+setup_config_mock() ->
+    ok = meck:new(config, [passthrough]),
+    meck:expect(config, get, fun(_, _, Default) -> Default end).
+
+
+teardown_config_mock(_) ->
+    meck:unload().
 
 
 send_list_row_test_() ->
@@ -450,6 +465,7 @@ send_list_row_test_() ->
     }.
 
 setup() ->
+    ok = setup_config_mock(),
     ok = meck:expect(chttpd, send_chunk,
         fun(Resp, _) -> {ok, Resp} end),
     ok = meck:expect(chttpd, send_chunked_error,