test updates to aline with iOS 18

Author: markdevocht

playground/ios/NavigationTests/BottomTabsControllerTest.mm

@@ -104,7 +104,11 @@ - (void)testInitWithLayoutInfo_shouldCreateWithDefaultStyles {
                 eventEmitter:nil
         childViewControllers:nil];
 
-    XCTAssertEqual(uut.modalPresentationStyle, UIModalPresentationPageSheet);
+	if (@available(iOS 18.0, *)) {
+		XCTAssertEqual(uut.modalPresentationStyle, UIModalPresentationFormSheet);
+	} else {
+		XCTAssertEqual(uut.modalPresentationStyle, UIModalPresentationPageSheet);
+	}
     XCTAssertEqual(uut.modalTransitionStyle, UIModalTransitionStyleCoverVertical);
 }
 

playground/ios/NavigationTests/RNNModalManagerTest.mm

@@ -172,7 +172,11 @@ - (void)testPresentationControllerDidDismiss_ShouldInvokeDelegateDismissedModalW
 - (void)testApplyOptionsOnInit_shouldShowModalWithDefaultPresentationStyle {
 	_vc1.options = [RNNNavigationOptions emptyOptions];
 	[_modalManager showModal:_vc1 animated:NO completion:nil];
-	XCTAssertEqual(_vc1.modalPresentationStyle, UIModalPresentationPageSheet);
+	if (@available(iOS 18.0, *)) {
+		XCTAssertEqual(_vc1.modalPresentationStyle, UIModalPresentationFormSheet);
+	} else {
+		XCTAssertEqual(_vc1.modalPresentationStyle, UIModalPresentationPageSheet);
+	}
 }
 
 - (void)testApplyOptionsOnInit_shouldShowModalWithDefaultTransitionStyle {

playground/ios/NavigationTests/RNNStackControllerTest.mm

@@ -233,16 +233,19 @@ - (void)testMergeChildOptionsShouldNotUpdatePresenterForInvisibleChild {
 }
 
 - (void)testOnChildWillAppear_shouldSetBackButtonTestID {
-    RNNNavigationOptions *options = [RNNNavigationOptions emptyOptions];
-    options.topBar.backButton.testID = [Text withValue:@"TestID"];
-    RNNComponentViewController *pushedController =
-        [RNNComponentViewController createWithComponentId:@"pushedController"];
-    pushedController.options.topBar.backButton.testID = [Text withValue:@"TestID"];
+	RNNComponentViewController *pushedController =
+	[RNNComponentViewController createWithComponentId:@"pushedController"];
+	pushedController.options.topBar.backButton.testID = [Text withValue:@"TestID"];
 	UIApplication.sharedApplication.keyWindow.rootViewController = _uut;
     [_uut pushViewController:pushedController animated:NO];
-    [pushedController viewDidAppear:YES];
-    XCTAssertTrue([[[_uut.navigationBar.subviews[1] subviews][0]
-        valueForKey:@"accessibilityIdentifier"] isEqualToString:@"TestID"]);
+	[pushedController viewDidAppear:YES];
+	dispatch_async(dispatch_get_main_queue(), ^{
+		UIView *navigationBarContentView = [self->_uut.navigationBar findChildByClass:NSClassFromString(@"_UINavigationBarContentView")];
+		XCTAssertNotNil(navigationBarContentView);
+		UIView *barButton = [navigationBarContentView findChildByClass:NSClassFromString(@"_UIButtonBarButton")];
+		XCTAssertNotNil(barButton);
+		XCTAssertTrue([barButton.accessibilityIdentifier isEqualToString:@"TestID"]);
+	});
 }
 
 - (RNNStackController *)createNavigationControllerWithOptions:(RNNNavigationOptions *)options {

playground/ios/NavigationTests/UIViewController+LayoutProtocolTest.mm

@@ -37,7 +37,11 @@ - (void)testInitWithLayoutApplyDefaultOptions {
                                                      presenter:presenter
                                                   eventEmitter:nil
                                           childViewControllers:nil];
-    XCTAssertEqual(uut.modalPresentationStyle, UIModalPresentationPageSheet);
+    if (@available(iOS 18.0, *)) {
+        XCTAssertEqual(uut.modalPresentationStyle, UIModalPresentationFormSheet);
+    } else {
+        XCTAssertEqual(uut.modalPresentationStyle, UIModalPresentationPageSheet);
+    }
 }
 
 - (void)testInitWithLayoutInfoShouldSetChildViewControllers {