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

Commit 4e0aa9f

Browse files
mydearxymmydearxym
committed
chore(works): pural issue
1 parent 0afb2c9 commit 4e0aa9f

File tree

2 files changed

+41
-41
lines changed

2 files changed

+41
-41
lines changed

‎test/groupher_server_web/query/accounts/published/published_works_test.exs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
defmodule GroupherServer.Test.Query.Accounts.Published.Workss do
1+
defmodule GroupherServer.Test.Query.Accounts.Published.Works do
22
use GroupherServer.TestTools
33

44
alias GroupherServer.CMS
@@ -19,7 +19,7 @@ defmodule GroupherServer.Test.Query.Accounts.Published.Workss do
1919
describe "[published workss]" do
2020
@query """
2121
query($login: String!, $filter: PagedFilter!) {
22-
pagedPublishedWorkss(login: $login, filter: $filter) {
22+
pagedPublishedWorks(login: $login, filter: $filter) {
2323
entries {
2424
id
2525
title
@@ -42,7 +42,7 @@ defmodule GroupherServer.Test.Query.Accounts.Published.Workss do
4242
{:ok, works2} = CMS.create_article(community, :works, works_attrs, user)
4343

4444
variables = %{login: user.login, filter: %{page: 1, size: 20}}
45-
results = guest_conn |> query_result(@query, variables, "pagedPublishedWorkss")
45+
results = guest_conn |> query_result(@query, variables, "pagedPublishedWorks")
4646

4747
assert results["entries"] |> Enum.any?(&(&1["id"] == to_string(works.id)))
4848
assert results["entries"] |> Enum.any?(&(&1["id"] == to_string(works2.id)))

‎test/groupher_server_web/query/cms/paged_articles/paged_works_test.exs‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
defmodule GroupherServer.Test.Query.PagedArticles.PagedWorkss do
1+
defmodule GroupherServer.Test.Query.PagedArticles.PagedWorks do
22
@moduledoc false
33
use GroupherServer.TestTools
44

@@ -44,8 +44,8 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedWorkss do
4444

4545
describe "[query paged_workss filter pagination]" do
4646
@query """
47-
query($filter: PagedWorkssFilter!) {
48-
pagedWorkss(filter: $filter) {
47+
query($filter: PagedWorksFilter!) {
48+
pagedWorks(filter: $filter) {
4949
entries {
5050
id
5151
document {
@@ -68,7 +68,7 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedWorkss do
6868
"""
6969
test "should get pagination info", ~m(guest_conn)a do
7070
variables = %{filter: %{page: 1, size: 10}}
71-
results = guest_conn |> query_result(@query, variables, "pagedWorkss")
71+
results = guest_conn |> query_result(@query, variables, "pagedWorks")
7272

7373
assert results |> is_valid_pagination?
7474
assert results["pageSize"] == 10
@@ -84,7 +84,7 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedWorkss do
8484
{:ok, _works} = CMS.create_article(community, :works, works_attrs, user)
8585

8686
variables = %{filter: %{page: 1, size: 30}}
87-
results = guest_conn |> query_result(@query, variables, "pagedWorkss")
87+
results = guest_conn |> query_result(@query, variables, "pagedWorks")
8888

8989
works = results["entries"] |> List.first()
9090
assert not is_nil(get_in(works, ["document", "bodyHtml"]))
@@ -100,7 +100,7 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedWorkss do
100100
{:ok, _} = CMS.set_article_tag(:works, works.id, article_tag.id)
101101

102102
variables = %{filter: %{page: 1, size: 10, article_tag: article_tag.title}}
103-
results = guest_conn |> query_result(@query, variables, "pagedWorkss")
103+
results = guest_conn |> query_result(@query, variables, "pagedWorks")
104104

105105
works = results["entries"] |> List.first()
106106
assert results["totalCount"] == 1
@@ -125,7 +125,7 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedWorkss do
125125
filter: %{page: 1, size: 10, article_tags: [article_tag.title, article_tag2.title]}
126126
}
127127

128-
results = guest_conn |> query_result(@query, variables, "pagedWorkss")
128+
results = guest_conn |> query_result(@query, variables, "pagedWorks")
129129

130130
works = results["entries"] |> List.first()
131131
assert results["totalCount"] == 1
@@ -151,7 +151,7 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedWorkss do
151151
filter: %{page: 1, size: 10, community: community.raw, article_tag: article_tag.title}
152152
}
153153

154-
results = guest_conn |> query_result(@query, variables, "pagedWorkss")
154+
results = guest_conn |> query_result(@query, variables, "pagedWorks")
155155

156156
assert not exist_in?(pinned_works, results["entries"], :string_key)
157157
assert exist_in?(works, results["entries"], :string_key)
@@ -160,7 +160,7 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedWorkss do
160160
filter: %{page: 1, size: 10, community: community.raw, article_tags: [article_tag.title]}
161161
}
162162

163-
results = guest_conn |> query_result(@query, variables, "pagedWorkss")
163+
results = guest_conn |> query_result(@query, variables, "pagedWorks")
164164

165165
assert not exist_in?(pinned_works, results["entries"], :string_key)
166166
assert exist_in?(works, results["entries"], :string_key)
@@ -175,7 +175,7 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedWorkss do
175175
{:ok, _works} = CMS.create_article(community, :works, works_attrs2, user)
176176

177177
variables = %{filter: %{page: 1, size: 10, community: community.raw}}
178-
results = guest_conn |> query_result(@query, variables, "pagedWorkss")
178+
results = guest_conn |> query_result(@query, variables, "pagedWorks")
179179

180180
works = results["entries"] |> List.first()
181181
assert results["totalCount"] == 2
@@ -197,7 +197,7 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedWorkss do
197197

198198
test "pagination should have default page and size arg", ~m(guest_conn)a do
199199
variables = %{filter: %{}}
200-
results = guest_conn |> query_result(@query, variables, "pagedWorkss")
200+
results = guest_conn |> query_result(@query, variables, "pagedWorks")
201201
assert results |> is_valid_pagination?
202202
assert results["pageSize"] == @page_size
203203
assert results["totalCount"] == @total_count
@@ -206,8 +206,8 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedWorkss do
206206

207207
describe "[query paged_workss filter has_xxx]" do
208208
@query """
209-
query($filter: PagedWorkssFilter!) {
210-
pagedWorkss(filter: $filter) {
209+
query($filter: PagedWorksFilter!) {
210+
pagedWorks(filter: $filter) {
211211
entries {
212212
id
213213
viewerHasCollected
@@ -229,7 +229,7 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedWorkss do
229229
{:ok, _works3} = CMS.create_article(community, :works, mock_attrs(:works), user)
230230

231231
variables = %{filter: %{community: community.raw}}
232-
results = user_conn |> query_result(@query, variables, "pagedWorkss")
232+
results = user_conn |> query_result(@query, variables, "pagedWorks")
233233
assert results["totalCount"] == 3
234234

235235
the_works = Enum.find(results["entries"], &(&1["id"] == to_string(works.id)))
@@ -243,7 +243,7 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedWorkss do
243243
{:ok, _} = CMS.collect_article(:works, works.id, user)
244244
{:ok, _} = CMS.report_article(:works, works.id, "reason", "attr_info", user)
245245

246-
results = user_conn |> query_result(@query, variables, "pagedWorkss")
246+
results = user_conn |> query_result(@query, variables, "pagedWorks")
247247
the_works = Enum.find(results["entries"], &(&1["id"] == to_string(works.id)))
248248
assert the_works["viewerHasViewed"]
249249
assert the_works["viewerHasUpvoted"]
@@ -254,8 +254,8 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedWorkss do
254254

255255
describe "[query paged_workss filter sort]" do
256256
@query """
257-
query($filter: PagedWorkssFilter!) {
258-
pagedWorkss(filter: $filter) {
257+
query($filter: PagedWorksFilter!) {
258+
pagedWorks(filter: $filter) {
259259
entries {
260260
id
261261
inserted_at
@@ -276,7 +276,7 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedWorkss do
276276
{:ok, works} = CMS.create_article(community, :works, mock_attrs(:works), user)
277277

278278
variables = %{filter: %{community: community.raw}}
279-
results = guest_conn |> query_result(@query, variables, "pagedWorkss")
279+
results = guest_conn |> query_result(@query, variables, "pagedWorks")
280280

281281
assert length(results["entries"]) == 1
282282
assert results["entries"] |> Enum.any?(&(&1["id"] == to_string(works.id)))
@@ -287,15 +287,15 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedWorkss do
287287
{:ok, _works} = CMS.create_article(community, :works, mock_attrs(:works), user)
288288

289289
variables = %{filter: %{community: community.raw}}
290-
results = guest_conn |> query_result(@query, variables, "pagedWorkss")
290+
results = guest_conn |> query_result(@query, variables, "pagedWorks")
291291
works = results["entries"] |> List.first()
292292

293293
assert works["inserted_at"] == works["active_at"]
294294
end
295295

296296
test "filter sort should have default :desc_active", ~m(guest_conn)a do
297297
variables = %{filter: %{}}
298-
results = guest_conn |> query_result(@query, variables, "pagedWorkss")
298+
results = guest_conn |> query_result(@query, variables, "pagedWorks")
299299
active_timestamps = results["entries"] |> Enum.map(& &1["active_at"])
300300

301301
{:ok, first_active_time, 0} = active_timestamps |> List.first() |> DateTime.from_iso8601()
@@ -305,8 +305,8 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedWorkss do
305305
end
306306

307307
@query """
308-
query($filter: PagedWorkssFilter!) {
309-
pagedWorkss(filter: $filter) {
308+
query($filter: PagedWorksFilter!) {
309+
pagedWorks(filter: $filter) {
310310
entries {
311311
id
312312
views
@@ -319,7 +319,7 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedWorkss do
319319
most_views_works = Works |> order_by(desc: :views) |> limit(1) |> Repo.one()
320320
variables = %{filter: %{sort: "MOST_VIEWS"}}
321321

322-
results = guest_conn |> query_result(@query, variables, "pagedWorkss")
322+
results = guest_conn |> query_result(@query, variables, "pagedWorks")
323323
find_works = results |> Map.get("entries") |> hd
324324

325325
assert find_works["views"] == most_views_works |> Map.get(:views)
@@ -332,8 +332,8 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedWorkss do
332332
"""
333333
describe "[query paged_workss filter when]" do
334334
@query """
335-
query($filter: PagedWorkssFilter!) {
336-
pagedWorkss(filter: $filter) {
335+
query($filter: PagedWorksFilter!) {
336+
pagedWorks(filter: $filter) {
337337
entries {
338338
id
339339
views
@@ -345,14 +345,14 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedWorkss do
345345
"""
346346
test "THIS_YEAR option should work", ~m(guest_conn works_last_year)a do
347347
variables = %{filter: %{when: "THIS_YEAR"}}
348-
results = guest_conn |> query_result(@query, variables, "pagedWorkss")
348+
results = guest_conn |> query_result(@query, variables, "pagedWorks")
349349

350350
assert results["entries"] |> Enum.any?(&(&1["id"] != works_last_year.id))
351351
end
352352

353353
test "TODAY option should work", ~m(guest_conn)a do
354354
variables = %{filter: %{when: "TODAY"}}
355-
results = guest_conn |> query_result(@query, variables, "pagedWorkss")
355+
results = guest_conn |> query_result(@query, variables, "pagedWorks")
356356

357357
expect_count = @total_count - @last_year_count - @last_month_count - @last_week_count
358358

@@ -361,14 +361,14 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedWorkss do
361361

362362
test "THIS_WEEK option should work", ~m(guest_conn)a do
363363
variables = %{filter: %{when: "THIS_WEEK"}}
364-
results = guest_conn |> query_result(@query, variables, "pagedWorkss")
364+
results = guest_conn |> query_result(@query, variables, "pagedWorks")
365365

366366
assert results |> Map.get("totalCount") == @today_count
367367
end
368368

369369
test "THIS_MONTH option should work", ~m(guest_conn)a do
370370
variables = %{filter: %{when: "THIS_MONTH"}}
371-
results = guest_conn |> query_result(@query, variables, "pagedWorkss")
371+
results = guest_conn |> query_result(@query, variables, "pagedWorks")
372372

373373
{_, cur_week_month, _} = @cur_date |> Date.to_erl()
374374
{_, last_week_month, _} = @last_week |> Date.to_erl()
@@ -388,8 +388,8 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedWorkss do
388388

389389
describe "[query paged_workss filter extra]" do
390390
@query """
391-
query($filter: PagedWorkssFilter!) {
392-
pagedWorkss(filter: $filter) {
391+
query($filter: PagedWorksFilter!) {
392+
pagedWorks(filter: $filter) {
393393
entries {
394394
id
395395
title
@@ -403,7 +403,7 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedWorkss do
403403
{:ok, works2} = db_insert(:works)
404404

405405
variables = %{filter: %{page: 1, size: 20}}
406-
results = guest_conn |> query_result(@query, variables, "pagedWorkss")
406+
results = guest_conn |> query_result(@query, variables, "pagedWorks")
407407

408408
assert results["totalCount"] >= 1
409409
assert results["entries"] |> Enum.any?(&(&1["id"] == to_string(works.id)))
@@ -413,8 +413,8 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedWorkss do
413413

414414
describe "[paged workss active_at]" do
415415
@query """
416-
query($filter: PagedWorkssFilter!) {
417-
pagedWorkss(filter: $filter) {
416+
query($filter: PagedWorksFilter!) {
417+
pagedWorks(filter: $filter) {
418418
entries {
419419
id
420420
insertedAt
@@ -426,15 +426,15 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedWorkss do
426426

427427
test "latest commented works should appear on top", ~m(guest_conn works_last_week user)a do
428428
variables = %{filter: %{page: 1, size: 20}}
429-
results = guest_conn |> query_result(@query, variables, "pagedWorkss")
429+
results = guest_conn |> query_result(@query, variables, "pagedWorks")
430430
entries = results["entries"]
431431
first_works = entries |> List.first()
432432
assert first_works["id"] !== to_string(works_last_week.id)
433433

434434
Process.sleep(1500)
435435
{:ok, _comment} = CMS.create_comment(:works, works_last_week.id, mock_comment(), user)
436436

437-
results = guest_conn |> query_result(@query, variables, "pagedWorkss")
437+
results = guest_conn |> query_result(@query, variables, "pagedWorks")
438438
entries = results["entries"]
439439
first_works = entries |> List.first()
440440

@@ -446,7 +446,7 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedWorkss do
446446

447447
{:ok, _comment} = CMS.create_comment(:works, works_last_year.id, mock_comment(), user)
448448

449-
results = guest_conn |> query_result(@query, variables, "pagedWorkss")
449+
results = guest_conn |> query_result(@query, variables, "pagedWorks")
450450
entries = results["entries"]
451451
first_works = entries |> List.first()
452452

@@ -464,7 +464,7 @@ defmodule GroupherServer.Test.Query.PagedArticles.PagedWorkss do
464464
works_last_week.author.user
465465
)
466466

467-
results = guest_conn |> query_result(@query, variables, "pagedWorkss")
467+
results = guest_conn |> query_result(@query, variables, "pagedWorks")
468468
entries = results["entries"]
469469
first_works = entries |> List.first()
470470

0 commit comments

Comments
 (0)