Skip to content

Commit 1e972e2

Browse files
committed
msglist test [nfc]: Unify legacy vs. current rendering-only cases
These two cases differed only in their name, the `renderingOnly` value in the event, and that one of them used `[0]` instead of `.single`. Fix the latter, parameterize, and dedupe.
1 parent 1813c37 commit 1e972e2

File tree

1 file changed

+9
-32
lines changed

1 file changed

+9
-32
lines changed

test/model/message_list_test.dart

Lines changed: 9 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,8 @@ void main() async {
137137
..content.not(it()..equals(updateEvent.renderedContent!));
138138
});
139139

140-
test('rendering-only update does not change timestamp', () async {
140+
// TODO(server-5): Cut legacy case for rendering-only message update
141+
Future<void> checkRenderingOnly({required bool legacy}) async {
141142
final store = await setupStore(stream);
142143

143144
const oldContent = "<p>Hello, world</p>";
@@ -157,47 +158,23 @@ void main() async {
157158
flags: originalMessage.flags,
158159
renderedContent: newContent,
159160
editTimestamp: newTimestamp,
160-
renderingOnly: true,
161+
renderingOnly: legacy ? null : true,
161162
userId: null,
162163
);
163164

164-
final message = messageList.messages[0];
165+
final message = messageList.messages.single;
165166
messageList.maybeUpdateMessage(updateEvent);
166167
check(message)
167168
..content.equals(newContent)
168169
..lastEditTimestamp.equals(oldTimestamp);
170+
}
171+
172+
test('rendering-only update does not change timestamp', () async {
173+
await checkRenderingOnly(legacy: false);
169174
});
170175

171-
// TODO(server-5): Cut this test; rely on renderingOnly from FL 114
172176
test('rendering-only update does not change timestamp (for old server versions)', () async {
173-
final store = await setupStore(stream);
174-
175-
const oldContent = "<p>Hello, world</p>";
176-
const oldTimestamp = 78492;
177-
const newContent = "<p>Hello, world</p> <div>Some link preview</div>";
178-
const newTimestamp = 99999;
179-
180-
final originalMessage = eg.streamMessage(id: 972, stream: stream, content: oldContent);
181-
originalMessage.lastEditTimestamp = oldTimestamp;
182-
183-
final messageList = await messageListViewWithMessages([originalMessage], store, narrow);
184-
185-
final updateEvent = UpdateMessageEvent(
186-
id: 1,
187-
messageId: originalMessage.id,
188-
messageIds: [originalMessage.id],
189-
flags: originalMessage.flags,
190-
renderedContent: newContent,
191-
editTimestamp: newTimestamp,
192-
renderingOnly: null,
193-
userId: null,
194-
);
195-
196-
final message = messageList.messages.single;
197-
messageList.maybeUpdateMessage(updateEvent);
198-
check(message)
199-
..content.equals(newContent)
200-
..lastEditTimestamp.equals(oldTimestamp);
177+
await checkRenderingOnly(legacy: true);
201178
});
202179
});
203180
}

0 commit comments

Comments
 (0)