talksik/stream-chat-flutter
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test fixes

Browse Source
This commit is contained in:
Deven Joshi
2022-01-14 16:36:30 +05:30
parent f2ab29d8c6
commit 6729ef1deb
5 changed files with 136 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/stream_chat_flutter/lib/src/extension.dart
+1
View File
@@ -46,6 +46,7 @@ extension IterableX<T> on Iterable<T> {
/// Useful extension for [PlatformFile]
extension PlatformFileX on PlatformFile {
/// Converts the [PlatformFile] into [AttachmentFile]
//ignore: avoid_redundant_argument_values
AttachmentFile get toAttachmentFile => AttachmentFile(
path: kIsWeb ? null : path,
name: name,
packages/stream_chat_flutter/lib/src/message_actions_modal.dart
+16 -15
View File
@@ -28,7 +28,7 @@ class MessageActionsModal extends StatefulWidget {
this.showReplyMessage = true,
this.showResendMessage = true,
this.showThreadReplyMessage,
this.showFlagButton = true,
this.showFlagButton,
this.showPinButton,
this.editMessageInputBuilder,
this.reverse = false,
@@ -73,13 +73,13 @@ class MessageActionsModal extends StatefulWidget {
final bool showResendMessage;
/// Flag for showing reply action
final bool showReplyMessage;
final bool? showReplyMessage;
/// Flag for showing thread reply action
final bool? showThreadReplyMessage;
/// Flag for showing flag action
final bool showFlagButton;
final bool? showFlagButton;
/// Flag for showing pin action
final bool? showPinButton;
@@ -191,14 +191,15 @@ class _MessageActionsModalState extends State<MessageActionsModal> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
if (_userPermissions
.contains(PermissionType.quoteMessage) &&
widget.showReplyMessage &&
widget.message.status == MessageSendingStatus.sent)
if (widget.showReplyMessage ??
(_userPermissions
.contains(PermissionType.quoteMessage) &&
widget.message.status ==
MessageSendingStatus.sent))
_buildReplyButton(context),
if ((widget.showThreadReplyMessage ??
if (widget.showThreadReplyMessage ??
_userPermissions
.contains(PermissionType.sendReply)) &&
.contains(PermissionType.sendReply) &&
(widget.message.status ==
MessageSendingStatus.sent) &&
widget.message.parentId == null)
@@ -209,16 +210,16 @@ class _MessageActionsModalState extends State<MessageActionsModal> {
_isMyMessage && hasEditPermission)
_buildEditMessage(context),
if (widget.showCopyMessage) _buildCopyButton(context),
if (_userPermissions
.contains(PermissionType.flagMessage) &&
widget.showFlagButton)
if (widget.showFlagButton ??
_userPermissions
.contains(PermissionType.flagMessage))
_buildFlagButton(context),
if (widget.showPinButton ??
_userPermissions
.contains(PermissionType.pinMessage))
_buildPinButton(context),
if (widget.showDeleteMessage ??
_isMyMessage && hasDeletePermission)
(_isMyMessage && hasDeletePermission))
_buildDeleteButton(context),
...widget.customActions
.map((action) => _buildCustomAction(
@@ -686,8 +687,8 @@ class _MessageActionsModalState extends State<MessageActionsModal> {
void didChangeDependencies() {
final newStreamChannel = StreamChannel.of(context);
_userPermissions = newStreamChannel.channel.ownCapabilities;
_isMyMessage = widget.message.user!.id ==
newStreamChannel.channel.client.state.currentUser!.id;
_isMyMessage =
widget.message.user?.id == StreamChat.of(context).currentUser?.id;
super.didChangeDependencies();
}
}
packages/stream_chat_flutter/test/src/message_action_modal_test.dart
+93 -62
View File
@@ -19,6 +19,7 @@ void main() {
(WidgetTester tester) async {
final client = MockClient();
final clientState = MockClientState();
final channel = MockChannel();
when(() => client.state).thenReturn(clientState);
when(() => clientState.currentUser).thenReturn(OwnUser(id: 'user-id'));
@@ -32,19 +33,25 @@ void main() {
streamChatThemeData: streamTheme,
client: client,
child: SizedBox(
child: MessageActionsModal(
message: Message(
text: 'test',
user: User(
id: 'user-id',
child: StreamChannel(
channel: channel,
child: MessageActionsModal(
message: Message(
text: 'test',
user: User(
id: 'user-id',
),
status: MessageSendingStatus.sent,
),
status: MessageSendingStatus.sent,
messageWidget: const Text(
'test',
key: Key('MessageWidget'),
),
messageTheme: streamTheme.ownMessageTheme,
showThreadReplyMessage: true,
showEditMessage: true,
showDeleteMessage: true,
),
messageWidget: const Text(
'test',
key: Key('MessageWidget'),
),
messageTheme: streamTheme.ownMessageTheme,
),
),
),
@@ -66,6 +73,7 @@ void main() {
(WidgetTester tester) async {
final client = MockClient();
final clientState = MockClientState();
final channel = MockChannel();
when(() => client.state).thenReturn(clientState);
when(() => clientState.currentUser).thenReturn(OwnUser(id: 'user-id'));
@@ -79,20 +87,23 @@ void main() {
streamChatThemeData: streamTheme,
client: client,
child: SizedBox(
child: MessageActionsModal(
showCopyMessage: false,
showReplyMessage: false,
showThreadReplyMessage: false,
message: Message(
text: 'test',
user: User(
id: 'user-id',
child: StreamChannel(
channel: channel,
child: MessageActionsModal(
showCopyMessage: false,
showReplyMessage: false,
showThreadReplyMessage: false,
message: Message(
text: 'test',
user: User(
id: 'user-id',
),
),
messageTheme: streamTheme.ownMessageTheme,
messageWidget: const Text(
'test',
key: Key('MessageWidget'),
),
),
messageTheme: streamTheme.ownMessageTheme,
messageWidget: const Text(
'test',
key: Key('MessageWidget'),
),
),
),
@@ -115,6 +126,7 @@ void main() {
(WidgetTester tester) async {
final client = MockClient();
final clientState = MockClientState();
final channel = MockChannel();
when(() => client.state).thenReturn(clientState);
when(() => clientState.currentUser).thenReturn(OwnUser(id: 'user-id'));
@@ -130,24 +142,27 @@ void main() {
streamChatThemeData: streamTheme,
client: client,
child: SizedBox(
child: MessageActionsModal(
messageWidget: const Text('test'),
message: Message(
text: 'test',
user: User(
id: 'user-id',
child: StreamChannel(
channel: channel,
child: MessageActionsModal(
messageWidget: const Text('test'),
message: Message(
text: 'test',
user: User(
id: 'user-id',
),
),
messageTheme: streamTheme.ownMessageTheme,
customActions: [
MessageAction(
leading: const Icon(Icons.check),
title: const Text('title'),
onTap: (m) {
tapped = true;
},
),
],
),
messageTheme: streamTheme.ownMessageTheme,
customActions: [
MessageAction(
leading: const Icon(Icons.check),
title: const Text('title'),
onTap: (m) {
tapped = true;
},
),
],
),
),
),
@@ -170,6 +185,7 @@ void main() {
(WidgetTester tester) async {
final client = MockClient();
final clientState = MockClientState();
final channel = MockChannel();
when(() => client.state).thenReturn(clientState);
when(() => clientState.currentUser).thenReturn(OwnUser(id: 'user-id'));
@@ -186,19 +202,22 @@ void main() {
streamChatThemeData: streamTheme,
client: client,
child: SizedBox(
child: MessageActionsModal(
messageWidget: const Text('test'),
onReplyTap: (m) {
tapped = true;
},
message: Message(
text: 'test',
user: User(
id: 'user-id',
child: StreamChannel(
channel: channel,
child: MessageActionsModal(
messageWidget: const Text('test'),
onReplyTap: (m) {
tapped = true;
},
message: Message(
text: 'test',
user: User(
id: 'user-id',
),
status: MessageSendingStatus.sent,
),
status: MessageSendingStatus.sent,
messageTheme: streamTheme.ownMessageTheme,
),
messageTheme: streamTheme.ownMessageTheme,
),
),
),
@@ -217,6 +236,7 @@ void main() {
(WidgetTester tester) async {
final client = MockClient();
final clientState = MockClientState();
final channel = MockChannel();
when(() => client.state).thenReturn(clientState);
when(() => clientState.currentUser).thenReturn(OwnUser(id: 'user-id'));
@@ -233,19 +253,23 @@ void main() {
streamChatThemeData: streamTheme,
client: client,
child: SizedBox(
child: MessageActionsModal(
messageWidget: const Text('test'),
onThreadReplyTap: (m) {
tapped = true;
},
message: Message(
text: 'test',
user: User(
id: 'user-id',
child: StreamChannel(
channel: channel,
child: MessageActionsModal(
messageWidget: const Text('test'),
onThreadReplyTap: (m) {
tapped = true;
},
message: Message(
text: 'test',
user: User(
id: 'user-id',
),
status: MessageSendingStatus.sent,
),
status: MessageSendingStatus.sent,
messageTheme: streamTheme.ownMessageTheme,
showThreadReplyMessage: true,
),
messageTheme: streamTheme.ownMessageTheme,
),
),
),
@@ -295,6 +319,7 @@ void main() {
),
),
messageTheme: streamTheme.ownMessageTheme,
showEditMessage: true,
),
),
),
@@ -345,6 +370,7 @@ void main() {
),
),
messageTheme: streamTheme.ownMessageTheme,
showEditMessage: true,
),
),
),
@@ -545,6 +571,7 @@ void main() {
),
),
messageTheme: streamTheme.ownMessageTheme,
showFlagButton: true,
),
),
),
@@ -601,6 +628,7 @@ void main() {
),
),
messageTheme: streamTheme.ownMessageTheme,
showFlagButton: true,
),
),
),
@@ -657,6 +685,7 @@ void main() {
),
),
messageTheme: streamTheme.ownMessageTheme,
showFlagButton: true,
),
),
),
@@ -711,6 +740,7 @@ void main() {
),
),
messageTheme: streamTheme.ownMessageTheme,
showDeleteMessage: true,
),
),
),
@@ -767,6 +797,7 @@ void main() {
),
),
messageTheme: streamTheme.ownMessageTheme,
showDeleteMessage: true,
),
),
),
packages/stream_chat_flutter/test/src/message_reactions_modal_test.dart
+23 -15
View File
@@ -13,6 +13,7 @@ void main() {
(WidgetTester tester) async {
final client = MockClient();
final clientState = MockClientState();
final channel = MockChannel();
final themeData = ThemeData();
when(() => client.state).thenReturn(clientState);
@@ -33,13 +34,16 @@ void main() {
home: StreamChat(
client: client,
streamChatThemeData: streamTheme,
child: MessageReactionsModal(
messageWidget: const Text(
'test',
key: Key('MessageWidget'),
child: StreamChannel(
channel: channel,
child: MessageReactionsModal(
messageWidget: const Text(
'test',
key: Key('MessageWidget'),
),
message: message,
messageTheme: streamTheme.ownMessageTheme,
),
message: message,
messageTheme: streamTheme.ownMessageTheme,
),
),
),
@@ -58,6 +62,7 @@ void main() {
(WidgetTester tester) async {
final client = MockClient();
final clientState = MockClientState();
final channel = MockChannel();
final themeData = ThemeData();
when(() => client.state).thenReturn(clientState);
@@ -89,16 +94,19 @@ void main() {
home: StreamChat(
client: client,
streamChatThemeData: streamTheme,
child: MessageReactionsModal(
messageWidget: const Text(
'test',
key: Key('MessageWidget'),
child: StreamChannel(
channel: channel,
child: MessageReactionsModal(
messageWidget: const Text(
'test',
key: Key('MessageWidget'),
),
message: message,
messageTheme: streamTheme.ownMessageTheme,
reverse: true,
showReactions: false,
onUserAvatarTap: onUserAvatarTap,
),
message: message,
messageTheme: streamTheme.ownMessageTheme,
reverse: true,
showReactions: false,
onUserAvatarTap: onUserAvatarTap,
),
),
),
packages/stream_chat_flutter/test/src/mocks.dart
+3
View File
@@ -21,6 +21,9 @@ class MockChannel extends Mock implements Channel {
Future<void> keyStroke([String? parentId]) async {
return;
}
@override
List<String> get ownCapabilities => ['send-message'];
}
class MockChannelState extends Mock implements ChannelClientState {