Skip to content

Commit 4a86408

Browse files
committed
actions_test [nfc]: Use updateMessageFlagsStartingFromAnchor in it's cases
1 parent 680d491 commit 4a86408

File tree

1 file changed

+20
-8
lines changed

1 file changed

+20
-8
lines changed

test/widgets/actions_test.dart

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -240,14 +240,17 @@ void main() {
240240
// Check that `lastProcessedId` returned from an initial
241241
// response is used as `anchorId` for the subsequent request.
242242
final narrow = TopicNarrow.ofMessage(eg.streamMessage());
243+
final apiNarrow = narrow.apiEncode()..add(ApiNarrowIsUnread());
243244
await prepare(tester);
244245

245246
connection.prepare(json: UpdateMessageFlagsForNarrowResult(
246247
processedCount: 1000, updatedCount: 890,
247248
firstProcessedId: 1, lastProcessedId: 1989,
248249
foundOldest: true, foundNewest: false).toJson());
249-
markNarrowAsRead(context, narrow);
250-
final apiNarrow = narrow.apiEncode()..add(ApiNarrowIsUnread());
250+
final didPass = updateMessageFlagsStartingFromAnchor(
251+
context: context, apiNarrow: apiNarrow, op: UpdateMessageFlagsOp.add, flag: MessageFlag.read,
252+
includeAnchor: false, startingAnchor: AnchorCode.oldest, onCompletedMessage: onCompletedMessage,
253+
onFailedTitle: onFailedTitle, progressMessage: progressMessage);
251254
check(connection.lastRequest).isA<http.Request>()
252255
..method.equals('POST')
253256
..url.path.equals('/api/v1/messages/flags/narrow')
@@ -279,19 +282,23 @@ void main() {
279282
'op': 'add',
280283
'flag': 'read',
281284
});
285+
check(await didPass).isTrue();
282286
});
283287

284288
testWidgets('on invalid response', (WidgetTester tester) async {
285289
final zulipLocalizations = GlobalLocalizations.zulipLocalizations;
286290
final narrow = TopicNarrow.ofMessage(eg.streamMessage());
291+
final apiNarrow = narrow.apiEncode()..add(ApiNarrowIsUnread());
287292
await prepare(tester);
288293
connection.prepare(json: UpdateMessageFlagsForNarrowResult(
289294
processedCount: 1000, updatedCount: 0,
290295
firstProcessedId: null, lastProcessedId: null,
291296
foundOldest: true, foundNewest: false).toJson());
292-
markNarrowAsRead(context, narrow);
297+
final didPass = updateMessageFlagsStartingFromAnchor(
298+
context: context, apiNarrow: apiNarrow, op: UpdateMessageFlagsOp.add, flag: MessageFlag.read,
299+
includeAnchor: false, startingAnchor: AnchorCode.oldest, onCompletedMessage: onCompletedMessage,
300+
onFailedTitle: onFailedTitle, progressMessage: progressMessage);
293301
await tester.pump(Duration.zero);
294-
final apiNarrow = narrow.apiEncode()..add(ApiNarrowIsUnread());
295302
check(connection.lastRequest).isA<http.Request>()
296303
..method.equals('POST')
297304
..url.path.equals('/api/v1/messages/flags/narrow')
@@ -307,21 +314,26 @@ void main() {
307314

308315
await tester.pumpAndSettle();
309316
checkErrorDialog(tester,
310-
expectedTitle: zulipLocalizations.errorMarkAsReadFailedTitle,
317+
expectedTitle: onFailedTitle,
311318
expectedMessage: zulipLocalizations.errorInvalidResponse);
319+
check(await didPass).isFalse();
312320
});
313321

314322
testWidgets('catch-all api errors', (WidgetTester tester) async {
315-
final zulipLocalizations = GlobalLocalizations.zulipLocalizations;
316323
const narrow = CombinedFeedNarrow();
324+
final apiNarrow = narrow.apiEncode()..add(ApiNarrowIsUnread());
317325
await prepare(tester);
318326
connection.prepare(exception: http.ClientException('Oops'));
319-
markNarrowAsRead(context, narrow);
327+
final didPass = updateMessageFlagsStartingFromAnchor(
328+
context: context, apiNarrow: apiNarrow, op: UpdateMessageFlagsOp.add, flag: MessageFlag.read,
329+
includeAnchor: false, startingAnchor: AnchorCode.oldest, onCompletedMessage: onCompletedMessage,
330+
onFailedTitle: onFailedTitle, progressMessage: progressMessage);
320331
await tester.pump(Duration.zero);
321332
await tester.pumpAndSettle();
322333
checkErrorDialog(tester,
323-
expectedTitle: zulipLocalizations.errorMarkAsReadFailedTitle,
334+
expectedTitle: onFailedTitle,
324335
expectedMessage: 'NetworkException: Oops (ClientException: Oops)');
336+
check(await didPass).isFalse();
325337
});
326338
});
327339
}

0 commit comments

Comments
 (0)