Merge branch 'develop' into cds-189

packages/stream_chat/test/src/api/channel_test.dart

@@ -1610,9 +1610,12 @@ void main() {
       const messageId = 'test-message-id';
       const language = 'hi'; // Hindi
       const translatedMessageText = 'नमस्ते';
-      final translatedMessage = TranslatedMessage(const {
-        language: translatedMessageText,
-      });
+
+      final translatedMessage = Message(
+        i18n: const {
+          language: translatedMessageText,
+        },
+      );
 
       when(() => client.translateMessage(messageId, language)).thenAnswer(
         (_) async => TranslateMessageResponse()..message = translatedMessage,

packages/stream_chat/test/src/api/client_test.dart

@@ -155,7 +155,7 @@ void main() {
 
     group('`.openConnection`', () {
       test('should throw if state does not contain user', () async {
-        expect(client.state.user, isNull);
+        expect(client.state.currentUser, isNull);
         try {
           await client.openConnection();
         } catch (e) {
@@ -164,7 +164,7 @@ void main() {
       });
 
       test('should throw if connection is already in progress', () async {
-        expect(client.state.user, isNull);
+        expect(client.state.currentUser, isNull);
         try {
           await client.connectAnonymousUser();
           await client.openConnection();
@@ -179,7 +179,7 @@ void main() {
       });
 
       test('should throw if connection is already available', () async {
-        expect(client.state.user, isNull);
+        expect(client.state.currentUser, isNull);
         try {
           await client.connectAnonymousUser();
           // waiting 300ms for `wsConnectionStatusStream` to emit
@@ -799,7 +799,7 @@ void main() {
     });
 
     test('`.disconnectUser` should reset state and user', () async {
-      expect(client.state.user, isNotNull);
+      expect(client.state.currentUser, isNotNull);
       expect(client.wsConnectionStatus, ConnectionStatus.connected);
 
       expectLater(
@@ -810,7 +810,7 @@ void main() {
 
       await client.disconnectUser();
 
-      expect(client.state.user, isNull);
+      expect(client.state.currentUser, isNull);
       expect(client.wsConnectionStatus, ConnectionStatus.disconnected);
     });
   });
@@ -2109,9 +2109,11 @@ void main() {
       const messageId = 'test-message-id';
       const language = 'hi'; // Hindi
       const translatedMessageText = 'नमस्ते';
-      final translatedMessage = TranslatedMessage(const {
-        language: translatedMessageText,
-      });
+      final translatedMessage = Message(
+        i18n: const {
+          language: translatedMessageText,
+        },
+      );
 
       when(() => api.message.translateMessage(messageId, language)).thenAnswer(
         (_) async => TranslateMessageResponse()..message = translatedMessage,

packages/stream_chat/test/src/core/api/message_api_test.dart

@@ -371,9 +371,11 @@ void main() {
     final path = '/messages/${message.id}/translate';
 
     const translatedMessageText = 'नमस्ते';
-    final translatedMessage = TranslatedMessage(const {
-      language: translatedMessageText,
-    });
+    final translatedMessage = Message(
+      i18n: const {
+        language: translatedMessageText,
+      },
+    );
 
     when(() => client.post(
           path,

packages/stream_chat/test/src/core/http/stream_http_client_options_test.dart

@@ -9,6 +9,8 @@ void main() {
     expect(options.baseUrl, 'https://chat-us-east-1.stream-io-api.com');
     expect(options.connectTimeout, const Duration(seconds: 6));
     expect(options.receiveTimeout, const Duration(seconds: 6));
+    expect(options.queryParameters, const {});
+    expect(options.headers, const {});
   });
 
   test('should override all the default set params', () {
@@ -16,11 +18,15 @@ void main() {
       baseUrl: 'base-url',
       connectTimeout: Duration(seconds: 3),
       receiveTimeout: Duration(seconds: 3),
+      headers: {'test': 'test'},
+      queryParameters: {'123': '123'},
     );
     expect(options.location, isNull);
     expect(options.baseUrl, 'base-url');
     expect(options.connectTimeout, const Duration(seconds: 3));
     expect(options.receiveTimeout, const Duration(seconds: 3));
+    expect(options.headers, {'test': 'test'});
+    expect(options.queryParameters, {'123': '123'});
   });
 
   group('should create baseUrl according to provided location', () {

packages/stream_chat/test/src/core/http/stream_http_client_test.dart

@@ -96,7 +96,7 @@ void main() {
       await client.get('path');
     } catch (_) {}
 
-    verify(() => logger.info(any())).called(16);
+    verify(() => logger.info(any())).called(greaterThan(0));
   });
 
   test('loggingInterceptor should log error', () async {
@@ -108,7 +108,7 @@ void main() {
       await client.get('path');
     } catch (_) {}
 
-    verify(() => logger.severe(any())).called(8);
+    verify(() => logger.severe(any())).called(greaterThan(0));
   });
 
   test('`.lock` should lock the dio client', () async {

packages/stream_chat/test/src/core/models/message_test.dart

@@ -28,6 +28,7 @@ void main() {
       expect(message.pinnedAt, null);
       expect(message.pinExpires, null);
       expect(message.pinnedBy, null);
+      expect(message.i18n, null);
     });
 
     test('should serialize to json correctly', () {

packages/stream_chat/test/src/fakes.dart

@@ -89,7 +89,7 @@ class FakeChatApi extends Fake implements StreamChatApi {
 
 class FakeClientState extends Fake implements ClientState {
   @override
-  OwnUser? get user => OwnUser(id: 'test-user-id');
+  OwnUser? get currentUser => OwnUser(id: 'test-user-id');
 
   @override
   int totalUnreadCount = 0;