chore(api): Fix failing test on web

aws-amplify · Sep 1, 2023 · de810a2 · de810a2
1 parent 31bbbdf
commit de810a2
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 51 deletions.
diff --git a/packages/api/amplify_api_dart/lib/src/graphql/web_socket/blocs/web_socket_bloc.dart b/packages/api/amplify_api_dart/lib/src/graphql/web_socket/blocs/web_socket_bloc.dart
@@ -278,7 +278,7 @@ class WebSocketBloc with AWSDebuggable, AmplifyLoggerMixin {
       onError: (Object error, StackTrace st) {
         final exception = NetworkException(
           'Exception from WebSocketService.',
-          underlyingException: error.toString(),
+          underlyingException: error,
         );
         _shutdownWithException(exception, st);
       },
@@ -405,10 +405,7 @@ class WebSocketBloc with AWSDebuggable, AmplifyLoggerMixin {
     }
 
     currentState.service
-        .register(
-          currentState,
-          request,
-        )
+        .register(currentState, request)
         .onError<Object>(subscriptionBloc.addResponseError);
   }
 

diff --git a/packages/api/amplify_api_dart/test/util.dart b/packages/api/amplify_api_dart/test/util.dart
@@ -256,15 +256,17 @@ class MockWebSocketService extends AmplifyWebSocketService {
 
   @override
   Stream<WebSocketEvent> init(WebSocketState state) {
-    if (badInit) {
-      return Stream.error(
-        WebSocketChannelException('Mock Web Socket Exception'),
-      );
-    }
     channel = MockWebSocketChannel();
-
     sink = channel.sink;
 
+    if (badInit) {
+      Timer.run(() {
+        channel.controller.addError(
+          WebSocketChannelException('Mock Web Socket Exception'),
+        );
+      });
+    }
+
     return transformStream(channel.stream);
   }
 

diff --git a/packages/api/amplify_api_dart/test/web_socket/web_socket_bloc_test.dart b/packages/api/amplify_api_dart/test/web_socket/web_socket_bloc_test.dart
@@ -336,47 +336,31 @@ void main() {
         bloc = null;
         service = null; // service gets closed in  bloc
       });
-      test(
-        'triggering FailureState on Exception during init',
-        () async {
-          final subscribeEvent = SubscribeEvent(
-            subscriptionRequest,
-            () {
-              service!.channel.sink.add(mockDataString);
-            },
-          );
-
-          final badService = MockWebSocketService(badInit: true);
-          mockNetworkStreamController = StreamController<ConnectivityStatus>();
-          final bloc = WebSocketBloc(
-            config: testApiKeyConfig,
-            authProviderRepo: getTestAuthProviderRepo(),
-            wsService: badService,
-            subscriptionOptions: subscriptionOptions,
-            pollClientOverride: mockPollClient.client,
-            connectivity: const MockConnectivity(),
-          );
-
-          expect(
-            bloc.stream,
-            emitsInOrder(
-              [
-                isA<DisconnectedState>(),
-                isA<ConnectingState>(),
-                isA<FailureState>(),
-                isA<PendingDisconnect>(),
-                isA<DisconnectedState>(),
-              ],
-            ),
-          );
+      test('triggering FailureState on Exception during init', () async {
+        final badService = MockWebSocketService(badInit: true);
+        mockNetworkStreamController = StreamController<ConnectivityStatus>();
+        final bloc = WebSocketBloc(
+          config: testApiKeyConfig,
+          authProviderRepo: getTestAuthProviderRepo(),
+          wsService: badService,
+          subscriptionOptions: subscriptionOptions,
+          pollClientOverride: mockPollClient.client,
+          connectivity: const MockConnectivity(),
+        );
 
-          bloc.subscribe(
-            subscribeEvent,
-          );
-          // TODO(equartey): Fix this test on web
-        },
-        skip: zIsWeb,
-      );
+        expect(
+          bloc.stream,
+          emitsInOrder(
+            [
+              isA<DisconnectedState>(),
+              isA<ConnectingState>(),
+              isA<FailureState>(),
+              isA<PendingDisconnect>(),
+              isA<DisconnectedState>(),
+            ],
+          ),
+        );
+      });
 
       test('Exception from service and should return error to user', () async {
         final subscribeEvent = SubscribeEvent(