mirror of
https://github.com/dz0ny/meshcore-sar.git
synced 2026-08-11 16:30:28 +00:00
fix: Show recipient activity previews
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_blue_plus/flutter_blue_plus.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:meshcore_sar_app/l10n/app_localizations.dart';
|
||||
import 'package:meshcore_sar_app/providers/connection_provider.dart';
|
||||
@@ -34,6 +35,24 @@ class _FakeConnectionProvider extends ConnectionProvider {
|
||||
}
|
||||
}
|
||||
|
||||
class _ConnectableFakeConnectionProvider extends ConnectionProvider {
|
||||
int connectCalls = 0;
|
||||
|
||||
@override
|
||||
List<ScannedDevice> get scannedDevices => [
|
||||
ScannedDevice(device: BluetoothDevice.fromId('test-device'), rssi: -55),
|
||||
];
|
||||
|
||||
@override
|
||||
String? get error => null;
|
||||
|
||||
@override
|
||||
Future<bool> connect(BluetoothDevice device) async {
|
||||
connectCalls += 1;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
void main() {
|
||||
testWidgets('BLE scan waits for explicit user action', (tester) async {
|
||||
final connectionProvider = _FakeConnectionProvider();
|
||||
@@ -64,4 +83,47 @@ void main() {
|
||||
expect(connectionProvider.stopScanCalls, 1);
|
||||
expect(connectionProvider.startScanCalls, 1);
|
||||
});
|
||||
|
||||
testWidgets('successful BLE connect closes the dialog immediately', (
|
||||
tester,
|
||||
) async {
|
||||
final connectionProvider = _ConnectableFakeConnectionProvider();
|
||||
|
||||
await tester.pumpWidget(
|
||||
ChangeNotifierProvider<ConnectionProvider>.value(
|
||||
value: connectionProvider,
|
||||
child: MaterialApp(
|
||||
localizationsDelegates: AppLocalizations.localizationsDelegates,
|
||||
supportedLocales: AppLocalizations.supportedLocales,
|
||||
home: Builder(
|
||||
builder: (context) => Scaffold(
|
||||
body: Center(
|
||||
child: FilledButton(
|
||||
onPressed: () {
|
||||
showModalBottomSheet<Object?>(
|
||||
context: context,
|
||||
isScrollControlled: true,
|
||||
builder: (_) => const ConnectionDialog(),
|
||||
);
|
||||
},
|
||||
child: const Text('Open'),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
await tester.tap(find.text('Open'));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.byType(ConnectionDialog), findsOneWidget);
|
||||
|
||||
await tester.tap(find.widgetWithText(FilledButton, 'Connect'));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(connectionProvider.connectCalls, 1);
|
||||
expect(find.byType(ConnectionDialog), findsNothing);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -181,6 +181,44 @@ void main() {
|
||||
}
|
||||
});
|
||||
|
||||
testWidgets('channel bubbles refresh to synced channel names', (
|
||||
tester,
|
||||
) async {
|
||||
final harness = await _TestHarness.create();
|
||||
try {
|
||||
final message = Message(
|
||||
id: 'channel-name-refresh',
|
||||
messageType: MessageType.channel,
|
||||
senderPublicKeyPrefix: _prefix(61),
|
||||
channelIdx: 3,
|
||||
pathLen: 0,
|
||||
textType: MessageTextType.plain,
|
||||
senderTimestamp: 1700000000,
|
||||
text: 'Team update',
|
||||
receivedAt: DateTime.fromMillisecondsSinceEpoch(1700000000500),
|
||||
deliveryStatus: MessageDeliveryStatus.sent,
|
||||
);
|
||||
|
||||
await tester.pumpWidget(_buildApp(harness, message));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.text('Channel 3'), findsOneWidget);
|
||||
expect(find.text('#slovenija'), findsNothing);
|
||||
|
||||
harness.channelsProvider.addOrUpdateChannel(
|
||||
index: 3,
|
||||
name: '#slovenija',
|
||||
secret: Uint8List(16),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.text('#slovenija'), findsOneWidget);
|
||||
expect(find.text('Channel 3'), findsNothing);
|
||||
} finally {
|
||||
await _disposeHarness(tester, harness);
|
||||
}
|
||||
});
|
||||
|
||||
testWidgets('message bubble detects and opens links', (tester) async {
|
||||
final harness = await _TestHarness.create();
|
||||
try {
|
||||
|
||||
@@ -4,6 +4,8 @@ import 'package:flutter/material.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:meshcore_sar_app/l10n/app_localizations.dart';
|
||||
import 'package:meshcore_sar_app/models/contact.dart';
|
||||
import 'package:meshcore_sar_app/models/message.dart';
|
||||
import 'package:meshcore_sar_app/providers/messages_provider.dart';
|
||||
import 'package:meshcore_sar_app/widgets/messages/recipient_selector_sheet.dart';
|
||||
|
||||
void main() {
|
||||
@@ -31,13 +33,18 @@ void main() {
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> pumpSheet(WidgetTester tester) async {
|
||||
final channel = buildContact(
|
||||
name: 'Ops',
|
||||
type: ContactType.channel,
|
||||
secondByte: 3,
|
||||
);
|
||||
final contact = buildContact(name: 'John Smith', type: ContactType.chat);
|
||||
Future<void> pumpSheet(
|
||||
WidgetTester tester, {
|
||||
List<Contact>? contacts,
|
||||
List<Contact>? channels,
|
||||
MessagesProvider? messagesProvider,
|
||||
bool showAllOption = true,
|
||||
}) async {
|
||||
final resolvedChannels =
|
||||
channels ??
|
||||
[buildContact(name: 'Ops', type: ContactType.channel, secondByte: 3)];
|
||||
final resolvedContacts =
|
||||
contacts ?? [buildContact(name: 'John Smith', type: ContactType.chat)];
|
||||
|
||||
await tester.pumpWidget(
|
||||
MaterialApp(
|
||||
@@ -45,15 +52,17 @@ void main() {
|
||||
supportedLocales: AppLocalizations.supportedLocales,
|
||||
home: Scaffold(
|
||||
body: RecipientSelectorSheet(
|
||||
contacts: [contact],
|
||||
contacts: resolvedContacts,
|
||||
rooms: const [],
|
||||
channels: [channel],
|
||||
channels: resolvedChannels,
|
||||
unreadCount: 11,
|
||||
unreadCountsByPublicKey: {
|
||||
channel.publicKeyHex: 7,
|
||||
contact.publicKeyHex: 3,
|
||||
for (final channel in resolvedChannels) channel.publicKeyHex: 7,
|
||||
for (final contact in resolvedContacts) contact.publicKeyHex: 3,
|
||||
},
|
||||
currentDestinationType: 'all',
|
||||
showAllOption: showAllOption,
|
||||
messagesProvider: messagesProvider,
|
||||
onSelect: (selectedContact, destinationType) {},
|
||||
),
|
||||
),
|
||||
@@ -150,4 +159,49 @@ void main() {
|
||||
expect(charlieY, lessThan(bravoY));
|
||||
expect(bravoY, lessThan(alphaY));
|
||||
});
|
||||
|
||||
testWidgets('shows channel activity and participants instead of raw ids', (
|
||||
tester,
|
||||
) async {
|
||||
final channel = buildContact(
|
||||
name: 'Ops',
|
||||
type: ContactType.channel,
|
||||
secondByte: 3,
|
||||
);
|
||||
final messagesProvider = MessagesProvider()
|
||||
..addMessage(
|
||||
Message(
|
||||
id: 'channel-activity',
|
||||
messageType: MessageType.channel,
|
||||
senderName: 'Radio Alpha',
|
||||
channelIdx: 3,
|
||||
pathLen: 1,
|
||||
textType: MessageTextType.plain,
|
||||
senderTimestamp:
|
||||
DateTime.now()
|
||||
.subtract(const Duration(minutes: 5))
|
||||
.millisecondsSinceEpoch ~/
|
||||
1000,
|
||||
text: 'status update',
|
||||
receivedAt: DateTime.now().subtract(const Duration(minutes: 5)),
|
||||
),
|
||||
);
|
||||
|
||||
await pumpSheet(
|
||||
tester,
|
||||
contacts: const [],
|
||||
channels: [channel],
|
||||
messagesProvider: messagesProvider,
|
||||
showAllOption: false,
|
||||
);
|
||||
|
||||
expect(
|
||||
find.byKey(Key('channel-participants-${channel.publicKeyHex}')),
|
||||
findsOneWidget,
|
||||
);
|
||||
expect(find.text('Radio Alpha'), findsNothing);
|
||||
expect(find.text('5m ago'), findsOneWidget);
|
||||
expect(find.textContaining('Channel 3'), findsNothing);
|
||||
expect(find.text(channel.publicKeyShort.toUpperCase()), findsNothing);
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user