Skip to content
This repository was archived by the owner on Nov 8, 2022. It is now read-only.

Commit 92128fd

Browse files
committed
refactor(article-tags): fix tests
1 parent 8c5d89a commit 92128fd

File tree

9 files changed

+27
-6
lines changed

9 files changed

+27
-6
lines changed

lib/groupher_server/cms/article_tag.ex

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ defmodule GroupherServer.CMS.ArticleTag do
33
alias __MODULE__
44

55
use Ecto.Schema
6+
use Accessible
7+
68
import Ecto.Changeset
79

810
alias GroupherServer.CMS

lib/groupher_server/cms/helper/loader.ex

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ defmodule GroupherServer.CMS.Helper.Loader do
1212
CommunityEditor,
1313
CommunitySubscriber,
1414
CommunityThread,
15+
ArticleTag,
1516
# POST
1617
Post,
1718
PostComment,

lib/groupher_server_web/schema/cms/cms_types.ex

+3-3
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ defmodule GroupherServerWeb.Schema.CMS.Types do
6464
# NOTE: only meaningful in paged-xxx queries
6565
field(:is_pinned, :boolean)
6666
field(:mark_delete, :boolean)
67-
field(:article_tags, list_of(:article_tag), resolve: dataloader(CMS, :article_tag))
67+
field(:article_tags, list_of(:article_tag), resolve: dataloader(CMS, :article_tags))
6868

6969
field(:author, :user, resolve: dataloader(CMS, :author))
7070
field(:original_community, :community, resolve: dataloader(CMS, :original_community))
@@ -122,7 +122,7 @@ defmodule GroupherServerWeb.Schema.CMS.Types do
122122
field(:mark_delete, :boolean)
123123

124124
field(:author, :user, resolve: dataloader(CMS, :author))
125-
field(:article_tags, list_of(:article_tag), resolve: dataloader(CMS, :article_tag))
125+
field(:article_tags, list_of(:article_tag), resolve: dataloader(CMS, :article_tags))
126126
field(:original_community, :community, resolve: dataloader(CMS, :original_community))
127127
field(:communities, list_of(:community), resolve: dataloader(CMS, :communities))
128128

@@ -174,7 +174,7 @@ defmodule GroupherServerWeb.Schema.CMS.Types do
174174

175175
field(:last_sync, :datetime)
176176

177-
field(:article_tags, list_of(:article_tag), resolve: dataloader(CMS, :article_tag))
177+
field(:article_tags, list_of(:article_tag), resolve: dataloader(CMS, :article_tags))
178178
field(:original_community, :community, resolve: dataloader(CMS, :original_community))
179179
field(:communities, list_of(:community), resolve: dataloader(CMS, :communities))
180180

test/groupher_server_web/mutation/cms/articles/job_test.exs

+2-2
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ defmodule GroupherServer.Test.Mutation.Articles.Job do
142142
title
143143
body
144144
salary
145-
tags {
145+
articleTags {
146146
id
147147
}
148148
}
@@ -191,7 +191,7 @@ defmodule GroupherServer.Test.Mutation.Articles.Job do
191191
body: "updated body #{unique_num}"
192192
}
193193

194-
updated = rule_conn |> mutation_result(@query, variables, "updateJob")
194+
updated = rule_conn |> mutation_result(@query, variables, "updateJob", :debug)
195195

196196
assert updated["id"] == to_string(job.id)
197197
end

test/groupher_server_web/mutation/cms/articles/post_test.exs

+4
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,9 @@ defmodule GroupherServer.Test.Mutation.Articles.Post do
177177
id
178178
nickname
179179
}
180+
articleTags {
181+
id
182+
}
180183
}
181184
}
182185
"""
@@ -192,6 +195,7 @@ defmodule GroupherServer.Test.Mutation.Articles.Post do
192195
assert guest_conn |> mutation_get_error?(@query, variables, ecode(:account_login))
193196
end
194197

198+
@tag :wip2
195199
test "post can be update by owner", ~m(owner_conn post)a do
196200
unique_num = System.unique_integer([:positive, :monotonic])
197201

test/groupher_server_web/mutation/statistics/statistics_test.exs

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ defmodule GroupherServer.Test.Mutation.Statistics do
3939
}
4040
}
4141
"""
42-
@tag :wip2
4342
test "user should have contribute list after create a post", ~m(user_conn user community)a do
4443
post_attr = mock_attrs(:post)
4544
variables = post_attr |> Map.merge(%{communityId: community.id})

test/groupher_server_web/query/cms/paged_articles/paged_jobs_test.exs

+5
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedJobs do
4444
pagedJobs(filter: $filter) {
4545
entries {
4646
id
47+
articleTags {
48+
id
49+
}
4750
}
4851
totalPages
4952
totalCount
@@ -52,13 +55,15 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedJobs do
5255
}
5356
}
5457
"""
58+
@tag :wip2
5559
test "should get pagination info", ~m(guest_conn)a do
5660
variables = %{filter: %{page: 1, size: 10}}
5761
results = guest_conn |> query_result(@query, variables, "pagedJobs")
5862

5963
assert results |> is_valid_pagination?
6064
assert results["pageSize"] == 10
6165
assert results["totalCount"] == @total_count
66+
assert results["entries"] |> List.first() |> Map.get("articleTags") |> is_list
6267
end
6368

6469
test "request large size fails", ~m(guest_conn)a do

test/groupher_server_web/query/cms/paged_articles/paged_posts_test.exs

+5
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedPosts do
4848
communities {
4949
raw
5050
}
51+
articleTags {
52+
id
53+
}
5154
}
5255
totalPages
5356
totalCount
@@ -56,13 +59,15 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedPosts do
5659
}
5760
}
5861
"""
62+
@tag :wip2
5963
test "should get pagination info", ~m(guest_conn)a do
6064
variables = %{filter: %{page: 1, size: 10}}
6165
results = guest_conn |> query_result(@query, variables, "pagedPosts")
6266

6367
assert results |> is_valid_pagination?
6468
assert results["pageSize"] == 10
6569
assert results["totalCount"] == @total_count
70+
assert results["entries"] |> List.first() |> Map.get("articleTags") |> is_list
6671
end
6772

6873
test "request large size fails", ~m(guest_conn)a do

test/groupher_server_web/query/cms/paged_articles/paged_repos_test.exs

+5
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedRepos do
4040
pagedRepos(filter: $filter) {
4141
entries {
4242
id
43+
articleTags {
44+
id
45+
}
4346
}
4447
totalPages
4548
totalCount
@@ -48,13 +51,15 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedRepos do
4851
}
4952
}
5053
"""
54+
@tag :wip2
5155
test "should get pagination info", ~m(guest_conn)a do
5256
variables = %{filter: %{page: 1, size: 10}}
5357
results = guest_conn |> query_result(@query, variables, "pagedRepos")
5458

5559
assert results |> is_valid_pagination?
5660
assert results["pageSize"] == 10
5761
assert results["totalCount"] == @total_count
62+
assert results["entries"] |> List.first() |> Map.get("articleTags") |> is_list
5863
end
5964

6065
test "request large size fails", ~m(guest_conn)a do

0 commit comments

Comments
 (0)