Skip to content

Commit 5589505

Browse files
committed
Revert name change in tests + replace obsolete fields usage
1 parent 8eed07a commit 5589505

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

Assets/Plugins/StreamChat/Tests/LowLevelClient/Integration/ModerationApiIntegrationTests.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ public IEnumerator Ban_user()
8080
var banRequest = new BanRequest
8181
{
8282
TargetUserId = SecondUserId,
83-
Id = channelState.Channel.Id,
84-
Type = channelType,
83+
ChannelCid = channelState.Channel.Cid,
8584
Timeout = BanTimeout
8685
};
8786

@@ -131,8 +130,7 @@ public IEnumerator Unban_user()
131130
var banRequest = new BanRequest
132131
{
133132
TargetUserId = SecondUserId,
134-
Id = channelState.Channel.Id,
135-
Type = channelType,
133+
ChannelCid = channelState.Channel.Cid,
136134
Timeout = BanTimeout
137135
};
138136

@@ -263,7 +261,8 @@ private async Task When_messages_flagged_expect_query_flagged_messages_return_th
263261
};
264262

265263
var messageResponse2 = await
266-
LowLevelClient.MessageApi.SendNewMessageAsync(channelType, channelState.Channel.Id, sendMessageRequest2);
264+
LowLevelClient.MessageApi.SendNewMessageAsync(channelType, channelState.Channel.Id,
265+
sendMessageRequest2);
267266

268267
//Flag messages
269268

@@ -289,7 +288,8 @@ private async Task When_messages_flagged_expect_query_flagged_messages_return_th
289288
}
290289
};
291290

292-
var flagsQueryResponse = await LowLevelClient.ModerationApi.QueryMessageFlagsAsync(queryMessageFlagsRequest);
291+
var flagsQueryResponse
292+
= await LowLevelClient.ModerationApi.QueryMessageFlagsAsync(queryMessageFlagsRequest);
293293

294294
var message1 = flagsQueryResponse.Flags.FirstOrDefault(_ => _.Message.Id == messageResponse.Message.Id);
295295
var message2 = flagsQueryResponse.Flags.FirstOrDefault(_ => _.Message.Id == messageResponse2.Message.Id);
@@ -310,10 +310,10 @@ private async Task When_user_flagged_expect_response_target_user_id_match_Async(
310310
{
311311
const string channelType = "messaging";
312312
var channelState = await CreateTempUniqueChannelAsync(channelType, new ChannelGetOrCreateRequest());
313-
313+
314314
var response = await LowLevelClient.ModerationApi.FlagUserAsync(SecondUserId);
315315
Assert.AreEqual(SecondUserId, response.Flag.TargetUser.Id);
316-
}
316+
}
317317
}
318318
}
319319
#endif

Assets/Plugins/StreamChat/Tests/StatefulClient/ChannelMembersTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -250,9 +250,9 @@ void OnMemberAdded(IStreamChannel channel2, IStreamChannelMember member)
250250
var receivedEvent2 = false;
251251
IStreamChannelMember eventMember2 = null;
252252
IStreamChannel eventChannel2 = null;
253-
StreamMemberChangeType? opType = default;
253+
OperationType? opType = default;
254254

255-
void OnMembersChanged(IStreamChannel channel2, IStreamChannelMember member, StreamMemberChangeType op)
255+
void OnMembersChanged(IStreamChannel channel2, IStreamChannelMember member, OperationType op)
256256
{
257257
if (channel2.Cid != channel.Cid)
258258
{
@@ -283,7 +283,7 @@ void OnMembersChanged(IStreamChannel channel2, IStreamChannelMember member, Stre
283283
Assert.IsNotNull(eventChannel2);
284284
Assert.IsNotNull(eventMember2);
285285
Assert.AreEqual(user, eventMember2.User);
286-
Assert.AreEqual(StreamMemberChangeType.Added, opType.Value);
286+
Assert.AreEqual(OperationType.Added, opType.Value);
287287
}
288288

289289
//[UnityTest] //StreamTodo: debug, works when triggered manually but fails in GitHub Actions
@@ -316,9 +316,9 @@ void OnMemberRemoved(IStreamChannel channel2, IStreamChannelMember member)
316316
var receivedEvent2 = false;
317317
IStreamChannelMember eventMember2 = null;
318318
IStreamChannel eventChannel2 = null;
319-
StreamMemberChangeType? opType = default;
319+
OperationType? opType = default;
320320

321-
void OnMembersChanged(IStreamChannel channel3, IStreamChannelMember member, StreamMemberChangeType op)
321+
void OnMembersChanged(IStreamChannel channel3, IStreamChannelMember member, OperationType op)
322322
{
323323
if (channel3.Cid != channel.Cid)
324324
{
@@ -350,7 +350,7 @@ void OnMembersChanged(IStreamChannel channel3, IStreamChannelMember member, Stre
350350
Assert.IsNotNull(eventChannel2);
351351
Assert.IsNotNull(eventMember2);
352352
Assert.AreEqual(user, eventMember2.User);
353-
Assert.AreEqual(StreamMemberChangeType.Removed, opType.Value);
353+
Assert.AreEqual(OperationType.Removed, opType.Value);
354354
}
355355

356356
[UnityTest]

0 commit comments

Comments
 (0)