From 1bff129debbbcb69c50fb40f27dc6a01e890a984 Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Wed, 14 Apr 2021 14:01:34 +0200
Subject: [PATCH] hotfix tests

---
 packages/stream_chat/lib/src/api/websocket.dart |  2 +-
 .../test/src/api/websocket_test.dart            | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/packages/stream_chat/lib/src/api/websocket.dart b/packages/stream_chat/lib/src/api/websocket.dart
index 1e808795..bf27a990 100644
--- a/packages/stream_chat/lib/src/api/websocket.dart
+++ b/packages/stream_chat/lib/src/api/websocket.dart
@@ -316,6 +316,6 @@ class WebSocket {
     _manuallyDisconnected = true;
     _connectionStatus = ConnectionStatus.disconnected;
     await _connectionStatusController.close();
-    return _channel.sink.close();
+    await _channel.sink.close();
   }
 }
diff --git a/packages/stream_chat/test/src/api/websocket_test.dart b/packages/stream_chat/test/src/api/websocket_test.dart
index 156b203e..b9c897a6 100644
--- a/packages/stream_chat/test/src/api/websocket_test.dart
+++ b/packages/stream_chat/test/src/api/websocket_test.dart
@@ -124,8 +124,10 @@ void main() {
     const computedUrl =
         'wss://baseurl/connect?test=true&json=%7B%22payload%22%3A%22test%22%2C%22user_details%22%3A%7B%22id%22%3A%22testid%22%7D%7D';
 
+    final mockWSSink = MockWSSink();
+    when(() => mockWSChannel.sink).thenAnswer((_) => mockWSSink);
+    when(() => mockWSSink.close(any(), any())).thenAnswer((_) async => null);
     when(() => connectFunc(computedUrl)).thenAnswer((_) => mockWSChannel);
-    when(() => mockWSChannel.sink).thenAnswer((_) => MockWSSink());
     when(() => mockWSChannel.stream).thenAnswer((_) => streamController.stream);
 
     final connect = ws.connect().then((_) {
@@ -165,8 +167,10 @@ void main() {
     const computedUrl =
         'wss://baseurl/connect?test=true&json=%7B%22payload%22%3A%22test%22%2C%22user_details%22%3A%7B%22id%22%3A%22testid%22%7D%7D';
 
+    final mockWSSink = MockWSSink();
+    when(() => mockWSChannel.sink).thenAnswer((_) => mockWSSink);
+    when(() => mockWSSink.close(any(), any())).thenAnswer((_) async => null);
     when(() => connectFunc(computedUrl)).thenAnswer((_) => mockWSChannel);
-    when(() => mockWSChannel.sink).thenAnswer((_) => MockWSSink());
     when(() => mockWSChannel.stream).thenAnswer((_) => streamController.stream);
 
     ws.connect();
@@ -199,7 +203,8 @@ void main() {
 
     when(() => connectFunc(computedUrl)).thenAnswer((_) => mockWSChannel);
     when(() => mockWSChannel.stream).thenAnswer((_) => streamController.stream);
-    when(() => mockWSChannel.sink).thenReturn(mockWSSink);
+    when(() => mockWSChannel.sink).thenAnswer((_) => mockWSSink);
+    when(() => mockWSSink.close(any(), any())).thenAnswer((_) async => null);
 
     final timer = Timer.periodic(
       const Duration(milliseconds: 1000),
@@ -245,7 +250,8 @@ void main() {
 
     when(() => connectFunc(computedUrl)).thenAnswer((_) => mockWSChannel);
     when(() => mockWSChannel.stream).thenAnswer((_) => streamController.stream);
-    when(() => mockWSChannel.sink).thenReturn(mockWSSink);
+    when(() => mockWSChannel.sink).thenAnswer((_) => mockWSSink);
+    when(() => mockWSSink.close(any(), any())).thenAnswer((_) async => null);
 
     final connect = ws.connect().then((_) {
       streamController.sink.add('{}');
@@ -288,7 +294,8 @@ void main() {
 
     when(() => connectFunc(computedUrl)).thenAnswer((_) => mockWSChannel);
     when(() => mockWSChannel.stream).thenAnswer((_) => streamController.stream);
-    when(() => mockWSChannel.sink).thenReturn(mockWSSink);
+    when(() => mockWSChannel.sink).thenAnswer((_) => mockWSSink);
+    when(() => mockWSSink.close(any(), any())).thenAnswer((_) async => null);
 
     final connect = ws.connect().then((_) {
       streamController.sink.add('{}');