Fix setting of in-app message type in FIRInAppMessagingImageOnlyDisplay initializer (#8118)

* Fix message type in ImageOnlyMessage initializer

* Update CHANGELOG

Author: christibbs

FirebaseInAppMessaging/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 2021-6 -- v.8.1.0
+- [fixed] Fixed bug where image-only messages had the wrong message type in message callbacks (#8081).
+
 # 2021-4 -- v.7.11.0
 - [fixed] Fixed SPM resource inclusion for in-app messages (#7715).
 

FirebaseInAppMessaging/Sources/RenderingObjects/FIRInAppMessagingRenderingDataClasses.m

@@ -269,7 +269,7 @@ - (instancetype)initWithMessageID:(NSString *)messageID
                          campaignName:campaignName
                     experimentPayload:experimentPayload
                   renderAsTestMessage:renderAsTestMessage
-                          messageType:FIRInAppMessagingDisplayMessageTypeModal
+                          messageType:FIRInAppMessagingDisplayMessageTypeImageOnly
                           triggerType:triggerType
                               appData:appData]) {
     _imageData = imageData;

FirebaseInAppMessaging/Tests/Unit/FIRIAMDisplayExecutorTests.m

@@ -423,7 +423,7 @@ - (void)setupMessageTexture {
 
   FIRIAMRenderingEffectSetting *renderSetting6 =
       [FIRIAMRenderingEffectSetting getDefaultRenderingEffectSetting];
-  renderSetting6.viewMode = FIRIAMRenderAsBannerView;
+  renderSetting6.viewMode = FIRIAMRenderAsCardView;
 
   FIRIAMMessageRenderData *renderData6 =
       [[FIRIAMMessageRenderData alloc] initWithMessageID:@"m6"
@@ -1153,4 +1153,41 @@ - (void)testMessageWithExperimentPayload {
                               triggerType:FIRInAppMessagingDisplayTriggerTypeOnAppForeground];
   XCTAssertNotNil(displayMessage.campaignInfo.experimentPayload);
 }
+
+- (void)testMessageDisplayTypes {
+  FIRInAppMessagingImageData *imageData =
+      [[FIRInAppMessagingImageData alloc] initWithImageURL:@"https://www.google.com"
+                                                 imageData:[NSData data]];
+  FIRInAppMessagingDisplayTriggerType analyticsTriggerType =
+      FIRInAppMessagingDisplayTriggerTypeOnAnalyticsEvent;
+
+  FIRInAppMessagingDisplayMessage *bannerMessage =
+      [self.displayExecutor displayMessageWithMessageDefinition:self.m1
+                                                      imageData:imageData
+                                             landscapeImageData:nil
+                                                    triggerType:analyticsTriggerType];
+
+  FIRInAppMessagingDisplayMessage *imageOnlyMessage =
+      [self.displayExecutor displayMessageWithMessageDefinition:self.m3
+                                                      imageData:imageData
+                                             landscapeImageData:nil
+                                                    triggerType:analyticsTriggerType];
+
+  FIRInAppMessagingDisplayMessage *modalMessage =
+      [self.displayExecutor displayMessageWithMessageDefinition:self.m2
+                                                      imageData:imageData
+                                             landscapeImageData:nil
+                                                    triggerType:analyticsTriggerType];
+
+  FIRInAppMessagingDisplayMessage *cardMessage =
+      [self.displayExecutor displayMessageWithMessageDefinition:self.m6
+                                                      imageData:imageData
+                                             landscapeImageData:nil
+                                                    triggerType:analyticsTriggerType];
+
+  XCTAssertEqual(bannerMessage.type, FIRInAppMessagingDisplayMessageTypeBanner);
+  XCTAssertEqual(imageOnlyMessage.type, FIRInAppMessagingDisplayMessageTypeImageOnly);
+  XCTAssertEqual(modalMessage.type, FIRInAppMessagingDisplayMessageTypeModal);
+  XCTAssertEqual(cardMessage.type, FIRInAppMessagingDisplayMessageTypeCard);
+}
 @end