Skip to content

Commit ef09133

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 b91a826 commit ef09133

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
@@ -81,25 +81,25 @@ void main() {
8181
TestZulipBinding.ensureInitialized();
8282
TestWidgetsFlutterBinding.ensureInitialized();
8383

84-
void prepareRawContentResponseSuccess(PerAccountStore store, {
84+
void prepareRawContentResponseSuccess({
8585
required Message message,
8686
required String rawContent,
8787
Duration delay = Duration.zero,
8888
}) {
8989
// Prepare fetch-raw-Markdown response
9090
// TODO: Message should really only differ from `message`
9191
// in its content / content_type, not in `id` or anything else.
92-
(store.connection as FakeApiConnection).prepare(delay: delay, json:
92+
connection.prepare(delay: delay, json:
9393
GetMessageResult(message: eg.streamMessage(contentMarkdown: rawContent)).toJson());
9494
}
9595

96-
void prepareRawContentResponseError(PerAccountStore store) {
96+
void prepareRawContentResponseError() {
9797
final fakeResponseJson = {
9898
'code': 'BAD_REQUEST',
9999
'msg': 'Invalid message(s)',
100100
'result': 'error',
101101
};
102-
(store.connection as FakeApiConnection).prepare(httpStatus: 400, json: fakeResponseJson);
102+
connection.prepare(httpStatus: 400, json: fakeResponseJson);
103103
}
104104

105105
group('AddThumbsUpButton', () {
@@ -294,7 +294,7 @@ void main() {
294294
topicController?.value = const TextEditingValue(text: kNoTopicTopic);
295295

296296
final valueBefore = contentController.value;
297-
prepareRawContentResponseSuccess(store, message: message, rawContent: 'Hello world');
297+
prepareRawContentResponseSuccess(message: message, rawContent: 'Hello world');
298298
await tapQuoteAndReplyButton(tester);
299299
checkLoadingState(store, contentController, valueBefore: valueBefore, message: message);
300300
await tester.pump(Duration.zero); // message is fetched; compose box updates
@@ -311,7 +311,7 @@ void main() {
311311
final contentController = composeBoxController.contentController;
312312

313313
final valueBefore = contentController.value;
314-
prepareRawContentResponseSuccess(store, message: message, rawContent: 'Hello world');
314+
prepareRawContentResponseSuccess(message: message, rawContent: 'Hello world');
315315
await tapQuoteAndReplyButton(tester);
316316
checkLoadingState(store, contentController, valueBefore: valueBefore, message: message);
317317
await tester.pump(Duration.zero); // message is fetched; compose box updates
@@ -329,7 +329,7 @@ void main() {
329329
final contentController = composeBoxController.contentController;
330330

331331
final valueBefore = contentController.value;
332-
prepareRawContentResponseSuccess(store, message: message, rawContent: 'Hello world');
332+
prepareRawContentResponseSuccess(message: message, rawContent: 'Hello world');
333333
await tapQuoteAndReplyButton(tester);
334334
checkLoadingState(store, contentController, valueBefore: valueBefore, message: message);
335335
await tester.pump(Duration.zero); // message is fetched; compose box updates
@@ -346,7 +346,7 @@ void main() {
346346
final contentController = composeBoxController.contentController;
347347

348348
final valueBefore = contentController.value = TextEditingValue.empty;
349-
prepareRawContentResponseError(store);
349+
prepareRawContentResponseError();
350350
await tapQuoteAndReplyButton(tester);
351351
checkLoadingState(store, contentController, valueBefore: valueBefore, message: message);
352352
await tester.pump(Duration.zero); // error arrives; error dialog shows
@@ -499,7 +499,7 @@ void main() {
499499
final message = eg.streamMessage();
500500
await setupToMessageActionSheet(tester, message: message, narrow: TopicNarrow.ofMessage(message));
501501

502-
prepareRawContentResponseSuccess(store, message: message, rawContent: 'Hello world');
502+
prepareRawContentResponseSuccess(message: message, rawContent: 'Hello world');
503503
await tapCopyMessageTextButton(tester);
504504
await tester.pump(Duration.zero);
505505
check(await Clipboard.getData('text/plain')).isNotNull().text.equals('Hello world');
@@ -513,7 +513,7 @@ void main() {
513513
await setupToMessageActionSheet(tester, message: message, narrow: TopicNarrow.ofMessage(message));
514514

515515
// Make the request take a bit of time to complete…
516-
prepareRawContentResponseSuccess(store, message: message, rawContent: 'Hello world',
516+
prepareRawContentResponseSuccess(message: message, rawContent: 'Hello world',
517517
delay: const Duration(milliseconds: 500));
518518
await tapCopyMessageTextButton(tester);
519519
// … and pump a frame to finish the NavigationState.pop animation…
@@ -533,7 +533,7 @@ void main() {
533533
final message = eg.streamMessage();
534534
await setupToMessageActionSheet(tester, message: message, narrow: TopicNarrow.ofMessage(message));
535535

536-
prepareRawContentResponseError(store);
536+
prepareRawContentResponseError();
537537
await tapCopyMessageTextButton(tester);
538538
await tester.pump(Duration.zero); // error arrives; error dialog shows
539539

@@ -593,7 +593,7 @@ void main() {
593593
final message = eg.streamMessage();
594594
await setupToMessageActionSheet(tester, message: message, narrow: TopicNarrow.ofMessage(message));
595595

596-
prepareRawContentResponseSuccess(store, message: message, rawContent: 'Hello world');
596+
prepareRawContentResponseSuccess(message: message, rawContent: 'Hello world');
597597
await tapShareButton(tester);
598598
await tester.pump(Duration.zero);
599599
check(mockSharePlus.sharedString).equals('Hello world');
@@ -604,7 +604,7 @@ void main() {
604604
final message = eg.streamMessage();
605605
await setupToMessageActionSheet(tester, message: message, narrow: TopicNarrow.ofMessage(message));
606606

607-
prepareRawContentResponseSuccess(store, message: message, rawContent: 'Hello world');
607+
prepareRawContentResponseSuccess(message: message, rawContent: 'Hello world');
608608
mockSharePlus.resultString = 'dev.fluttercommunity.plus/share/unavailable';
609609
await tapShareButton(tester);
610610
await tester.pump(Duration.zero);
@@ -619,7 +619,7 @@ void main() {
619619
final message = eg.streamMessage();
620620
await setupToMessageActionSheet(tester, message: message, narrow: TopicNarrow.ofMessage(message));
621621

622-
prepareRawContentResponseError(store);
622+
prepareRawContentResponseError();
623623
await tapShareButton(tester);
624624
await tester.pump(Duration.zero); // error arrives; error dialog shows
625625

0 commit comments

Comments
 (0)