Fix test failures for emulator tests (#8044)

Author: schmidt-sebastian

FirebaseStorage/Sources/FIRStorage.m

@@ -43,6 +43,7 @@ @interface FIRStorage () {
   /// Stored Auth reference, if it exists. This needs to be stored for `copyWithZone:`.
   id<FIRAuthInterop> _Nullable _auth;
   id<FIRAppCheckInterop> _Nullable _appCheck;
+  BOOL _usesEmulator;
   NSTimeInterval _maxUploadRetryTime;
   NSTimeInterval _maxDownloadRetryTime;
   NSTimeInterval _maxOperationRetryTime;
@@ -333,6 +334,7 @@ - (void)useEmulatorWithHost:(NSString *)host port:(NSInteger)port {
                        @"reference or trying to load data."];
   }
 
+  _usesEmulator = YES;
   _scheme = @"http";
   _host = host;
   _port = @(port);
@@ -360,6 +362,7 @@ - (void)ensureConfigured {
                                                       bucket:_storageBucket
                                                         auth:_auth
                                                     appCheck:_appCheck];
+    _fetcherServiceForApp.allowLocalhostRequest = _usesEmulator;
   }
 }
 

FirebaseStorage/Tests/Unit/FIRStorageDeleteTests.m

@@ -108,6 +108,7 @@ - (void)testSuccessfulFetchWithEmulator {
       [self expectationWithDescription:@"testSuccessfulFetchWithEmulator"];
 
   [self.storage useEmulatorWithHost:@"localhost" port:8080];
+  self.fetcherService.allowLocalhostRequest = YES;
   self.fetcherService.testBlock =
       [FIRStorageTestHelpers successBlockWithURL:@"http://localhost:8080/v0/b/bucket/o/object"];
 
@@ -117,7 +118,7 @@ - (void)testSuccessfulFetchWithEmulator {
                                                                 fetcherService:self.fetcherService
                                                                  dispatchQueue:self.dispatchQueue
                                                                     completion:^(NSError *error) {
-                                                                      XCTAssertEqual(error, nil);
+                                                                      XCTAssertNil(error);
                                                                       [expectation fulfill];
                                                                     }];
   [task enqueue];

FirebaseStorage/Tests/Unit/FIRStorageGetMetadataTests.m

@@ -116,6 +116,7 @@ - (void)testSuccessfulFetchWithEmulator {
       [self expectationWithDescription:@"testSuccessfulFetchWithEmulator"];
 
   [self.storage useEmulatorWithHost:@"localhost" port:8080];
+  self.fetcherService.allowLocalhostRequest = YES;
   self.fetcherService.testBlock =
       [FIRStorageTestHelpers successBlockWithURL:@"http://localhost:8080/v0/b/bucket/o/object"];
 
@@ -126,6 +127,7 @@ - (void)testSuccessfulFetchWithEmulator {
          fetcherService:self.fetcherService
           dispatchQueue:self.dispatchQueue
              completion:^(FIRStorageMetadata *metadata, NSError *error) {
+               XCTAssertNil(error);
                [expectation fulfill];
              }];
   [task enqueue];

FirebaseStorage/Tests/Unit/FIRStorageListTests.m

@@ -140,6 +140,7 @@ - (void)testDefaultListWithEmulator {
   XCTestExpectation *expectation = [self expectationWithDescription:@"testDefaultListWithEmulator"];
 
   [self.storage useEmulatorWithHost:@"localhost" port:8080];
+  self.fetcherService.allowLocalhostRequest = YES;
   self.fetcherService.testBlock = [FIRStorageTestHelpers
       successBlockWithURL:@"http://localhost:8080/v0/b/bucket/o?prefix=object/&delimiter=/"];
 
@@ -151,6 +152,7 @@ - (void)testDefaultListWithEmulator {
                pageSize:nil
       previousPageToken:nil
              completion:^(FIRStorageListResult *result, NSError *error) {
+               XCTAssertNil(error);
                [expectation fulfill];
              }];
   [task enqueue];

FirebaseStorage/Tests/Unit/FIRStorageTestHelpers.m

@@ -94,8 +94,10 @@ + (GTMSessionFetcherTestBlock)successBlockWithMetadata:(nullable FIRStorageMetad
   return [FIRStorageTestHelpers blockForData:data URL:nil statusCode:200];
 }
 
-+ (GTMSessionFetcherTestBlock)successBlockWithURL:(NSString *)url;
-{ return [FIRStorageTestHelpers blockForData:nil URL:url statusCode:200]; }
++ (GTMSessionFetcherTestBlock)successBlockWithURL:(NSString *)url {
+  NSData *data = [@"{}" dataUsingEncoding:NSUTF8StringEncoding];
+  return [FIRStorageTestHelpers blockForData:data URL:url statusCode:200];
+}
 
 + (GTMSessionFetcherTestBlock)unauthenticatedBlock {
   NSData *data = [kUnauthenticatedResponseString dataUsingEncoding:NSUTF8StringEncoding];