Skip to content

Commit 69bd093

Browse files
committed
actions_test [nfc]: Use updateMessageFlagsStartingFromAnchor in it's cases
1 parent 2370dee commit 69bd093

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

test/widgets/actions_test.dart

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -248,15 +248,13 @@ void main() {
248248
testWidgets('pagination', (WidgetTester tester) async {
249249
// Check that `lastProcessedId` returned from an initial
250250
// response is used as `anchorId` for the subsequent request.
251-
final narrow = TopicNarrow.ofMessage(eg.streamMessage());
252251
await prepare(tester);
253252

254253
connection.prepare(json: UpdateMessageFlagsForNarrowResult(
255254
processedCount: 1000, updatedCount: 890,
256255
firstProcessedId: 1, lastProcessedId: 1989,
257256
foundOldest: true, foundNewest: false).toJson());
258-
markNarrowAsRead(context, narrow);
259-
final apiNarrow = narrow.apiEncode()..add(ApiNarrowIsUnread());
257+
final didPass = invokeUpdateMessageFlagsStartingFromAnchor();
260258
check(connection.lastRequest).isA<http.Request>()
261259
..method.equals('POST')
262260
..url.path.equals('/api/v1/messages/flags/narrow')
@@ -288,19 +286,18 @@ void main() {
288286
'op': 'add',
289287
'flag': 'read',
290288
});
289+
check(await didPass).isTrue();
291290
});
292291

293292
testWidgets('on invalid response', (WidgetTester tester) async {
294293
final zulipLocalizations = GlobalLocalizations.zulipLocalizations;
295-
final narrow = TopicNarrow.ofMessage(eg.streamMessage());
296294
await prepare(tester);
297295
connection.prepare(json: UpdateMessageFlagsForNarrowResult(
298296
processedCount: 1000, updatedCount: 0,
299297
firstProcessedId: null, lastProcessedId: null,
300298
foundOldest: true, foundNewest: false).toJson());
301-
markNarrowAsRead(context, narrow);
299+
final didPass = invokeUpdateMessageFlagsStartingFromAnchor();
302300
await tester.pump(Duration.zero);
303-
final apiNarrow = narrow.apiEncode()..add(ApiNarrowIsUnread());
304301
check(connection.lastRequest).isA<http.Request>()
305302
..method.equals('POST')
306303
..url.path.equals('/api/v1/messages/flags/narrow')
@@ -316,21 +313,21 @@ void main() {
316313

317314
await tester.pumpAndSettle();
318315
checkErrorDialog(tester,
319-
expectedTitle: zulipLocalizations.errorMarkAsReadFailedTitle,
316+
expectedTitle: onFailedTitle,
320317
expectedMessage: zulipLocalizations.errorInvalidResponse);
318+
check(await didPass).isFalse();
321319
});
322320

323321
testWidgets('catch-all api errors', (WidgetTester tester) async {
324-
final zulipLocalizations = GlobalLocalizations.zulipLocalizations;
325-
const narrow = CombinedFeedNarrow();
326322
await prepare(tester);
327323
connection.prepare(exception: http.ClientException('Oops'));
328-
markNarrowAsRead(context, narrow);
324+
final didPass = invokeUpdateMessageFlagsStartingFromAnchor();
329325
await tester.pump(Duration.zero);
330326
await tester.pumpAndSettle();
331327
checkErrorDialog(tester,
332-
expectedTitle: zulipLocalizations.errorMarkAsReadFailedTitle,
328+
expectedTitle: onFailedTitle,
333329
expectedMessage: 'NetworkException: Oops (ClientException: Oops)');
330+
check(await didPass).isFalse();
334331
});
335332
});
336333
}

0 commit comments

Comments
 (0)