fix(conflict): from dev

Author: mydearxym

lib/groupher_server_web/middleware/pagesize_proof.ex

@@ -22,8 +22,9 @@ defmodule GroupherServerWeb.Middleware.PageSizeProof do
         _info
       )
       when not is_nil(customization) do
-    size = String.to_integer(customization.display_density)
-    size = if size > @max_page_size, do: @max_page_size, else: size
+    # NOTE:  c11n display_density should also linted by page limit, 
+    # otherwise dataloader will crash for empty extra items
+    size = customization.display_density |> String.to_integer() |> min(@max_page_size)
 
     case Map.has_key?(arguments, :filter) do
       true ->

test/groupher_server/delivery/mention_test.exs

@@ -127,7 +127,7 @@ defmodule GroupherServer.Test.Delivery.Mention do
 
       filter = %{page: 1, size: 20, read: true}
       {:ok, mentions} = Accounts.fetch_mentions(user, filter)
-      # IO.inspect mentions, label: "hello mentions"
+
       assert mentions.total_count == 3
     end
   end

test/groupher_server/seeds/communities_test.exs

@@ -26,9 +26,6 @@ defmodule GroupherServer.Test.Seeds.Communities do
 
       {:ok, found} = ORM.find(CMS.Community, radom_community.id, preload: :categories)
       assert length(found.categories) !== 0
-
-      # {:ok, tags} = ORM.find_all(CMS.Tag, %{page: 1, size: 20})
-      # IO.inspect tags, label: "hello tags"
     end
 
     test "city communities seeds works" do
@@ -43,9 +40,6 @@ defmodule GroupherServer.Test.Seeds.Communities do
 
       {:ok, found} = ORM.find(CMS.Community, radom_community.id, preload: :categories)
       assert length(found.categories) !== 0
-
-      # {:ok, tags} = ORM.find_all(CMS.Tag, %{page: 1, size: 20})
-      # IO.inspect tags, label: "hello tags"
     end
 
     test "home community seeds works" do

test/groupher_server/statistics/statistics_test.exs

@@ -58,9 +58,6 @@ defmodule GroupherServer.Test.Statistics do
 
       {:ok, contributes} = Statistics.list_contributes(%User{id: user.id})
       assert length(contributes.records) == 1
-
-      # hello = Statistics.list_contributes(%User{id: user.id})
-      # IO.inspect hello, label: "hello"
     end
 
     test "should inserted a contribute when the user not contribute before", ~m(user)a do

test/groupher_server_web/mutation/cms/post_test.exs

@@ -63,18 +63,19 @@ defmodule GroupherServer.Test.Mutation.Post do
       assert {:ok, _} = ORM.find_by(CMS.Author, user_id: user.id)
     end
 
+    @tag :wip
     test "create post should excape xss attracts" do
       {:ok, user} = db_insert(:user)
       user_conn = simu_conn(:user, user)
 
       {:ok, community} = db_insert(:community)
-      post_attr = mock_attrs(:post, %{body: assert_v(:xss_string)})
+      post_attr = mock_attrs(:post, %{body: "<script>alert(\"hello,world\")</script>"})
 
       variables = post_attr |> Map.merge(%{communityId: community.id})
       created = user_conn |> mutation_result(@create_post_query, variables, "createPost")
       {:ok, post} = ORM.find(CMS.Post, created["id"])
 
-      assert post.body == assert_v(:xss_safe_string)
+      assert post.body == "&lt;script&gt;alert(&quot;hello,world&quot;)&lt;/script&gt;"
     end
 
     # NOTE: this test is IMPORTANT, cause json_codec: Jason in router will cause

test/groupher_server_web/mutation/cms/repo_test.exs

@@ -149,7 +149,6 @@ defmodule GroupherServer.Test.Mutation.Repo do
           "updateRepo"
         )
 
-      # IO.inspect(updated, label: "hello")
       assert updated["title"] == "new title"
       assert updated["readme"] == "new readme"
     end

test/groupher_server_web/mutation/cms/wiki_test.exs

@@ -29,7 +29,6 @@ defmodule GroupherServer.Test.Mutation.CMS.Wiki do
     {:ok, user} = db_insert(:user)
     user_conn = simu_conn(:user, user)
 
-    # IO.inspect(mock_attrs(:wiki) |> camelize_map_key, label: "hello ...")
     wiki_attrs = mock_attrs(:wiki) |> camelize_map_key
 
     variables = wiki_attrs |> Map.merge(%{communityId: community.id})

test/groupher_server_web/query/accounts/account_test.exs

@@ -196,8 +196,6 @@ defmodule GroupherServer.Test.Query.Account.Basic do
       results = guest_conn |> query_result(@query, variables, "user")
       subscribed_communities = results["subscribedCommunities"]["entries"]
 
-      # IO.inspect subscribed_communities, label: "hello subed"
-
       subscribed_communities_count = results["subscribedCommunitiesCount"]
       [community_1, community_2, community_3, community_x] = communities |> firstn_and_last(3)