Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a04b576414 | ||
|
|
90c08a98cd |
+27
-19
@@ -594,25 +594,33 @@ func (m *Ci) Check(ctx context.Context) (string, error) {
|
||||
return "", err
|
||||
}
|
||||
|
||||
checkSetup := m.setup(m.checkSrc())
|
||||
|
||||
if _, err := checkSetup.WithExec([]string{"dart", "format", "--output=none", "--set-exit-if-changed", "lib", "test"}).Stdout(ctx); err != nil {
|
||||
return "Format check failed", err
|
||||
}
|
||||
|
||||
analyze, err := checkSetup.WithExec([]string{"dart", "analyze", "--fatal-infos"}).Stdout(ctx)
|
||||
if err != nil {
|
||||
return analyze, err
|
||||
}
|
||||
|
||||
mocks, err := m.CheckGenerated(ctx)
|
||||
if err != nil {
|
||||
return mocks, err
|
||||
}
|
||||
|
||||
coverage, err := m.Coverage(ctx)
|
||||
if err != nil {
|
||||
return coverage, err
|
||||
// Run format, analyze, generated-code check, and coverage in parallel —
|
||||
// they all share the same setup base and have no dependencies on each other.
|
||||
var analyze, mocks, coverage string
|
||||
var checkEg errgroup.Group
|
||||
checkEg.Go(func() error {
|
||||
setup := m.setup(m.checkSrc())
|
||||
_, err := setup.WithExec([]string{"dart", "format", "--output=none", "--set-exit-if-changed", "lib", "test"}).Stdout(ctx)
|
||||
return err
|
||||
})
|
||||
checkEg.Go(func() error {
|
||||
setup := m.setup(m.checkSrc())
|
||||
var err error
|
||||
analyze, err = setup.WithExec([]string{"dart", "analyze", "--fatal-infos"}).Stdout(ctx)
|
||||
return err
|
||||
})
|
||||
checkEg.Go(func() error {
|
||||
var err error
|
||||
mocks, err = m.CheckGenerated(ctx)
|
||||
return err
|
||||
})
|
||||
checkEg.Go(func() error {
|
||||
var err error
|
||||
coverage, err = m.Coverage(ctx)
|
||||
return err
|
||||
})
|
||||
if err := checkEg.Wait(); err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
// Use errgroup.Group (not WithContext) so a failing test does not cancel its
|
||||
|
||||
@@ -278,14 +278,7 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
|
||||
),
|
||||
],
|
||||
onChanged: _onSearchChanged,
|
||||
onSubmitted: (value) {
|
||||
// Only run the search if results haven't settled yet via
|
||||
// onChanged — prevents a second IMAP round-trip from reordering
|
||||
// the already-visible results when the user presses Enter.
|
||||
if (_searchResults == null && !_searchLoading) {
|
||||
unawaited(_runSearch(value));
|
||||
}
|
||||
},
|
||||
onSubmitted: _runSearch,
|
||||
textInputAction: TextInputAction.search,
|
||||
),
|
||||
),
|
||||
|
||||
@@ -798,67 +798,6 @@ void main() {
|
||||
},
|
||||
);
|
||||
|
||||
testWidgets(
|
||||
'pressing Enter after search settles does not reorder results',
|
||||
(tester) async {
|
||||
// Reproduces: user types a query → onChanged fires → results settle.
|
||||
// Then user presses Enter → onSubmitted fires a second search → the
|
||||
// second IMAP response may return results in a different order, so the
|
||||
// tile the user is about to tap is no longer the email they expect.
|
||||
final email1 = testEmail(id: 'acc-1:1', subject: 'Alpha Foo');
|
||||
final email2 = testEmail(id: 'acc-1:2', subject: 'Beta Foo');
|
||||
var callCount = 0;
|
||||
await tester.pumpWidget(
|
||||
buildApp(
|
||||
initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails',
|
||||
overrides: [
|
||||
accountRepositoryProvider.overrideWithValue(
|
||||
FakeAccountRepository([kTestAccount]),
|
||||
),
|
||||
mailboxRepositoryProvider.overrideWithValue(
|
||||
FakeMailboxRepository(),
|
||||
),
|
||||
emailRepositoryProvider.overrideWithValue(
|
||||
FakeEmailRepository(
|
||||
onSearch: (_) async {
|
||||
callCount++;
|
||||
// First call: [Alpha, Beta]. Second call: reversed.
|
||||
return callCount == 1 ? [email1, email2] : [email2, email1];
|
||||
},
|
||||
emailBody: const EmailBody(emailId: '', attachments: []),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
// Typing triggers onChanged → first search → results settle.
|
||||
await tester.enterText(find.byType(TextField), 'foo');
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.text('Alpha Foo'), findsOneWidget);
|
||||
expect(find.text('Beta Foo'), findsOneWidget);
|
||||
// Alpha must appear above Beta (it is first in the list).
|
||||
expect(
|
||||
tester.getTopLeft(find.text('Alpha Foo')).dy,
|
||||
lessThan(tester.getTopLeft(find.text('Beta Foo')).dy),
|
||||
);
|
||||
|
||||
// Pressing Enter triggers onSubmitted — must NOT re-run the search.
|
||||
await tester.testTextInput.receiveAction(TextInputAction.search);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
// Order must be unchanged: pressing Enter must not reorder results.
|
||||
expect(find.text('Alpha Foo'), findsOneWidget);
|
||||
expect(find.text('Beta Foo'), findsOneWidget);
|
||||
expect(
|
||||
tester.getTopLeft(find.text('Alpha Foo')).dy,
|
||||
lessThan(tester.getTopLeft(find.text('Beta Foo')).dy),
|
||||
);
|
||||
},
|
||||
);
|
||||
|
||||
testWidgets('shows preview snippet when email has preview', (tester) async {
|
||||
final email = Email(
|
||||
id: 'acc-1:99',
|
||||
|
||||
Reference in New Issue
Block a user