Skip to content

Get route-transition duration robustly,instead of hard-coding #1920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Get route-transition duration robustly,instead of hard-coding #1920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions test/widgets/action_sheet_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ Future<void> setupToMessageActionSheet(WidgetTester tester, {
// like if it's in padding around a Paragraph.
await tester.longPress(find.byType(MessageContent), warnIfMissed: false);
// sheet appears onscreen; default duration of bottom-sheet enter animation
await tester.pump(const Duration(milliseconds: 250));
await transitionDurationObserver.pumpPastTransition(tester);
// Check the action sheet did in fact open, so we don't defeat any tests that
// use simple `find.byIcon`-style checks to test presence/absence of a button.
check(find.byType(BottomSheet)).findsOne();
Expand Down Expand Up @@ -199,26 +199,29 @@ void main() {
check(find.byType(InboxPageBody)).findsOne();

await tester.longPress(find.text(someChannel.name).hitTestable());
await tester.pump(const Duration(milliseconds: 250));
await transitionDurationObserver.pumpPastTransition(tester);
}

Future<void> showFromSubscriptionList(WidgetTester tester) async {
transitionDurationObserver = TransitionDurationObserver();
await tester.pumpWidget(TestZulipApp(accountId: eg.selfAccount.id,
navigatorObservers: [transitionDurationObserver],
child: const HomePage()));
await tester.pump();
await tester.tap(find.byIcon(ZulipIcons.hash_italic));
await tester.pump();
check(find.byType(SubscriptionListPageBody)).findsOne();

await tester.longPress(find.text(someChannel.name).hitTestable());
await tester.pump(const Duration(milliseconds: 250));
await transitionDurationObserver.pumpPastTransition(tester);
}

Future<void> showFromMsglistAppBar(WidgetTester tester, {
ZulipStream? channel,
required Narrow narrow,
}) async {
channel ??= someChannel;
transitionDurationObserver = TransitionDurationObserver();

connection.prepare(json: eg.newestGetMessagesResult(
foundOldest: true, messages: []).toJson());
Expand All @@ -229,31 +232,34 @@ void main() {
}
await tester.pumpWidget(TestZulipApp(
accountId: eg.selfAccount.id,
navigatorObservers: [transitionDurationObserver],
child: MessageListPage(
initNarrow: narrow)));
await tester.pumpAndSettle();

await tester.longPress(find.descendant(
of: find.byType(ZulipAppBar),
matching: find.text(channel.name)));
await tester.pump(const Duration(milliseconds: 250));
await transitionDurationObserver.pumpPastTransition(tester);
}

Future<void> showFromRecipientHeader(WidgetTester tester, {
StreamMessage? message,
}) async {
message ??= someMessage;
transitionDurationObserver = TransitionDurationObserver();

connection.prepare(json: eg.newestGetMessagesResult(
foundOldest: true, messages: [message]).toJson());
await tester.pumpWidget(TestZulipApp(accountId: eg.selfAccount.id,
navigatorObservers: [transitionDurationObserver],
child: const MessageListPage(initNarrow: CombinedFeedNarrow())));
await tester.pumpAndSettle();

await tester.longPress(find.descendant(
of: find.byType(RecipientHeader),
matching: find.text(message.displayRecipient ?? '')));
await tester.pump(const Duration(milliseconds: 250));
await transitionDurationObserver.pumpPastTransition(tester);
}

Future<void> showFromTopicListAppBar(WidgetTester tester, {int? streamId}) async {
Expand Down Expand Up @@ -739,7 +745,7 @@ void main() {

await tester.longPress(find.text(topic));
// sheet appears onscreen; default duration of bottom-sheet enter animation
await tester.pump(const Duration(milliseconds: 250));
await transitionDurationObserver.pumpPastTransition(tester);
}

Future<void> showFromAppBar(WidgetTester tester, {
Expand All @@ -766,7 +772,7 @@ void main() {
effectiveTopic.displayName ?? eg.defaultRealmEmptyTopicDisplayName));
await tester.longPress(topicRow);
// sheet appears onscreen; default duration of bottom-sheet enter animation
await tester.pump(const Duration(milliseconds: 250));
await transitionDurationObserver.pumpPastTransition(tester);
}

Future<void> showFromRecipientHeader(WidgetTester tester, {
Expand All @@ -785,7 +791,7 @@ void main() {
of: find.byType(RecipientHeader),
matching: find.text(effectiveMessage.topic.displayName!)));
// sheet appears onscreen; default duration of bottom-sheet enter animation
await tester.pump(const Duration(milliseconds: 250));
await transitionDurationObserver.pumpPastTransition(tester);
}

final actionSheetFinder = find.byType(BottomSheet);
Expand Down Expand Up @@ -2049,9 +2055,11 @@ void main() {
delay: const Duration(milliseconds: 500));
await tapCopyMessageTextButton(tester);
// … and pump a frame to finish the NavigationState.pop animation…
await tester.pump(const Duration(milliseconds: 250));
await transitionDurationObserver.pumpPastTransition(tester);
// … before the request finishes. This is the repro condition for #732.
await tester.pump(const Duration(milliseconds: 250));
await transitionDurationObserver.pumpPastTransition(tester);
// …pump for snackbar to show
await tester.pumpAndSettle();

final snackbar = tester.widget<SnackBar>(find.byType(SnackBar));
check(snackbar.behavior).equals(SnackBarBehavior.floating);
Expand Down Expand Up @@ -2283,7 +2291,7 @@ void main() {
// See comment in setupToMessageActionSheet about warnIfMissed: false
await tester.longPress(find.byType(MessageContent), warnIfMissed: false);
// sheet appears onscreen; default duration of bottom-sheet enter animation
await tester.pump(const Duration(milliseconds: 250));
await transitionDurationObserver.pumpPastTransition(tester);
check(find.byType(BottomSheet)).findsOne();
checkButtonIsPresent(expected);

Expand Down
11 changes: 7 additions & 4 deletions test/widgets/compose_box_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ void main() {
late PerAccountStore store;
late FakeApiConnection connection;
late ComposeBoxState state;
late TransitionDurationObserver transitionDurationObserver;

// Caution: when testing edit-message UI, this will often be stale;
// read state.controller instead.
Expand Down Expand Up @@ -96,6 +97,7 @@ void main() {
store = await testBinding.globalStore.perAccount(selfAccount.id);

connection = store.connection as FakeApiConnection;
transitionDurationObserver = TransitionDurationObserver();

connection.prepare(json:
eg.newestGetMessagesResult(foundOldest: true, messages: messages).toJson());
Expand All @@ -104,6 +106,7 @@ void main() {
connection.prepare(json: GetStreamTopicsResult(topics: []).toJson());
}
await tester.pumpWidget(TestZulipApp(accountId: selfAccount.id,
navigatorObservers: [transitionDurationObserver],
child: MessageListPage(initNarrow: narrow)));
await tester.pumpAndSettle();
connection.takeRequests();
Expand Down Expand Up @@ -1719,7 +1722,7 @@ void main() {
await tester.longPress(find.byWidgetPredicate((widget) =>
widget is MessageWithPossibleSender && widget.item.message.id == messageId));
// sheet appears onscreen; default duration of bottom-sheet enter animation
await tester.pump(const Duration(milliseconds: 250));
await transitionDurationObserver.pumpPastTransition(tester);
final findEditButton = find.descendant(
of: find.byType(BottomSheet),
matching: find.byIcon(ZulipIcons.edit, skipOffstage: false));
Expand Down Expand Up @@ -1875,7 +1878,7 @@ void main() {
await startEditInteractionFromActionSheet(tester, messageId: messageToEdit.id,
originalRawContent: 'message to edit',
delay: Duration.zero);
await tester.pump(const Duration(milliseconds: 250)); // bottom-sheet animation
await transitionDurationObserver.pumpPastTransition(tester); // bottom-sheet animation

await tester.tap(failedMessageFinder);
await tester.pump();
Expand All @@ -1899,7 +1902,7 @@ void main() {
await startEditInteractionFromActionSheet(tester, messageId: messageToEdit.id,
originalRawContent: 'message to edit',
delay: Duration.zero);
await tester.pump(const Duration(milliseconds: 250)); // bottom-sheet animation
await transitionDurationObserver.pumpPastTransition(tester); // bottom-sheet animation

await tester.tap(failedMessageFinder);
await tester.pump();
Expand Down Expand Up @@ -2352,4 +2355,4 @@ enum _EditInteractionStart {
_EditInteractionStart.restoreFailedEdit => 'from restoring a failed edit',
};
}
}
}
2 changes: 1 addition & 1 deletion test/widgets/emoji_reaction_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ void main() {
// request the message action sheet
await tester.longPress(find.byType(MessageContent));
// sheet appears onscreen; default duration of bottom-sheet enter animation
await tester.pump(const Duration(milliseconds: 250));
await transitionDurationObserver.pumpPastTransition(tester);

await store.handleEvent(RealmEmojiUpdateEvent(id: 1, realmEmoji: {
'1': eg.realmEmojiItem(emojiCode: '1', emojiName: 'buzzing'),
Expand Down