Apply modalPresentationStyle and modalTransitionStyle on childWillMov… (#4176)

* Apply modalPresentationStyle and modalTransitionStyle on childWillMoveToParent

* Fixes unit tests

* Fixes flaky unit tests caused by OCMock

lib/ios/RNNBasePresenter.h

@@ -8,6 +8,8 @@
 
 - (void)bindViewController:(UIViewController *)bindedViewController;
 
+- (void)applyOptionsOnInit:(RNNNavigationOptions *)initialOptions;
+
 - (void)applyOptions:(RNNNavigationOptions *)initialOptions;
 
 - (void)applyOptionsOnWillMoveToParentViewController:(RNNNavigationOptions *)options;

lib/ios/RNNBasePresenter.m

@@ -20,6 +20,10 @@
 	[self.bottomTabPresenter bindViewController:bindedViewController];
 }
 
+- (void)applyOptionsOnInit:(RNNNavigationOptions *)initialOptions {
+	
+}
+
 - (void)applyOptionsOnWillMoveToParentViewController:(RNNNavigationOptions *)options {
 	[self.bottomTabPresenter applyOptions:options];
 }

lib/ios/RNNRootViewController.m

@@ -39,6 +39,7 @@
 	self.presenter = presenter;
 	[self.presenter bindViewController:self];
 	self.options = options;
+	[self.presenter applyOptionsOnInit:self.options];
 	
 	self.animator = [[RNNAnimator alloc] initWithTransitionOptions:self.options.customTransition];
 	
@@ -47,7 +48,7 @@
 												 name:RCTJavaScriptWillStartLoadingNotification
 											   object:nil];
 	self.navigationController.delegate = self;
-
+	
 	return self;
 }
 

lib/ios/RNNViewControllerPresenter.m

@@ -17,8 +17,6 @@
 	
 	UIViewController* viewController = self.bindedViewController;
 	[viewController rnn_setBackgroundImage:[options.backgroundImage getWithDefaultValue:nil]];
-	[viewController rnn_setModalPresentationStyle:[RCTConvert UIModalPresentationStyle:[options.modalPresentationStyle getWithDefaultValue:@"fullScreen"]]];
-	[viewController rnn_setModalTransitionStyle:[RCTConvert UIModalTransitionStyle:[options.modalTransitionStyle getWithDefaultValue:@"coverVertical"]]];
 	[viewController rnn_setDrawBehindTopBar:[options.topBar.drawBehind getWithDefaultValue:NO]];
 	[viewController rnn_setNavigationItemTitle:[options.topBar.title.text getWithDefaultValue:nil]];
 	[viewController rnn_setTopBarPrefersLargeTitle:[options.topBar.largeTitle.visible getWithDefaultValue:NO]];
@@ -43,6 +41,14 @@
 	
 }
 
+- (void)applyOptionsOnInit:(RNNNavigationOptions *)options {
+	[super applyOptionsOnInit:options];
+	
+	UIViewController* viewController = self.bindedViewController;
+	[viewController rnn_setModalPresentationStyle:[RCTConvert UIModalPresentationStyle:[options.modalPresentationStyle getWithDefaultValue:@"fullScreen"]]];
+	[viewController rnn_setModalTransitionStyle:[RCTConvert UIModalTransitionStyle:[options.modalTransitionStyle getWithDefaultValue:@"coverVertical"]]];
+}
+
 - (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions {
 	[super mergeOptions:options resolvedOptions:resolvedOptions];
 	

lib/ios/ReactNativeNavigationTests/RNNBottomTabPresenterTest.m

@@ -7,7 +7,8 @@
 
 @property (nonatomic, strong) RNNBottomTabPresenter *uut;
 @property (nonatomic, strong) RNNNavigationOptions *options;
-@property (nonatomic, strong) id bindedViewController;
+@property (nonatomic, strong) UIViewController* bindedViewController;
+@property (nonatomic, strong) id mockBindedViewController;
 
 @end
 
@@ -16,104 +17,45 @@
 - (void)setUp {
     [super setUp];
     self.uut = [[RNNBottomTabPresenter alloc] init];
-    self.bindedViewController = [OCMockObject partialMockForObject:[UIViewController new]];
-    [self.uut bindViewController:self.bindedViewController];
+	self.bindedViewController = [UIViewController new];
+    self.mockBindedViewController = [OCMockObject partialMockForObject:self.bindedViewController];
+    [self.uut bindViewController:self.mockBindedViewController];
     self.options = [[RNNNavigationOptions alloc] initEmptyOptions];
 }
 
+- (void)tearDown {
+	[super tearDown];
+	[self.mockBindedViewController stopMocking];
+	self.bindedViewController = nil;
+}
+
 - (void)testApplyOptions_shouldSetTabBarItemBadgeWithDefaultWhenParentIsUITabBarController {
-	UITabBarController* tabBarController = [[UITabBarController alloc] init];
-	[tabBarController setViewControllers:@[self.bindedViewController]];
-	[[self.bindedViewController expect] rnn_setTabBarItemBadge:nil];
+	OCMStub([self.mockBindedViewController parentViewController]).andReturn([UITabBarController new]);
+	[[self.mockBindedViewController expect] rnn_setTabBarItemBadge:nil];
 	[self.uut applyOptions:self.options];
-	[self.bindedViewController verify];
+	[self.mockBindedViewController verify];
 }
 
 - (void)testApplyOptions_shouldSetTabBarItemBadgeOnlyWhenParentIsUITabBarController {
-	[[self.bindedViewController reject] rnn_setTabBarItemBadge:[OCMArg any]];
+	[[self.mockBindedViewController reject] rnn_setTabBarItemBadge:[OCMArg any]];
 	[self.uut applyOptions:self.options];
-	[self.bindedViewController verify];
+	[self.mockBindedViewController verify];
 }
 
 - (void)testApplyOptions_shouldSetTabBarItemBadgeWithValue {
-	UITabBarController* tabBarController = [[UITabBarController alloc] init];
-	[tabBarController setViewControllers:@[self.bindedViewController]];
+	OCMStub([self.mockBindedViewController parentViewController]).andReturn([UITabBarController new]);
 	self.options.bottomTab.badge = [[Text alloc] initWithValue:@"badge"];
-	[[self.bindedViewController expect] rnn_setTabBarItemBadge:@"badge"];
+	[[self.mockBindedViewController expect] rnn_setTabBarItemBadge:@"badge"];
 	[self.uut applyOptions:self.options];
-	[self.bindedViewController verify];
+	[self.mockBindedViewController verify];
 }
 
 - (void)testApplyOptions_setTabBarItemBadgeShouldNotCalledOnUITabBarController {
-	self.bindedViewController = [OCMockObject partialMockForObject:[UITabBarController new]];
-	[self.uut bindViewController:self.bindedViewController];
+	[self.uut bindViewController:self.mockBindedViewController];
 	self.options.bottomTab.badge = [[Text alloc] initWithValue:@"badge"];
-	[[self.bindedViewController reject] rnn_setTabBarItemBadge:@"badge"];
+	[[self.mockBindedViewController reject] rnn_setTabBarItemBadge:@"badge"];
 	[self.uut applyOptions:self.options];
-	[self.bindedViewController verify];
+	[self.mockBindedViewController verify];
 }
 
-//- (void)test_tabBarTextFontFamily_validFont {
-//	UIViewController* viewController = [UIViewController new];
-//
-//	NSString* inputFont = @"HelveticaNeue";
-//	UIFont* expectedFont = [UIFont fontWithName:inputFont size:10];
-//
-//	self.uut.fontFamily = inputFont;
-//	self.uut.text = @"Tab 1";
-//
-//	[self.uut rnn_set];
-//
-//	NSDictionary* attributes = [viewController.tabBarItem titleTextAttributesForState:UIControlStateNormal];
-//	XCTAssertTrue([attributes[@"NSFont"] isEqual:expectedFont]);
-//}
-
-//- (void)test_tabBarTextFontSize_withoutTextFontFamily_withoutTextColor {
-//	UIViewController* viewController = [UIViewController new];
-//
-//	UIFont* expectedFont = [UIFont systemFontOfSize:15];
-//
-//	self.uut.fontSize = @(15);
-//	self.uut.text = @"Tab 1";
-//
-//	[self.uut applyOn:viewController];
-//
-//	NSDictionary* attributes = [viewController.tabBarItem titleTextAttributesForState:UIControlStateNormal];
-//	XCTAssertTrue([attributes[@"NSFont"] isEqual:expectedFont]);
-//}
-//
-//- (void)test_tabBarTextFontSize_withoutTextFontFamily {
-//	UIViewController* viewController = [UIViewController new];
-//
-//	UIFont* expectedFont = [UIFont systemFontOfSize:15];
-//
-//	self.uut.fontSize = @(15);
-//	self.uut.text = @"Tab 1";
-//
-//	[self.uut applyOn:viewController];
-//
-//	NSDictionary* attributes = [viewController.tabBarItem titleTextAttributesForState:UIControlStateNormal];
-//	XCTAssertTrue([attributes[@"NSFont"] isEqual:expectedFont]);
-//}
-//
-//- (void)test_tabBarTextFontSize_withTextFontFamily_withTextColor {
-//	UIViewController* viewController = [UIViewController new];
-//
-//	NSString* inputFont = @"HelveticaNeue";
-//	UIFont* expectedFont = [UIFont fontWithName:inputFont size:15];
-//
-//	self.uut.fontSize = @(15);
-//	self.uut.text = @"Tab 1";
-//	self.uut.fontFamily = inputFont;
-//	self.uut.textColor = @(4279979127);
-//	[self.uut applyOn:viewController];
-//
-//	NSDictionary* attributes = [viewController.tabBarItem titleTextAttributesForState:UIControlStateNormal];
-//	UIColor* color = attributes[NSForegroundColorAttributeName];
-//	UIColor* expectedColor = [RCTConvert UIColor:@(4279979127)];
-//
-//	XCTAssertTrue([color isEqual:expectedColor]);
-//	XCTAssertTrue([attributes[@"NSFont"] isEqual:expectedFont]);
-//}
-
 @end

lib/ios/ReactNativeNavigationTests/RNNTabBarControllerTest.m

@@ -3,11 +3,15 @@
 #import "RNNNavigationOptions.h"
 #import "RNNTabBarPresenter.h"
 #import "RNNRootViewController.h"
+#import "RNNNavigationController.h"
 #import <OCMock/OCMock.h>
 
 @interface RNNTabBarControllerTest : XCTestCase
 
-@property (nonatomic, strong) RNNTabBarController *uut;
+@property (nonatomic, strong) id mockUut;
+@property (nonatomic, strong) id mockChildViewController;
+@property (nonatomic, strong) id mockEventEmmiter;
+@property (nonatomic, strong) id mockTabBarPresenter;
 
 @end
 
@@ -16,19 +20,26 @@
 - (void)setUp {
 	[super setUp];
 	
-	self.uut = [[RNNTabBarController alloc] initWithLayoutInfo:nil childViewControllers:@[[[UIViewController alloc] init]] options:[[RNNNavigationOptions alloc] initWithDict:@{}] presenter:[[RNNViewControllerPresenter alloc] init]];
+	id tabBarClassMock = OCMClassMock([RNNTabBarController class]);
+	OCMStub([tabBarClassMock parentViewController]).andReturn([OCMockObject partialMockForObject:[RNNTabBarController new]]);
+
+	self.mockTabBarPresenter = [OCMockObject partialMockForObject:[[RNNTabBarPresenter alloc] init]];
+	self.mockChildViewController = [OCMockObject partialMockForObject:[RNNRootViewController new]];
+	self.mockEventEmmiter = [OCMockObject partialMockForObject:[RNNEventEmitter new]];
+	self.mockUut = [OCMockObject partialMockForObject:[[RNNTabBarController alloc] initWithLayoutInfo:nil childViewControllers:@[[[UIViewController alloc] init]] options:[[RNNNavigationOptions alloc] initWithDict:@{}] presenter:self.mockTabBarPresenter eventEmitter:self.mockEventEmmiter]];
+	OCMStub([self.mockUut selectedViewController]).andReturn(self.mockChildViewController);
 }
 
 - (void)testInitWithLayoutInfo_shouldBindPresenter {
-	XCTAssertNotNil(self.uut.presenter);
+	XCTAssertNotNil([self.mockUut presenter]);
 }
 
 - (void)testInitWithLayoutInfo_shouldSetMultipleViewControllers {
 	UIViewController* vc1 = [[UIViewController alloc] init];
 	UIViewController* vc2 = [[UIViewController alloc] init];
 	
-	self.uut = [[RNNTabBarController alloc] initWithLayoutInfo:nil childViewControllers:@[vc1, vc2] options:[[RNNNavigationOptions alloc] initWithDict:@{}] presenter:[[RNNViewControllerPresenter alloc] init]];
-	XCTAssertTrue(self.uut.viewControllers.count == 2);
+	RNNTabBarController* uut = [[RNNTabBarController alloc] initWithLayoutInfo:nil childViewControllers:@[vc1, vc2] options:[[RNNNavigationOptions alloc] initWithDict:@{}] presenter:[[RNNViewControllerPresenter alloc] init]];
+	XCTAssertTrue(uut.viewControllers.count == 2);
 }
 
 - (void)testInitWithLayoutInfo_shouldInitializeDependencies {
@@ -37,11 +48,11 @@
 	RNNTabBarPresenter* presenter = [[RNNTabBarPresenter alloc] init];
 	NSArray* childViewControllers = @[[UIViewController new]];
 	
-	self.uut = [[RNNTabBarController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options presenter:presenter];
-	XCTAssertTrue(self.uut.layoutInfo == layoutInfo);
-	XCTAssertTrue(self.uut.options == options);
-	XCTAssertTrue(self.uut.presenter == presenter);
-	XCTAssertTrue(self.uut.childViewControllers.count == childViewControllers.count);
+	RNNTabBarController* uut = [[RNNTabBarController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options presenter:presenter];
+	XCTAssertTrue(uut.layoutInfo == layoutInfo);
+	XCTAssertTrue(uut.options == options);
+	XCTAssertTrue(uut.presenter == presenter);
+	XCTAssertTrue(uut.childViewControllers.count == childViewControllers.count);
 }
 
 - (void)testInitWithEventEmmiter_shouldInitializeDependencies {
@@ -52,134 +63,97 @@
 
 	NSArray* childViewControllers = @[[UIViewController new]];
 	
-	self.uut = [[RNNTabBarController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options presenter:presenter eventEmitter:eventEmmiter];
-	XCTAssertTrue(self.uut.layoutInfo == layoutInfo);
-	XCTAssertTrue(self.uut.options == options);
-	XCTAssertTrue(self.uut.presenter == presenter);
-	XCTAssertTrue(self.uut.childViewControllers.count == childViewControllers.count);
-	XCTAssertTrue(self.uut.eventEmitter == eventEmmiter);
+	RNNTabBarController* uut = [[RNNTabBarController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options presenter:presenter eventEmitter:eventEmmiter];
+	XCTAssertTrue(uut.layoutInfo == layoutInfo);
+	XCTAssertTrue(uut.options == options);
+	XCTAssertTrue(uut.presenter == presenter);
+	XCTAssertTrue(uut.childViewControllers.count == childViewControllers.count);
+	XCTAssertTrue(uut.eventEmitter == eventEmmiter);
 }
 
 - (void)testInitWithLayoutInfo_shouldSetDelegate {
-	self.uut = [[RNNTabBarController alloc] initWithLayoutInfo:nil childViewControllers:nil options:[[RNNNavigationOptions alloc] initWithDict:@{}] presenter:[[RNNViewControllerPresenter alloc] init]];
+	RNNTabBarController* uut = [[RNNTabBarController alloc] initWithLayoutInfo:nil childViewControllers:nil options:[[RNNNavigationOptions alloc] initWithDict:@{}] presenter:[[RNNViewControllerPresenter alloc] init]];
 	
-	XCTAssertTrue(self.uut.delegate == self.uut);
+	XCTAssertTrue(uut.delegate == uut);
 }
 
 - (void)testWillMoveToParent_invokePresenterApplyOptionsOnWillMoveToParent {
-	id presenterMock = [OCMockObject partialMockForObject:[RNNTabBarPresenter new]];
-	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:@{}];
-	self.uut = [[RNNTabBarController alloc] initWithLayoutInfo:nil childViewControllers:nil options:options presenter:presenterMock];
-
-	[[presenterMock expect] applyOptionsOnWillMoveToParentViewController:options];
-	[self.uut willMoveToParentViewController:[UIViewController new]];
-	[presenterMock verify];
+	[[self.mockTabBarPresenter expect] applyOptionsOnWillMoveToParentViewController:[(RNNTabBarController *)self.mockUut options]];
+	[self.mockUut willMoveToParentViewController:[UIViewController new]];
+	[self.mockTabBarPresenter verify];
 }
 
 - (void)testWillMoveToParent_shouldNotInvokePresenterApplyOptionsOnWillMoveToNilParent {
-	id presenterMock = [OCMockObject partialMockForObject:[RNNTabBarPresenter new]];
-	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:@{}];
-	self.uut = [[RNNTabBarController alloc] initWithLayoutInfo:nil childViewControllers:nil options:options presenter:presenterMock];
-	
-	[[presenterMock reject] applyOptionsOnWillMoveToParentViewController:options];
-	[self.uut willMoveToParentViewController:nil];
-	[presenterMock verify];
+	[[self.mockTabBarPresenter reject] applyOptionsOnWillMoveToParentViewController:[(RNNTabBarController *)self.mockUut options]];
+	[self.mockUut willMoveToParentViewController:nil];
+	[self.mockTabBarPresenter verify];
 }
 
 - (void)testOnChildAppear_shouldInvokePresenterApplyOptionsWithResolvedOptions {
-	id presenterMock = [OCMockObject partialMockForObject:[RNNTabBarPresenter new]];
-	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:@{}];
-	RNNTabBarController* uut = [[RNNTabBarController alloc] initWithLayoutInfo:nil childViewControllers:nil options:options presenter:presenterMock];
-	
-	[[presenterMock expect] applyOptions:[OCMArg any]];
-	[uut onChildWillAppear];
-	[presenterMock verify];
+	[[self.mockTabBarPresenter expect] applyOptions:[OCMArg any]];
+	[self.mockUut onChildWillAppear];
+	[self.mockTabBarPresenter verify];
 }
 
 - (void)testMergeOptions_shouldInvokePresenterMergeOptions {
-	id presenterMock = [OCMockObject partialMockForObject:[RNNTabBarPresenter new]];
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:@{}];
-	RNNTabBarController* uut = [[RNNTabBarController alloc] initWithLayoutInfo:nil childViewControllers:nil options:options presenter:presenterMock];
 	
-	[(RNNTabBarPresenter *)[presenterMock expect] mergeOptions:options resolvedOptions:nil];
-	[uut mergeOptions:options];
-	[presenterMock verify];
+	[(RNNTabBarPresenter *)[self.mockTabBarPresenter expect] mergeOptions:options resolvedOptions:nil];
+	[(RNNTabBarController *)self.mockUut mergeOptions:options];
+	[self.mockTabBarPresenter verify];
 }
 
 - (void)testMergeOptions_shouldInvokeParentMergeOptions {
-	id parentMock = [OCMockObject partialMockForObject:[RNNTabBarController new]];
+	id parentMock = [OCMockObject partialMockForObject:[RNNRootViewController new]];
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:@{}];
-	RNNTabBarController* uut = [[RNNTabBarController alloc] initWithLayoutInfo:nil childViewControllers:nil options:options presenter:[RNNTabBarPresenter new]];
-	[parentMock addChildViewController:uut];
-	
-	[(RNNTabBarController *)[parentMock expect] mergeOptions:options];
-	[uut mergeOptions:options];
+
+	OCMStub([self.mockUut parentViewController]).andReturn(parentMock);
+	[((RNNRootViewController *)[parentMock expect]) mergeOptions:options];
+	[(RNNTabBarController *)self.mockUut mergeOptions:options];
 	[parentMock verify];
 }
 
 - (void)testOnChildAppear_shouldInvokeParentOnChildAppear {
-	id parentMock = [OCMockObject partialMockForObject:[RNNTabBarController new]];
-	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:@{}];
-	RNNTabBarController* uut = [[RNNTabBarController alloc] initWithLayoutInfo:nil childViewControllers:nil options:options presenter:[RNNTabBarPresenter new]];
-	[parentMock addChildViewController:uut];
+	id parentMock = [OCMockObject partialMockForObject:[RNNNavigationController new]];
+
+	OCMStub([self.mockUut parentViewController]).andReturn(parentMock);
 	
 	[[parentMock expect] onChildWillAppear];
-	[uut onChildWillAppear];
+	[self.mockUut onChildWillAppear];
 	[parentMock verify];
 }
 
 - (void)testGetCurrentChild_shouldInvokeSelectedViewControllerGetCurrentChild {
-	id childMock = [OCMockObject partialMockForObject:[RNNRootViewController new]];
-	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:@{}];
-	RNNTabBarController* uut = [[RNNTabBarController alloc] initWithLayoutInfo:nil childViewControllers:@[childMock] options:options presenter:[RNNTabBarPresenter new]];
-	
-	[[childMock expect] getCurrentChild];
-	[uut getCurrentChild];
-	[childMock verify];
+	[[self.mockChildViewController expect] getCurrentChild];
+	[self.mockUut getCurrentChild];
+	[self.mockChildViewController verify];
 }
 
 - (void)testGetCurrentChild_shouldInvokeOnSelectedViewController {
-	id childMock = [OCMockObject partialMockForObject:[RNNRootViewController new]];
-	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:@{}];
-	RNNTabBarController* uut = [[RNNTabBarController alloc] initWithLayoutInfo:nil childViewControllers:@[[UIViewController new], childMock] options:options presenter:[RNNTabBarPresenter new]];
-	[uut setSelectedIndex:1];
-	
-	[[childMock expect] getCurrentChild];
-	[uut getCurrentChild];
-	[childMock verify];
+	[[self.mockChildViewController expect] getCurrentChild];
+	[self.mockUut getCurrentChild];
+	[self.mockChildViewController verify];
 }
 
 - (void)testPreferredStatusBarStyle_shouldInvokeSelectedViewControllerPreferredStatusBarStyle {
-	id childMock = [OCMockObject partialMockForObject:[RNNRootViewController new]];
-	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:@{}];
-	RNNTabBarController* uut = [[RNNTabBarController alloc] initWithLayoutInfo:nil childViewControllers:@[childMock] options:options presenter:[RNNTabBarPresenter new]];
-	
-	[[childMock expect] preferredStatusBarStyle];
-	[uut preferredStatusBarStyle];
-	[childMock verify];
+	[[self.mockChildViewController expect] preferredStatusBarStyle];
+	[self.mockUut preferredStatusBarStyle];
+	[self.mockChildViewController verify];
 }
 
 - (void)testPreferredStatusBarStyle_shouldInvokeOnSelectedViewController {
-	id childMock = [OCMockObject partialMockForObject:[RNNRootViewController new]];
-	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:@{}];
-	RNNTabBarController* uut = [[RNNTabBarController alloc] initWithLayoutInfo:nil childViewControllers:@[[UIViewController new], childMock] options:options presenter:[RNNTabBarPresenter new]];
-	[uut setSelectedIndex:1];
-	
-	[[childMock expect] preferredStatusBarStyle];
-	[uut preferredStatusBarStyle];
-	[childMock verify];
+	[[self.mockChildViewController expect] preferredStatusBarStyle];
+	[self.mockUut preferredStatusBarStyle];
+	[self.mockChildViewController verify];
 }
 
 - (void)testTabBarControllerDidSelectViewControllerDelegate_shouldInvokeSendBottomTabSelectedEvent {
-	id eventEmmiterMock = [OCMockObject partialMockForObject:[RNNEventEmitter new]];
-	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:@{}];
-	UIViewController* vc = [UIViewController new];
-	UIViewController* vc2 = [UIViewController new];
-	RNNTabBarController* uut = [[RNNTabBarController alloc] initWithLayoutInfo:nil childViewControllers:@[vc, vc2] options:options presenter:[RNNTabBarPresenter new] eventEmitter:eventEmmiterMock];
-	[uut setSelectedIndex:1];
-	[[eventEmmiterMock expect] sendBottomTabSelected:[OCMArg any] unselected:[OCMArg any]];
-	[uut tabBarController:uut didSelectViewController:vc2];
-	[eventEmmiterMock verify];
+	NSUInteger selectedIndex = 2;
+	OCMStub([self.mockUut selectedIndex]).andReturn(selectedIndex);
+
+	[[self.mockEventEmmiter expect] sendBottomTabSelected:@(selectedIndex) unselected:@(0)];
+	[self.mockUut tabBarController:self.mockUut didSelectViewController:[UIViewController new]];
+	[self.mockEventEmmiter verify];
 }
 
 - (void)testSetSelectedIndexByComponentID_ShouldSetSelectedIndexWithCorrectIndex {

lib/ios/ReactNativeNavigationTests/RNNViewControllerPresenterTest.m

@@ -59,4 +59,30 @@
 	[(id)self.bindedViewController verify];
 }
 
+- (void)testApplyOptionsOnInit_shouldSetModalPresentetionStyleWithDefault {
+	[[(id)self.bindedViewController expect] rnn_setModalPresentationStyle:UIModalPresentationFullScreen];
+	[self.uut applyOptionsOnInit:self.options];
+	[(id)self.bindedViewController verify];
+}
+
+- (void)testApplyOptionsOnInit_shouldSetModalTransitionStyleWithDefault {
+	[[(id)self.bindedViewController expect] rnn_setModalTransitionStyle:UIModalTransitionStyleCoverVertical];
+	[self.uut applyOptionsOnInit:self.options];
+	[(id)self.bindedViewController verify];
+}
+
+- (void)testApplyOptionsOnInit_shouldSetModalPresentetionStyleWithValue {
+	self.options.modalPresentationStyle = [[Text alloc] initWithValue:@"overCurrentContext"];
+	[[(id)self.bindedViewController expect] rnn_setModalPresentationStyle:UIModalPresentationOverCurrentContext];
+	[self.uut applyOptionsOnInit:self.options];
+	[(id)self.bindedViewController verify];
+}
+
+- (void)testApplyOptionsOnInit_shouldSetModalTransitionStyleWithValue {
+	self.options.modalTransitionStyle = [[Text alloc] initWithValue:@"crossDissolve"];
+	[[(id)self.bindedViewController expect] rnn_setModalTransitionStyle:UIModalTransitionStyleCrossDissolve];
+	[self.uut applyOptionsOnInit:self.options];
+	[(id)self.bindedViewController verify];
+}
+
 @end