From 478033078fd65b85819e0315f91b9147ce6d8db4 Mon Sep 17 00:00:00 2001
From: Ayush Shekhar <ayushshekhar@Ayushs-MacBook-Pro.local>
Date: Thu, 14 Apr 2022 14:37:39 +0530
Subject: [PATCH] Fixed failing tests

---
 packages/stream_chat_flutter/pubspec.yaml     |  4 ----
 .../src/attachment_actions_modal_test.dart    | 22 ++++++++++---------
 .../src/theme/gallery_header_theme_test.dart  | 22 +++++++++++++++++--
 3 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/packages/stream_chat_flutter/pubspec.yaml b/packages/stream_chat_flutter/pubspec.yaml
index 667c031ba..e0ba6fd84 100644
--- a/packages/stream_chat_flutter/pubspec.yaml
+++ b/packages/stream_chat_flutter/pubspec.yaml
@@ -36,11 +36,7 @@ dependencies:
   rxdart: ^0.27.0
   share_plus: ^4.0.1
   shimmer: ^2.0.0
-<<<<<<< HEAD
   stream_chat_flutter_core: ^4.0.0-beta.0
-=======
-  stream_chat_flutter_core: ^3.6.1
->>>>>>> develop
   substring_highlight: ^1.0.26
   url_launcher: ^6.0.3
   video_player: ^2.1.0
diff --git a/packages/stream_chat_flutter/test/src/attachment_actions_modal_test.dart b/packages/stream_chat_flutter/test/src/attachment_actions_modal_test.dart
index 2d42f5588..d59b80028 100644
--- a/packages/stream_chat_flutter/test/src/attachment_actions_modal_test.dart
+++ b/packages/stream_chat_flutter/test/src/attachment_actions_modal_test.dart
@@ -452,15 +452,16 @@ void main() {
 
       await tester.tap(find.text('Save Image'));
 
-      imageDownloader.progressCallback!(0, 100);
+      imageDownloader.progressCallback!(0, 100000);
       await tester.pump();
-      expect(find.text('0%'), findsOneWidget);
+      expect(find.text('0.00 MB'), findsOneWidget);
 
-      imageDownloader.progressCallback!(50, 100);
+      imageDownloader.progressCallback!(50000, 100000);
       await tester.pump();
-      expect(find.text('50%'), findsOneWidget);
+      expect(find.text('0.05 MB'), findsOneWidget);
 
-      imageDownloader.progressCallback!(100, 100);
+      imageDownloader.progressCallback!(100000, 100000);
+      imageDownloader.downloadedPathCallback!('path');
       imageDownloader.completer.complete('path');
       await tester.pump();
       expect(find.byKey(const Key('completedIcon')), findsOneWidget);
@@ -510,15 +511,16 @@ void main() {
 
       await tester.tap(find.text('Save Video'));
 
-      fileDownloader.progressCallback!(0, 100);
+      fileDownloader.progressCallback!(0, 100000);
       await tester.pump();
-      expect(find.text('0%'), findsOneWidget);
+      expect(find.text('0.00 MB'), findsOneWidget);
 
-      fileDownloader.progressCallback!(50, 100);
+      fileDownloader.progressCallback!(50000, 100000);
       await tester.pump();
-      expect(find.text('50%'), findsOneWidget);
+      expect(find.text('0.05 MB'), findsOneWidget);
 
-      fileDownloader.progressCallback!(100, 100);
+      fileDownloader.progressCallback!(100000, 100000);
+      fileDownloader.downloadedPathCallback!('path');
       fileDownloader.completer.complete('path');
       await tester.pump();
       expect(find.byKey(const Key('completedIcon')), findsOneWidget);
diff --git a/packages/stream_chat_flutter/test/src/theme/gallery_header_theme_test.dart b/packages/stream_chat_flutter/test/src/theme/gallery_header_theme_test.dart
index 50be7d57b..651da1ce1 100644
--- a/packages/stream_chat_flutter/test/src/theme/gallery_header_theme_test.dart
+++ b/packages/stream_chat_flutter/test/src/theme/gallery_header_theme_test.dart
@@ -66,7 +66,16 @@ void main() {
         home: Builder(
           builder: (context) {
             _context = context;
-            final _message = Message();
+            final attachment = Attachment(
+              type: 'video',
+              title: 'video.mp4',
+            );
+            final _message = Message(
+              createdAt: DateTime.now(),
+              attachments: [
+                attachment,
+              ],
+            );
             return Scaffold(
               appBar: StreamGalleryHeader(
                 message: _message,
@@ -107,7 +116,16 @@ void main() {
         home: Builder(
           builder: (context) {
             _context = context;
-            final _message = Message();
+            final attachment = Attachment(
+              type: 'video',
+              title: 'video.mp4',
+            );
+            final _message = Message(
+              createdAt: DateTime.now(),
+              attachments: [
+                attachment,
+              ],
+            );
             return Scaffold(
               appBar: StreamGalleryHeader(
                 message: _message,