Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on Nov 8, 2022. It is now read-only.

Commitc5433e7

Browse files
committed
fix(user): login args in test
1 parentde7f384 commitc5433e7

File tree

5 files changed

+34
-23
lines changed

5 files changed

+34
-23
lines changed

‎test/groupher_server_web/mutation/delivery/delivery_test.exs‎

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ defmodule GroupherServer.Test.Mutation.Delivery do
1313
end
1414

1515
@account_query"""
16-
query($filter: MessagesFilter!) {
17-
user {
16+
query($login: String, $filter: MessagesFilter!) {
17+
user(login: $login) {
1818
id
1919
mentions(filter: $filter) {
2020
entries {
@@ -53,6 +53,7 @@ defmodule GroupherServer.Test.Mutation.Delivery do
5353
}
5454
}
5555
"""
56+
@tag:wip2
5657
test"auth user can publish system notifications"do
5758
{:ok,user}=db_insert(:user)
5859

@@ -71,7 +72,7 @@ defmodule GroupherServer.Test.Mutation.Delivery do
7172
%{"done"=>true}=
7273
rule_conn|>mutation_result(@query,variables,"publishSystemNotification")
7374

74-
variables=%{filter:%{page:1,size:20,read:false}}
75+
variables=%{login:user.login,filter:%{page:1,size:20,read:false}}
7576
result=user_conn|>query_result(@account_query,variables,"user")
7677
sys_notifications=result["sysNotifications"]
7778

@@ -99,12 +100,13 @@ defmodule GroupherServer.Test.Mutation.Delivery do
99100
}
100101
}
101102
"""
103+
@tag:wip2
102104
test"auth user can mark a system notification as read"do
103105
{:ok,user}=db_insert(:user)
104106
user_conn=simu_conn(:user,user)
105107

106108
mock_sys_notification(3)
107-
variables=%{filter:%{page:1,size:20,read:false}}
109+
variables=%{login:user.login,filter:%{page:1,size:20,read:false}}
108110

109111
result=user_conn|>query_result(@account_query,variables,"user")
110112

@@ -116,13 +118,13 @@ defmodule GroupherServer.Test.Mutation.Delivery do
116118

117119
user_conn|>mutation_result(@query,variables,"markSysNotificationRead")
118120

119-
variables=%{filter:%{page:1,size:20,read:false}}
121+
variables=%{login:user.login,filter:%{page:1,size:20,read:false}}
120122
result=user_conn|>query_result(@account_query,variables,"user")
121123

122124
notifications=result["sysNotifications"]
123125
assertnotifications["totalCount"]==2
124126

125-
variables=%{filter:%{page:1,size:20,read:true}}
127+
variables=%{login:user.login,filter:%{page:1,size:20,read:true}}
126128

127129
result=user_conn|>query_result(@account_query,variables,"user")
128130
notifications=result["sysNotifications"]
@@ -198,12 +200,13 @@ defmodule GroupherServer.Test.Mutation.Delivery do
198200
}
199201
}
200202
"""
203+
@tag:wip2
201204
test"user can mark a mention as read"do
202205
{:ok,user}=db_insert(:user)
203206
user_conn=simu_conn(:user,user)
204207

205208
mock_mentions_for(user,3)
206-
variables=%{filter:%{page:1,size:20,read:false}}
209+
variables=%{login:user.login,filter:%{page:1,size:20,read:false}}
207210

208211
result=user_conn|>query_result(@account_query,variables,"user")
209212
mentions=result["mentions"]
@@ -214,13 +217,13 @@ defmodule GroupherServer.Test.Mutation.Delivery do
214217

215218
user_conn|>mutation_result(@query,variables,"markMentionRead")
216219

217-
variables=%{filter:%{page:1,size:20,read:false}}
220+
variables=%{login:user.login,filter:%{page:1,size:20,read:false}}
218221

219222
result=user_conn|>query_result(@account_query,variables,"user")
220223
mentions=result["mentions"]
221224
assertmentions["totalCount"]==2
222225

223-
variables=%{filter:%{page:1,size:20,read:true}}
226+
variables=%{login:user.login,filter:%{page:1,size:20,read:true}}
224227

225228
result=user_conn|>query_result(@account_query,variables,"user")
226229
mentions=result["mentions"]
@@ -234,20 +237,21 @@ defmodule GroupherServer.Test.Mutation.Delivery do
234237
}
235238
}
236239
"""
240+
@tag:wip2
237241
test"user can mark all unread mentions as read"do
238242
{:ok,user}=db_insert(:user)
239243
user_conn=simu_conn(:user,user)
240244

241245
mock_mentions_for(user,3)
242246

243-
variables=%{filter:%{page:1,size:20,read:false}}
247+
variables=%{login:user.login,filter:%{page:1,size:20,read:false}}
244248
result=user_conn|>query_result(@account_query,variables,"user")
245249
mentions=result["mentions"]
246250
assertmentions["totalCount"]==3
247251

248252
user_conn|>mutation_result(@query,%{},"markMentionReadAll")
249253

250-
variables=%{filter:%{page:1,size:20,read:false}}
254+
variables=%{login:user.login,filter:%{page:1,size:20,read:false}}
251255
result=user_conn|>query_result(@account_query,variables,"user")
252256
mentions=result["mentions"]
253257

@@ -261,12 +265,13 @@ defmodule GroupherServer.Test.Mutation.Delivery do
261265
}
262266
}
263267
"""
268+
@tag:wip2
264269
test"user can mark a notification as read"do
265270
{:ok,user}=db_insert(:user)
266271
user_conn=simu_conn(:user,user)
267272

268273
mock_notifications_for(user,3)
269-
variables=%{filter:%{page:1,size:20,read:false}}
274+
variables=%{login:user.login,filter:%{page:1,size:20,read:false}}
270275

271276
result=user_conn|>query_result(@account_query,variables,"user")
272277

@@ -278,13 +283,13 @@ defmodule GroupherServer.Test.Mutation.Delivery do
278283

279284
user_conn|>mutation_result(@query,variables,"markNotificationRead")
280285

281-
variables=%{filter:%{page:1,size:20,read:false}}
286+
variables=%{login:user.login,filter:%{page:1,size:20,read:false}}
282287
result=user_conn|>query_result(@account_query,variables,"user")
283288

284289
notifications=result["notifications"]
285290
assertnotifications["totalCount"]==2
286291

287-
variables=%{filter:%{page:1,size:20,read:true}}
292+
variables=%{login:user.login,filter:%{page:1,size:20,read:true}}
288293

289294
result=user_conn|>query_result(@account_query,variables,"user")
290295
notifications=result["notifications"]
@@ -298,20 +303,21 @@ defmodule GroupherServer.Test.Mutation.Delivery do
298303
}
299304
}
300305
"""
306+
@tag:wip2
301307
test"user can mark all unread notifications as read"do
302308
{:ok,user}=db_insert(:user)
303309
user_conn=simu_conn(:user,user)
304310

305311
mock_notifications_for(user,3)
306312

307-
variables=%{filter:%{page:1,size:20,read:false}}
313+
variables=%{login:user.login,filter:%{page:1,size:20,read:false}}
308314
result=user_conn|>query_result(@account_query,variables,"user")
309315
notifications=result["notifications"]
310316
assertnotifications["totalCount"]==3
311317

312318
user_conn|>mutation_result(@query,%{},"markNotificationReadAll")
313319

314-
variables=%{filter:%{page:1,size:20,read:false}}
320+
variables=%{login:user.login,filter:%{page:1,size:20,read:false}}
315321
result=user_conn|>query_result(@account_query,variables,"user")
316322
notifications=result["notifications"]
317323

‎test/groupher_server_web/query/accounts/account_test.exs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,9 @@ defmodule GroupherServer.Test.Query.Account.Basic do
8686
assertcontributes["totalCount"]==0
8787
end
8888

89+
@tag:wip2
8990
test"login user can get it's own profile",~m(user_conn user)ado
90-
results=user_conn|>query_result(@query,%{},"user")
91+
results=user_conn|>query_result(@query,%{login:user.login},"user")
9192
assertresults["id"]==to_string(user.id)
9293
end
9394

@@ -116,21 +117,23 @@ defmodule GroupherServer.Test.Query.Account.Basic do
116117
}
117118
}
118119

120+
@tag:wip2
119121
test"login user can get own cms_passport and cms_passport_string",~m(user)ado
120122
user_conn=simu_conn(:user,user)
121123

122124
{:ok,_}=CMS.stamp_passport(@valid_rules,user)
123125

124-
results=user_conn|>query_result(@query,%{},"user")
126+
results=user_conn|>query_result(@query,%{login:user.login},"user")
125127

126128
assertMap.equal?(results["cmsPassport"],@valid_rules)
127129
assertMap.equal?(Jason.decode!(results["cmsPassportString"]),@valid_rules)
128130
end
129131

132+
@tag:wip2
130133
test"login user can get empty if cms_passport not exsit",~m(user)ado
131134
user_conn=simu_conn(:user,user)
132135

133-
results=user_conn|>query_result(@query,%{},"user")
136+
results=user_conn|>query_result(@query,%{login:user.login},"user")
134137

135138
assert%{}==results["cmsPassport"]
136139
assert"{}"==results["cmsPassportString"]

‎test/groupher_server_web/query/accounts/customization_test.exs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ defmodule GroupherServer.Test.Query.Account.Customization do
3232
"""
3333
@tag:wip2
3434
test"user can have default customization configs",~m(user_conn user)ado
35-
results=user_conn|>query_result(@query,%{login:user.login},"user",:debug)
35+
results=user_conn|>query_result(@query,%{login:user.login},"user")
3636

3737
assertresults["id"]==to_string(user.id)
3838
assertresults["customization"]["theme"]==Customization.default()|>Map.get(:theme)

‎test/groupher_server_web/query/accounts/fans_test.exs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,12 @@ defmodule GroupherServer.Test.Query.Account.Fans do
9696
assertuser4|>exist_in?(entries,:string_key)
9797
end
9898

99+
@tag:wip2
99100
test"login user can get other user's paged followings",~m(guest_conn user)ado
100101
{:ok,user2}=db_insert(:user)
101102
{:ok,_followeer}=user|>Accounts.follow(user2)
102103

103-
variables=%{userId:user.id,filter:%{page:1,size:20}}
104+
variables=%{login:user.login,filter:%{page:1,size:20}}
104105
results=guest_conn|>query_result(@query,variables,"pagedFollowings")
105106

106107
assertresults|>Map.get("totalCount")==1

‎test/groupher_server_web/query/accounts/messages_test.exs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,9 @@ defmodule GroupherServer.Test.Query.Accounts.Messages do
4848
assertmail_box["notificationCount"]==18
4949
end
5050

51-
test"unauth user get mailBox status fails",~m(guest_conn)ado
52-
variables=%{}
51+
@tag:wip2
52+
test"unauth user get mailBox status fails",~m(guest_conn user)ado
53+
variables=%{login:user.login}
5354

5455
assertguest_conn|>query_get_error?(@query,variables,ecode(:account_login))
5556
end

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp