Merge remote-tracking branch 'origin/master' into TransactionOptions

Author: dconeybe

FirebaseFunctions/Tests/ObjCIntegration/FIRIntegrationTests.m

@@ -255,6 +255,7 @@ - (void)testHttpError {
                 completion:^(FIRHTTPSCallableResult *_Nullable result, NSError *_Nullable error) {
                   XCTAssertNotNil(error);
                   XCTAssertEqual(FIRFunctionsErrorCodeInvalidArgument, error.code);
+                  XCTAssertEqualObjects(error.localizedDescription, @"INVALID ARGUMENT");
                   [expectation fulfill];
                 }];
   [self waitForExpectations:@[ expectation ] timeout:10];

FirebaseStorageInternal/Tests/Integration/FIRStorageIntegrationTests.m

@@ -631,26 +631,28 @@ - (void)testUpdateMetadata {
   metadata.contentEncoding = @"gzip";
   metadata.contentLanguage = @"de";
   metadata.contentType = @"content-type-a";
-  metadata.customMetadata = @{@"a" : @"b"};
+  metadata.customMetadata = @{@"a" : @"b", @"y" : @"z"};
 
   [ref updateMetadata:metadata
            completion:^(FIRStorageMetadata *updatedMetadata, NSError *error) {
              XCTAssertNil(error);
              [self assertMetadata:updatedMetadata
                       contentType:@"content-type-a"
-                   customMetadata:@{@"a" : @"b"}];
+                   customMetadata:@{@"a" : @"b", @"y" : @"z"}];
 
              // Update a subset of the metadata using the existing object.
              FIRStorageMetadata *metadata = updatedMetadata;
              metadata.contentType = @"content-type-b";
-             metadata.customMetadata = @{@"a" : @"b", @"c" : @"d"};
+             metadata.customMetadata = @{@"c" : @"d", @"y" : @""};
 
              [ref updateMetadata:metadata
                       completion:^(FIRStorageMetadata *updatedMetadata, NSError *error) {
                         XCTAssertNil(error);
                         [self assertMetadata:updatedMetadata
                                  contentType:@"content-type-b"
-                              customMetadata:@{@"a" : @"b", @"c" : @"d"}];
+
+                              // "a" is now deleted and the empty string for "y" remains.
+                              customMetadata:@{@"c" : @"d", @"y" : @""}];
 
                         // Clear all metadata.
                         FIRStorageMetadata *metadata = updatedMetadata;