Fixing tests

Author: schmidt-sebastian

Firestore/Source/Remote/FSTStream.m

@@ -381,17 +381,18 @@ - (void)closeWithFinalState:(FSTStreamState)finalState error:(nullable NSError *
   _messageReceived = NO;
   _rpc = nil;
 
-  // Clear the delegates to avoid any possible bleed through of events from GRPC.
   FSTAssert(_delegate,
             @"closeWithFinalState should only be called for a started stream that has an active "
             @"delegate.");
-  _delegate = nil;
 
   // If the caller explicitly requested a stream stop, don't notify them of a closing stream (it
   // could trigger undesirable recovery logic, etc.).
   if (finalState != FSTStreamStateStopped) {
     [self notifyStreamInterruptedWithError:error];
   }
+
+  // Clear the delegates to avoid any possible bleed through of events from GRPC.
+  _delegate = nil;
 }
 
 - (void)stop {
@@ -615,7 +616,9 @@ - (void)notifyStreamOpen {
 }
 
 - (void)notifyStreamInterruptedWithError:(nullable NSError *)error {
-  [self.delegate watchStreamWasInterruptedWithError:error];
+  id<FSTWatchStreamDelegate> delegate = self.delegate;
+  self.delegate = nil;
+  [delegate watchStreamWasInterruptedWithError:error];
 }
 
 - (void)watchQuery:(FSTQueryData *)query {
@@ -701,7 +704,9 @@ - (void)notifyStreamOpen {
 }
 
 - (void)notifyStreamInterruptedWithError:(nullable NSError *)error {
-  [self.delegate writeStreamWasInterruptedWithError:error];
+  id<FSTWriteStreamDelegate> delegate = self.delegate;
+  self.delegate = nil;
+  [delegate writeStreamWasInterruptedWithError:error];
 }
 
 - (void)tearDown {