Merge branch 'map-field' of https://github.com/van-mronov/phoenix int…

…o van-mronov-map-field
hurty · Mar 13, 2019 · bd5e012 · bd5e012
2 parents 7dcb06c + 595e048
commit bd5e012
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/priv/templates/phx.gen.json/controller_test.exs b/priv/templates/phx.gen.json/controller_test.exs
@@ -37,7 +37,7 @@ defmodule <%= inspect context.web_module %>.<%= inspect Module.concat(schema.web
 
       assert %{
                "id" => id<%= for {key, val} <- schema.params.create do %>,
-               "<%= key %>" => <%= Phoenix.json_library().encode!(val) %><% end %>
+               "<%= key %>" => <%= if val == %{}, do: "%{}", else: Phoenix.json_library().encode!(val) %><% end %>
              } = json_response(conn, 200)["data"]
     end
 

diff --git a/test/mix/tasks/phx.gen.json_test.exs b/test/mix/tasks/phx.gen.json_test.exs
@@ -38,6 +38,7 @@ defmodule Mix.Tasks.Phx.Gen.JsonTest do
     in_tmp_project config.test, fn ->
      Gen.Json.run(~w(Blog Post posts title slug:unique votes:integer cost:decimal
                      tags:array:text popular:boolean drafted_at:datetime
+                     params:map
                      published_at:utc_datetime
                      published_at_usec:utc_datetime_usec
                      deleted_at:naive_datetime
@@ -67,6 +68,7 @@ defmodule Mix.Tasks.Phx.Gen.JsonTest do
                        "deleted_at" => "2010-04-17T14:00:00",
                        "deleted_at_usec" => "2010-04-17T14:00:00.000000",
                        "drafted_at" => "2010-04-17T14:00:00",
+                       "params" => %{},
                        "popular" => true,
                        "published_at" => "2010-04-17T14:00:00Z",
                        "published_at_usec" => "2010-04-17T14:00:00.000000Z",