Skip to content

Commit 887fafc

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 0063aca commit 887fafc

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
@@ -73,25 +73,25 @@ void main() {
7373
TestZulipBinding.ensureInitialized();
7474
TestWidgetsFlutterBinding.ensureInitialized();
7575

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

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

9797
group('AddThumbsUpButton', () {
@@ -288,7 +288,7 @@ void main() {
288288
topicController?.value = const TextEditingValue(text: kNoTopicTopic);
289289

290290
final valueBefore = contentController.value;
291-
prepareRawContentResponseSuccess(store, message: message, rawContent: 'Hello world');
291+
prepareRawContentResponseSuccess(message: message, rawContent: 'Hello world');
292292
await tapQuoteAndReplyButton(tester);
293293
checkLoadingState(store, contentController, valueBefore: valueBefore, message: message);
294294
await tester.pump(Duration.zero); // message is fetched; compose box updates
@@ -305,7 +305,7 @@ void main() {
305305
final contentController = composeBoxController.contentController;
306306

307307
final valueBefore = contentController.value;
308-
prepareRawContentResponseSuccess(store, message: message, rawContent: 'Hello world');
308+
prepareRawContentResponseSuccess(message: message, rawContent: 'Hello world');
309309
await tapQuoteAndReplyButton(tester);
310310
checkLoadingState(store, contentController, valueBefore: valueBefore, message: message);
311311
await tester.pump(Duration.zero); // message is fetched; compose box updates
@@ -323,7 +323,7 @@ void main() {
323323
final contentController = composeBoxController.contentController;
324324

325325
final valueBefore = contentController.value;
326-
prepareRawContentResponseSuccess(store, message: message, rawContent: 'Hello world');
326+
prepareRawContentResponseSuccess(message: message, rawContent: 'Hello world');
327327
await tapQuoteAndReplyButton(tester);
328328
checkLoadingState(store, contentController, valueBefore: valueBefore, message: message);
329329
await tester.pump(Duration.zero); // message is fetched; compose box updates
@@ -340,7 +340,7 @@ void main() {
340340
final contentController = composeBoxController.contentController;
341341

342342
final valueBefore = contentController.value = TextEditingValue.empty;
343-
prepareRawContentResponseError(store);
343+
prepareRawContentResponseError();
344344
await tapQuoteAndReplyButton(tester);
345345
checkLoadingState(store, contentController, valueBefore: valueBefore, message: message);
346346
await tester.pump(Duration.zero); // error arrives; error dialog shows
@@ -498,7 +498,7 @@ void main() {
498498
final message = eg.streamMessage();
499499
await setupToMessageActionSheet(tester, message: message, narrow: TopicNarrow.ofMessage(message));
500500

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

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

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

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

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

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

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

0 commit comments

Comments
 (0)