@@ -293,67 +293,88 @@ void main() {
293293 );
294294 });
295295
296- test (
297- 'ordinary refresh settles a superseded directory load for retry' ,
298- () async {
299- final session = _FakeRelaySession (
300- memberships: [_membership (_channelA, myPk)],
301- metadata: [
302- _meta (id: _channelA, name: 'general' ),
303- _meta (id: _channelB, name: 'discoverable' ),
304- ],
305- );
306- final container = _buildContainer (session: session);
307- addTearDown (container.dispose);
308-
309- expect (
310- (await container.read (
311- channelsProvider.future,
312- )).map ((channel) => channel.id),
313- [_channelA],
314- );
315-
316- session.pauseNextDirectoryQuery ();
317- final directory = container
318- .read (channelsProvider.notifier)
319- .retryDirectory ();
320- await session.nextDirectoryQueryStarted;
321-
322- // A foreground, reconnect, pull-to-refresh, or membership update can
323- // start an ordinary refresh while Browse is still loading discovery.
324- await container.read (channelsProvider.notifier).refresh ();
296+ for (final rebuild in [false , true ]) {
297+ test (
298+ '${rebuild ? 'Same-scope rebuild' : 'Ordinary refresh' } settles a superseded directory load for retry' ,
299+ () async {
300+ final session = _FakeRelaySession (
301+ memberships: [_membership (_channelA, myPk)],
302+ metadata: [
303+ _meta (id: _channelA, name: 'general' ),
304+ _meta (id: _channelB, name: 'discoverable' ),
305+ ],
306+ );
307+ final container = _buildContainer (session: session);
308+ addTearDown (container.dispose);
309+
310+ expect (
311+ (await container.read (
312+ channelsProvider.future,
313+ )).map ((channel) => channel.id),
314+ [_channelA],
315+ );
316+
317+ session.pauseNextDirectoryQuery ();
318+ final directory = container
319+ .read (channelsProvider.notifier)
320+ .retryDirectory ();
321+ await session.nextDirectoryQueryStarted;
322+
323+ if (rebuild) {
324+ // A same-scope configuration rebuild can overlap an in-flight
325+ // directory request when onboarding settles its community providers.
326+ final config = container.read (relayConfigProvider);
327+ container
328+ .read (relayConfigProvider.notifier)
329+ .update (baseUrl: config.baseUrl, nsec: config.nsec);
330+ await container.read (channelsProvider.future);
331+ } else {
332+ await container.read (channelsProvider.notifier).refresh ();
333+ }
325334
326- session.resumePausedDirectoryQuery ();
327- await directory;
328- await _settle ();
335+ session.resumePausedDirectoryQuery ();
336+ await directory;
337+ await _settle ();
338+
339+ expect (
340+ container.read (channelDirectoryLoadStatusProvider).status,
341+ ChannelDirectoryLoadStatus .error,
342+ );
343+ expect (
344+ container
345+ .read (channelsProvider)
346+ .requireValue
347+ .map ((channel) => channel.id),
348+ [_channelA],
349+ );
350+
351+ await container.read (channelsProvider.notifier).retryDirectory ();
352+
353+ expect (
354+ container.read (channelDirectoryLoadStatusProvider).status,
355+ ChannelDirectoryLoadStatus .loaded,
356+ );
357+ expect (
358+ container
359+ .read (channelsProvider)
360+ .requireValue
361+ .map ((channel) => channel.id),
362+ unorderedEquals ([_channelA, _channelB]),
363+ );
364+ },
365+ );
366+ }
329367
330- expect (
331- container.read (channelDirectoryLoadStatusProvider).status,
332- ChannelDirectoryLoadStatus .error,
333- );
334- expect (
335- container
336- .read (channelsProvider)
337- .requireValue
338- .map ((channel) => channel.id),
339- [_channelA],
340- );
368+ test ('refresh disposed before directory settlement writes nothing' , () async {
369+ final session = _FakeRelaySession (memberships: const []);
370+ final container = _buildContainer (session: session);
371+ await container.read (channelsProvider.future);
341372
342- await container.read (channelsProvider.notifier).retryDirectory ();
373+ final refresh = container.read (channelsProvider.notifier).refresh ();
374+ container.dispose ();
343375
344- expect (
345- container.read (channelDirectoryLoadStatusProvider).status,
346- ChannelDirectoryLoadStatus .loaded,
347- );
348- expect (
349- container
350- .read (channelsProvider)
351- .requireValue
352- .map ((channel) => channel.id),
353- unorderedEquals ([_channelA, _channelB]),
354- );
355- },
356- );
376+ await expectLater (refresh, completes);
377+ });
357378
358379 test (
359380 'community switch discards a stale directory success from the old relay' ,
0 commit comments