Skip to content

Commit fb8bde9

Browse files
committed
compose test: In channel-post-policy tests, use subscribed channels
1 parent 2d3d4a9 commit fb8bde9

File tree

1 file changed

+15
-11
lines changed

1 file changed

+15
-11
lines changed

test/widgets/compose_box_test.dart

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,14 @@ void main() {
5858
required Narrow narrow,
5959
User? selfUser,
6060
List<User> otherUsers = const [],
61-
List<ZulipStream> streams = const [],
61+
List<ZulipStream>? streams,
62+
List<Subscription> subscriptions = const [],
6263
List<Message>? messages,
6364
bool? mandatoryTopics,
6465
int? zulipFeatureLevel,
6566
}) async {
67+
streams ??= subscriptions;
68+
6669
if (narrow case ChannelNarrow(:var streamId) || TopicNarrow(: var streamId)) {
6770
final channel = streams.firstWhereOrNull((s) => s.streamId == streamId);
6871
assert(channel != null,
@@ -82,6 +85,7 @@ void main() {
8285
await testBinding.globalStore.add(selfAccount, eg.initialSnapshot(
8386
realmUsers: [selfUser, ...otherUsers],
8487
streams: streams,
88+
subscriptions: subscriptions,
8589
zulipFeatureLevel: zulipFeatureLevel,
8690
realmMandatoryTopics: mandatoryTopics,
8791
realmAllowMessageEditing: true,
@@ -1417,17 +1421,17 @@ void main() {
14171421
await prepareComposeBox(tester,
14181422
narrow: narrow,
14191423
selfUser: eg.user(role: UserRole.administrator),
1420-
streams: [eg.stream(streamId: 1,
1421-
channelPostPolicy: ChannelPostPolicy.moderators)]);
1424+
subscriptions: [eg.subscription(eg.stream(streamId: 1,
1425+
channelPostPolicy: ChannelPostPolicy.moderators))]);
14221426
checkComposeBox(isShown: true);
14231427
});
14241428

14251429
testWidgets('error banner is shown in $narrowType narrow', (tester) async {
14261430
await prepareComposeBox(tester,
14271431
narrow: narrow,
14281432
selfUser: eg.user(role: UserRole.moderator),
1429-
streams: [eg.stream(streamId: 1,
1430-
channelPostPolicy: ChannelPostPolicy.administrators)]);
1433+
subscriptions: [eg.subscription(eg.stream(streamId: 1,
1434+
channelPostPolicy: ChannelPostPolicy.administrators))]);
14311435
checkComposeBox(isShown: false);
14321436
});
14331437
}
@@ -1437,8 +1441,8 @@ void main() {
14371441
await prepareComposeBox(tester,
14381442
narrow: const ChannelNarrow(1),
14391443
selfUser: selfUser,
1440-
streams: [eg.stream(streamId: 1,
1441-
channelPostPolicy: ChannelPostPolicy.administrators)]);
1444+
subscriptions: [eg.subscription(eg.stream(streamId: 1,
1445+
channelPostPolicy: ChannelPostPolicy.administrators))]);
14421446
checkComposeBox(isShown: true);
14431447

14441448
await store.handleEvent(RealmUserUpdateEvent(id: 1,
@@ -1452,8 +1456,8 @@ void main() {
14521456
await prepareComposeBox(tester,
14531457
narrow: const ChannelNarrow(1),
14541458
selfUser: selfUser,
1455-
streams: [eg.stream(streamId: 1,
1456-
channelPostPolicy: ChannelPostPolicy.moderators)]);
1459+
subscriptions: [eg.subscription(eg.stream(streamId: 1,
1460+
channelPostPolicy: ChannelPostPolicy.moderators))]);
14571461
checkComposeBox(isShown: false);
14581462

14591463
await store.handleEvent(RealmUserUpdateEvent(id: 1,
@@ -1470,7 +1474,7 @@ void main() {
14701474
await prepareComposeBox(tester,
14711475
narrow: const ChannelNarrow(1),
14721476
selfUser: selfUser,
1473-
streams: [channel]);
1477+
subscriptions: [eg.subscription(channel)]);
14741478
checkComposeBox(isShown: true);
14751479

14761480
await store.handleEvent(eg.channelUpdateEvent(channel,
@@ -1488,7 +1492,7 @@ void main() {
14881492
await prepareComposeBox(tester,
14891493
narrow: const ChannelNarrow(1),
14901494
selfUser: selfUser,
1491-
streams: [channel]);
1495+
subscriptions: [eg.subscription(channel)]);
14921496
checkComposeBox(isShown: false);
14931497

14941498
await store.handleEvent(eg.channelUpdateEvent(channel,

0 commit comments

Comments
 (0)