Skip to content

Commit 58276c3

Browse files
committed
test [nfc]: Add streams and eg.selfUser to store in several tests
Adding these is necessary for the next commit(s), otherwise these tests will fail.
1 parent dc9a330 commit 58276c3

File tree

4 files changed

+24
-8
lines changed

4 files changed

+24
-8
lines changed

test/widgets/action_sheet_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Future<void> setupToMessageActionSheet(WidgetTester tester, {
4343

4444
await testBinding.globalStore.add(eg.selfAccount, eg.initialSnapshot());
4545
final store = await testBinding.globalStore.perAccount(eg.selfAccount.id);
46-
await store.addUser(eg.user(userId: message.senderId));
46+
await store.addUsers([eg.selfUser, eg.user(userId: message.senderId)]);
4747
if (message is StreamMessage) {
4848
final stream = eg.stream(streamId: message.streamId);
4949
await store.addStream(stream);

test/widgets/autocomplete_test.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,12 @@ Future<Finder> setupToTopicInput(WidgetTester tester, {
7676
addTearDown(testBinding.reset);
7777
await testBinding.globalStore.add(eg.selfAccount, eg.initialSnapshot());
7878
final store = await testBinding.globalStore.perAccount(eg.selfAccount.id);
79+
await store.addUser(eg.selfUser);
7980
final connection = store.connection as FakeApiConnection;
8081

8182
// prepare message list data
8283
final stream = eg.stream();
84+
await store.addStream(stream);
8385
final message = eg.streamMessage(stream: stream, sender: eg.selfUser);
8486
connection.prepare(json: GetMessagesResult(
8587
anchor: message.id,

test/widgets/compose_box_test.dart

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ void main() {
3838
List<User> users = const [],
3939
List<ZulipStream> streams = const [],
4040
}) async {
41+
if (narrow is ChannelNarrow || narrow is TopicNarrow) {
42+
final channelId = narrow is ChannelNarrow ? narrow.streamId : (narrow as TopicNarrow).streamId;
43+
assert(streams.any((stream) => stream.streamId == channelId),
44+
'Add a channel with "streamId" the same as of $narrow.streamId to the store.');
45+
}
4146
addTearDown(testBinding.reset);
4247
final account = eg.account(user: selfUser ?? eg.selfUser);
4348
await testBinding.globalStore.add(account, eg.initialSnapshot(
@@ -189,15 +194,17 @@ void main() {
189194
}
190195

191196
testWidgets('_StreamComposeBox', (tester) async {
197+
final channel = eg.stream();
192198
final key = await prepareComposeBox(tester,
193-
narrow: ChannelNarrow(eg.stream().streamId));
199+
narrow: ChannelNarrow(channel.streamId), streams: [channel]);
194200
checkComposeBoxTextFields(tester, controllerKey: key,
195201
expectTopicTextField: true);
196202
});
197203

198204
testWidgets('_FixedDestinationComposeBox', (tester) async {
205+
final channel = eg.stream();
199206
final key = await prepareComposeBox(tester,
200-
narrow: TopicNarrow.ofMessage(eg.streamMessage()));
207+
narrow: TopicNarrow(channel.streamId, 'topic'), streams: [channel]);
201208
checkComposeBoxTextFields(tester, controllerKey: key,
202209
expectTopicTextField: false);
203210
});
@@ -208,7 +215,8 @@ void main() {
208215
required void Function(int messageId) prepareResponse,
209216
}) async {
210217
final zulipLocalizations = GlobalLocalizations.zulipLocalizations;
211-
await prepareComposeBox(tester, narrow: const TopicNarrow(123, 'some topic'));
218+
await prepareComposeBox(tester, narrow: const TopicNarrow(123, 'some topic'),
219+
streams: [eg.stream(streamId: 123)]);
212220

213221
final contentInputFinder = find.byWidgetPredicate(
214222
(widget) => widget is TextField && widget.controller is ComposeContentController);
@@ -272,7 +280,9 @@ void main() {
272280

273281
group('attach from media library', () {
274282
testWidgets('success', (tester) async {
275-
final controllerKey = await prepareComposeBox(tester, narrow: ChannelNarrow(eg.stream().streamId));
283+
final channel = eg.stream();
284+
final controllerKey = await prepareComposeBox(tester,
285+
narrow: ChannelNarrow(channel.streamId), streams: [channel]);
276286
final composeBoxController = controllerKey.currentState!;
277287

278288
// (When we check that the send button looks disabled, it should be because
@@ -328,7 +338,9 @@ void main() {
328338

329339
group('attach from camera', () {
330340
testWidgets('success', (tester) async {
331-
final controllerKey = await prepareComposeBox(tester, narrow: ChannelNarrow(eg.stream().streamId));
341+
final channel = eg.stream();
342+
final controllerKey = await prepareComposeBox(tester,
343+
narrow: ChannelNarrow(channel.streamId), streams: [channel]);
332344
final composeBoxController = controllerKey.currentState!;
333345

334346
// (When we check that the send button looks disabled, it should be because

test/widgets/message_list_test.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,17 @@ void main() {
101101
testWidgets('MessageListPageState.narrow', (tester) async {
102102
final stream = eg.stream();
103103
await setupMessageListPage(tester, narrow: ChannelNarrow(stream.streamId),
104-
messages: [eg.streamMessage(stream: stream, content: "<p>a message</p>")]);
104+
messages: [eg.streamMessage(stream: stream, content: "<p>a message</p>")],
105+
streams: [stream]);
105106
final state = MessageListPage.ancestorOf(tester.element(find.text("a message")));
106107
check(state.narrow).equals(ChannelNarrow(stream.streamId));
107108
});
108109

109110
testWidgets('composeBoxController finds compose box', (tester) async {
110111
final stream = eg.stream();
111112
await setupMessageListPage(tester, narrow: ChannelNarrow(stream.streamId),
112-
messages: [eg.streamMessage(stream: stream, content: "<p>a message</p>")]);
113+
messages: [eg.streamMessage(stream: stream, content: "<p>a message</p>")],
114+
streams: [stream]);
113115
final state = MessageListPage.ancestorOf(tester.element(find.text("a message")));
114116
check(state.composeBoxController).isNotNull();
115117
});

0 commit comments

Comments
 (0)