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

Commit de7f384

Browse files
committed
fix(user): login args in test
1 parent d2c84a3 commit de7f384

File tree

8 files changed

+28
-31
lines changed

8 files changed

+28
-31
lines changed

test/groupher_server/accounts/fans_test.exs

-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ defmodule GroupherServer.Test.Accounts.Fans do
2222
assert found |> Map.get(:followers) |> length == 1
2323
end
2424

25-
@tag :wip2
2625
test "follow user should update follow meta info", ~m(user)a do
2726
{:ok, user2} = db_insert(:user)
2827

@@ -76,7 +75,6 @@ defmodule GroupherServer.Test.Accounts.Fans do
7675
assert found |> Map.get(:followers) |> length == 0
7776
end
7877

79-
@tag :wip2
8078
test "undo follow user should update follow meta info", ~m(user)a do
8179
{:ok, user2} = db_insert(:user)
8280

test/groupher_server_web/mutation/accounts/fans_test.exs

+1-6
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ defmodule GroupherServer.Test.Mutation.Accounts.Fans do
2424
}
2525
}
2626
"""
27-
@tag :wip2
2827
test "login user can follow other user", ~m(user_conn)a do
2928
{:ok, user2} = db_insert(:user)
3029

@@ -35,7 +34,6 @@ defmodule GroupherServer.Test.Mutation.Accounts.Fans do
3534
assert followed["viewerHasFollowed"] == false
3635
end
3736

38-
@tag :wip2
3937
test "login user follow other user twice fails", ~m(user_conn)a do
4038
{:ok, user2} = db_insert(:user)
4139

@@ -46,20 +44,17 @@ defmodule GroupherServer.Test.Mutation.Accounts.Fans do
4644
assert user_conn |> mutation_get_error?(@query, variables, ecode(:already_did))
4745
end
4846

49-
@tag :wip2
5047
test "login user follow self fails", ~m(user_conn user)a do
5148
variables = %{login: user.login}
5249
assert user_conn |> mutation_get_error?(@query, variables, ecode(:self_conflict))
5350
end
5451

55-
@tag :wip2
5652
test "login user follow no-exsit cuser fails", ~m(user_conn)a do
5753
variables = %{login: non_exsit_login()}
5854

5955
assert user_conn |> mutation_get_error?(@query, variables, ecode(:not_exsit))
6056
end
6157

62-
@tag :wip2
6358
test "unauth user follow other user fails", ~m(guest_conn)a do
6459
{:ok, user2} = db_insert(:user)
6560
variables = %{login: user2.login}
@@ -73,7 +68,7 @@ defmodule GroupherServer.Test.Mutation.Accounts.Fans do
7368
}
7469
}
7570
"""
76-
@tag :wip2
71+
7772
test "login user can undo follow other user", ~m(user_conn user)a do
7873
{:ok, user2} = db_insert(:user)
7974
{:ok, _followeer} = user |> Accounts.follow(user2)

test/groupher_server_web/query/accounts/account_test.exs

-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ defmodule GroupherServer.Test.Query.Account.Basic do
160160
assert results |> is_valid_pagination?()
161161
end
162162

163-
@tag :wip2
164163
test "login user can get paged users with follow state info", ~m(user_conn user)a do
165164
variables = %{filter: %{page: 1, size: 10}}
166165

test/groupher_server_web/query/accounts/achievement_test.exs

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ defmodule GroupherServer.Test.Query.Account.Achievement do
8484
end
8585

8686
@query """
87-
query {
88-
user {
87+
query($login: String!) {
88+
user(login: $login) {
8989
id
9090
editableCommunities {
9191
entries {

test/groupher_server_web/query/accounts/customization_test.exs

+4-3
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ defmodule GroupherServer.Test.Query.Account.Customization do
1313

1414
describe "[account customization]" do
1515
@query """
16-
query {
17-
user {
16+
query($login: String!) {
17+
user(login: $login) {
1818
id
1919
nickname
2020
customization {
@@ -30,8 +30,9 @@ defmodule GroupherServer.Test.Query.Account.Customization do
3030
}
3131
}
3232
"""
33+
@tag :wip2
3334
test "user can have default customization configs", ~m(user_conn user)a do
34-
results = user_conn |> query_result(@query, %{}, "user")
35+
results = user_conn |> query_result(@query, %{login: user.login}, "user", :debug)
3536

3637
assert results["id"] == to_string(user.id)
3738
assert results["customization"]["theme"] == Customization.default() |> Map.get(:theme)

test/groupher_server_web/query/accounts/fans_test.exs

+1-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ defmodule GroupherServer.Test.Query.Account.Fans do
4646
assert user3 |> exist_in?(entries, :string_key)
4747
end
4848

49-
@tag :wip2
5049
test "login user can get other user's paged followers", ~m(guest_conn user)a do
5150
{:ok, user2} = db_insert(:user)
5251
{:ok, _followeer} = user |> Accounts.follow(user2)
@@ -71,7 +70,7 @@ defmodule GroupherServer.Test.Query.Account.Fans do
7170
}
7271
}
7372
"""
74-
@tag :wip2
73+
7574
test "login user can get it's own paged followings", ~m(user_conn user)a do
7675
variables = %{login: user.login, filter: %{page: 1, size: 20}}
7776

test/groupher_server_web/query/accounts/mention_test.exs

+4-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ defmodule GroupherServer.Test.Query.Accounts.Mention do
1414

1515
describe "[accounts mailbox status]" do
1616
@query """
17-
query {
18-
user {
17+
query($login: String!) {
18+
user(login: $login) {
1919
id
2020
mailBox {
2121
hasMail
@@ -26,6 +26,7 @@ defmodule GroupherServer.Test.Query.Accounts.Mention do
2626
}
2727
}
2828
"""
29+
@tag :wip2
2930
test "auth user can get it's own mailbox status" do
3031
{:ok, [user, user2]} = db_insert_multi(:user, 2)
3132

@@ -34,7 +35,7 @@ defmodule GroupherServer.Test.Query.Accounts.Mention do
3435

3536
user_conn = simu_conn(:user, user)
3637

37-
variables = %{}
38+
variables = %{login: user.login}
3839
results = user_conn |> query_result(@query, variables, "user")
3940
mail_Box = results["mailBox"]
4041

test/groupher_server_web/query/accounts/messages_test.exs

+16-12
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ defmodule GroupherServer.Test.Query.Accounts.Messages do
1313

1414
describe "[account messages queries]" do
1515
@query """
16-
query {
17-
user {
16+
query($login: String!) {
17+
user(login: $login) {
1818
id
1919
mailBox {
2020
hasMail
@@ -25,11 +25,12 @@ defmodule GroupherServer.Test.Query.Accounts.Messages do
2525
}
2626
}
2727
"""
28+
@tag :wip2
2829
test "login user can get mail box status" do
2930
{:ok, user} = db_insert(:user)
3031
user_conn = simu_conn(:user, user)
3132

32-
result = user_conn |> query_result(@query, %{}, "user")
33+
result = user_conn |> query_result(@query, %{login: user.login}, "user")
3334
mail_box = result["mailBox"]
3435
assert mail_box["hasMail"] == false
3536
assert mail_box["totalCount"] == 0
@@ -39,7 +40,7 @@ defmodule GroupherServer.Test.Query.Accounts.Messages do
3940
mock_mentions_for(user, 2)
4041
mock_notifications_for(user, 18)
4142

42-
result = user_conn |> query_result(@query, %{}, "user")
43+
result = user_conn |> query_result(@query, %{login: user.login}, "user")
4344
mail_box = result["mailBox"]
4445
assert mail_box["hasMail"] == true
4546
assert mail_box["totalCount"] == 20
@@ -54,8 +55,8 @@ defmodule GroupherServer.Test.Query.Accounts.Messages do
5455
end
5556

5657
@query """
57-
query($filter: MessagesFilter!) {
58-
user {
58+
query($login: String!, $filter: MessagesFilter!) {
59+
user(login: $login) {
5960
id
6061
mentions(filter: $filter) {
6162
entries {
@@ -85,56 +86,59 @@ defmodule GroupherServer.Test.Query.Accounts.Messages do
8586
}
8687
}
8788
"""
89+
@tag :wip2
8890
test "user can get mentions send by others" do
8991
{:ok, user} = db_insert(:user)
9092
user_conn = simu_conn(:user, user)
9193

92-
variables = %{filter: %{page: 1, size: 20, read: false}}
94+
variables = %{login: user.login, filter: %{page: 1, size: 20, read: false}}
9395
result = user_conn |> query_result(@query, variables, "user")
9496
mentions = result["mentions"]
9597
assert mentions["totalCount"] == 0
9698

9799
mock_mentions_for(user, 3)
98100

99-
variables = %{filter: %{page: 1, size: 20, read: false}}
101+
variables = %{login: user.login, filter: %{page: 1, size: 20, read: false}}
100102
result = user_conn |> query_result(@query, variables, "user")
101103
mentions = result["mentions"]
102104

103105
assert mentions["totalCount"] == 3
104106
assert mentions["entries"] |> List.first() |> Map.get("toUserId") == to_string(user.id)
105107
end
106108

109+
@tag :wip2
107110
test "user can get notifications send by others" do
108111
{:ok, user} = db_insert(:user)
109112
user_conn = simu_conn(:user, user)
110113

111-
variables = %{filter: %{page: 1, size: 20, read: false}}
114+
variables = %{login: user.login, filter: %{page: 1, size: 20, read: false}}
112115
result = user_conn |> query_result(@query, variables, "user")
113116
notifications = result["notifications"]
114117
assert notifications["totalCount"] == 0
115118

116119
mock_notifications_for(user, 3)
117120

118-
variables = %{filter: %{page: 1, size: 20, read: false}}
121+
variables = %{login: user.login, filter: %{page: 1, size: 20, read: false}}
119122
result = user_conn |> query_result(@query, variables, "user")
120123
notifications = result["notifications"]
121124

122125
assert notifications["totalCount"] == 3
123126
assert notifications["entries"] |> List.first() |> Map.get("toUserId") == to_string(user.id)
124127
end
125128

129+
@tag :wip2
126130
test "user can get system notifications" do
127131
{:ok, user} = db_insert(:user)
128132
user_conn = simu_conn(:user, user)
129133

130-
variables = %{filter: %{page: 1, size: 20, read: false}}
134+
variables = %{login: user.login, filter: %{page: 1, size: 20, read: false}}
131135
result = user_conn |> query_result(@query, variables, "user")
132136
notifications = result["sysNotifications"]
133137
assert notifications["totalCount"] == 0
134138

135139
mock_sys_notification(5)
136140

137-
variables = %{filter: %{page: 1, size: 20, read: false}}
141+
variables = %{login: user.login, filter: %{page: 1, size: 20, read: false}}
138142
result = user_conn |> query_result(@query, variables, "user")
139143
notifications = result["sysNotifications"]
140144

0 commit comments

Comments
 (0)