Skip to content

Commit 7145647

Browse files
committed
action_sheet test [nfc]: Simplify prepareRawContentResponse… helpers
Their callers always give them the shared store prepared by the setup helper setupToMessageActionSheet. Have these helpers just use that directly. If in the future we end up having a use case for customizing this behavior, it'll probably be most convenient to have them accept a connection instead of a store, anyway.
1 parent 2659cb8 commit 7145647

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

test/widgets/action_sheet_test.dart

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -72,25 +72,25 @@ void main() {
7272
TestZulipBinding.ensureInitialized();
7373
TestWidgetsFlutterBinding.ensureInitialized();
7474

75-
void prepareRawContentResponseSuccess(PerAccountStore store, {
75+
void prepareRawContentResponseSuccess({
7676
required Message message,
7777
required String rawContent,
7878
Duration delay = Duration.zero,
7979
}) {
8080
// Prepare fetch-raw-Markdown response
8181
// TODO: Message should really only differ from `message`
8282
// in its content / content_type, not in `id` or anything else.
83-
(store.connection as FakeApiConnection).prepare(delay: delay, json:
83+
connection.prepare(delay: delay, json:
8484
GetMessageResult(message: eg.streamMessage(contentMarkdown: rawContent)).toJson());
8585
}
8686

87-
void prepareRawContentResponseError(PerAccountStore store) {
87+
void prepareRawContentResponseError() {
8888
final fakeResponseJson = {
8989
'code': 'BAD_REQUEST',
9090
'msg': 'Invalid message(s)',
9191
'result': 'error',
9292
};
93-
(store.connection as FakeApiConnection).prepare(httpStatus: 400, json: fakeResponseJson);
93+
connection.prepare(httpStatus: 400, json: fakeResponseJson);
9494
}
9595

9696
group('AddThumbsUpButton', () {
@@ -285,7 +285,7 @@ void main() {
285285
topicController?.value = const TextEditingValue(text: kNoTopicTopic);
286286

287287
final valueBefore = contentController.value;
288-
prepareRawContentResponseSuccess(store, message: message, rawContent: 'Hello world');
288+
prepareRawContentResponseSuccess(message: message, rawContent: 'Hello world');
289289
await tapQuoteAndReplyButton(tester);
290290
checkLoadingState(store, contentController, valueBefore: valueBefore, message: message);
291291
await tester.pump(Duration.zero); // message is fetched; compose box updates
@@ -302,7 +302,7 @@ void main() {
302302
final contentController = composeBoxController.contentController;
303303

304304
final valueBefore = contentController.value;
305-
prepareRawContentResponseSuccess(store, message: message, rawContent: 'Hello world');
305+
prepareRawContentResponseSuccess(message: message, rawContent: 'Hello world');
306306
await tapQuoteAndReplyButton(tester);
307307
checkLoadingState(store, contentController, valueBefore: valueBefore, message: message);
308308
await tester.pump(Duration.zero); // message is fetched; compose box updates
@@ -320,7 +320,7 @@ void main() {
320320
final contentController = composeBoxController.contentController;
321321

322322
final valueBefore = contentController.value;
323-
prepareRawContentResponseSuccess(store, message: message, rawContent: 'Hello world');
323+
prepareRawContentResponseSuccess(message: message, rawContent: 'Hello world');
324324
await tapQuoteAndReplyButton(tester);
325325
checkLoadingState(store, contentController, valueBefore: valueBefore, message: message);
326326
await tester.pump(Duration.zero); // message is fetched; compose box updates
@@ -337,7 +337,7 @@ void main() {
337337
final contentController = composeBoxController.contentController;
338338

339339
final valueBefore = contentController.value = TextEditingValue.empty;
340-
prepareRawContentResponseError(store);
340+
prepareRawContentResponseError();
341341
await tapQuoteAndReplyButton(tester);
342342
checkLoadingState(store, contentController, valueBefore: valueBefore, message: message);
343343
await tester.pump(Duration.zero); // error arrives; error dialog shows
@@ -495,7 +495,7 @@ void main() {
495495
final message = eg.streamMessage();
496496
await setupToMessageActionSheet(tester, message: message, narrow: TopicNarrow.ofMessage(message));
497497

498-
prepareRawContentResponseSuccess(store, message: message, rawContent: 'Hello world');
498+
prepareRawContentResponseSuccess(message: message, rawContent: 'Hello world');
499499
await tapCopyMessageTextButton(tester);
500500
await tester.pump(Duration.zero);
501501
check(await Clipboard.getData('text/plain')).isNotNull().text.equals('Hello world');
@@ -509,7 +509,7 @@ void main() {
509509
await setupToMessageActionSheet(tester, message: message, narrow: TopicNarrow.ofMessage(message));
510510

511511
// Make the request take a bit of time to complete…
512-
prepareRawContentResponseSuccess(store, message: message, rawContent: 'Hello world',
512+
prepareRawContentResponseSuccess(message: message, rawContent: 'Hello world',
513513
delay: const Duration(milliseconds: 500));
514514
await tapCopyMessageTextButton(tester);
515515
// … and pump a frame to finish the NavigationState.pop animation…
@@ -529,7 +529,7 @@ void main() {
529529
final message = eg.streamMessage();
530530
await setupToMessageActionSheet(tester, message: message, narrow: TopicNarrow.ofMessage(message));
531531

532-
prepareRawContentResponseError(store);
532+
prepareRawContentResponseError();
533533
await tapCopyMessageTextButton(tester);
534534
await tester.pump(Duration.zero); // error arrives; error dialog shows
535535

@@ -589,7 +589,7 @@ void main() {
589589
final message = eg.streamMessage();
590590
await setupToMessageActionSheet(tester, message: message, narrow: TopicNarrow.ofMessage(message));
591591

592-
prepareRawContentResponseSuccess(store, message: message, rawContent: 'Hello world');
592+
prepareRawContentResponseSuccess(message: message, rawContent: 'Hello world');
593593
await tapShareButton(tester);
594594
await tester.pump(Duration.zero);
595595
check(mockSharePlus.sharedString).equals('Hello world');
@@ -600,7 +600,7 @@ void main() {
600600
final message = eg.streamMessage();
601601
await setupToMessageActionSheet(tester, message: message, narrow: TopicNarrow.ofMessage(message));
602602

603-
prepareRawContentResponseSuccess(store, message: message, rawContent: 'Hello world');
603+
prepareRawContentResponseSuccess(message: message, rawContent: 'Hello world');
604604
mockSharePlus.resultString = 'dev.fluttercommunity.plus/share/unavailable';
605605
await tapShareButton(tester);
606606
await tester.pump(Duration.zero);
@@ -615,7 +615,7 @@ void main() {
615615
final message = eg.streamMessage();
616616
await setupToMessageActionSheet(tester, message: message, narrow: TopicNarrow.ofMessage(message));
617617

618-
prepareRawContentResponseError(store);
618+
prepareRawContentResponseError();
619619
await tapShareButton(tester);
620620
await tester.pump(Duration.zero); // error arrives; error dialog shows
621621

0 commit comments

Comments
 (0)