1010#import " RNNLayoutManager.h"
1111#import " RNNBottomTabsController.h"
1212#import " BottomTabsAttachModeFactory.h"
13-
14- @interface MockUIApplication : NSObject
15-
16- -(UIWindow *)keyWindow ;
17-
18- @end
19-
20- @implementation MockUIApplication
21-
22- - (UIWindow *)keyWindow {
23- return [UIWindow new ];
24- }
25-
26- @end
13+ #import < ReactNativeNavigation/BottomTabPresenterCreator.h>
14+ #import " RNNComponentViewController+Utils.h"
2715
2816@interface MockUINavigationController : RNNStackController
2917@property (nonatomic , strong ) NSArray * willReturnVCs;
@@ -62,7 +50,6 @@ @implementation RNNCommandsHandlerTest
6250
6351- (void )setUp {
6452 [super setUp ];
65- self.sharedApplication = [OCMockObject mockForClass: [UIApplication class ]];
6653 self.creator = [OCMockObject partialMockForObject: [RNNTestRootViewCreator new ]];
6754 self.mainWindow = [OCMockObject partialMockForObject: [UIWindow new ]];
6855 self.eventEmmiter = [OCMockObject partialMockForObject: [RNNEventEmitter new ]];
@@ -75,7 +62,12 @@ - (void)setUp {
7562 self.vc3 = [self generateComponentWithComponentId: @" 3"
7663 _nvc = [[MockUINavigationController alloc ] init ];
7764 [_nvc setViewControllers: @[self .vc1, self .vc2, self .vc3]];
78- OCMStub ([self .sharedApplication keyWindow ]).andReturn (self.mainWindow );
65+
66+ UIApplication* sharedApplication = [OCMockObject niceMockForClass: [UIApplication class ]];
67+ id mockedApplicationClass = OCMClassMock ([UIApplication class ]);
68+ OCMStub (ClassMethod ([mockedApplicationClass sharedApplication ])).andReturn (sharedApplication);
69+ OCMStub (sharedApplication.keyWindow ).andReturn (self.mainWindow );
70+ OCMStub ([sharedApplication windows ]).andReturn (@[self .mainWindow]);
7971}
8072
8173- (RNNComponentViewController *)generateComponentWithComponentId : (NSString *)componentId {
@@ -129,14 +121,11 @@ - (NSArray*)getPublicMethodNamesForObject:(NSObject*)obj {
129121-(void )testDynamicStylesMergeWithStaticStyles {
130122 RNNNavigationOptions* initialOptions = [[RNNNavigationOptions alloc ] initWithDict: @{}];
131123 initialOptions.topBar .title .text = [[Text alloc ] initWithValue: @" the title"
132- RNNLayoutInfo* layoutInfo = [RNNLayoutInfo new ];
133124 RNNTestRootViewCreator* creator = [[RNNTestRootViewCreator alloc ] init ];
134-
135- RNNComponentPresenter* presenter = [[RNNComponentPresenter alloc ] initWithComponentRegistry: nil defaultOptions: nil ];
136- RNNComponentViewController* vc = [[RNNComponentViewController alloc ] initWithLayoutInfo: layoutInfo rootViewCreator: creator eventEmitter: nil presenter: presenter options: initialOptions defaultOptions: nil ];
125+ RNNComponentViewController* vc = [RNNComponentViewController createWithComponentId: @" componentId" initialOptions: initialOptions];
137126
138127 RNNStackController* nav = [[RNNStackController alloc ] initWithLayoutInfo: nil creator: creator options: [[RNNNavigationOptions alloc ] initEmptyOptions ] defaultOptions: nil presenter: [[RNNStackPresenter alloc ] init ] eventEmitter: nil childViewControllers: @[vc]];
139-
128+ [ self .mainWindow setRootViewController: nav];
140129 [vc viewWillAppear: false ];
141130 XCTAssertTrue ([vc.navigationItem.title isEqual: @" the title"
142131
@@ -146,9 +135,11 @@ -(void)testDynamicStylesMergeWithStaticStyles {
146135 UIColor* expectedColor = [UIColor colorWithRed: 1 green: 0 blue: 0 alpha: 1 ];
147136
148137 [self .uut mergeOptions: @" componentId" options: dictFromJs completion: ^{
149- XCTAssertTrue ([vc.navigationItem.title isEqual: @" the title"
150- XCTAssertTrue ([nav.navigationBar.barTintColor isEqual: expectedColor]);
138+
151139 }];
140+
141+ XCTAssertTrue ([vc.navigationItem.title isEqual: @" the title"
142+ XCTAssertTrue ([vc.navigationItem.standardAppearance.backgroundColor isEqual: expectedColor]);
152143}
153144
154145- (void )testMergeOptions_shouldOverrideOptions {
@@ -420,6 +411,34 @@ - (void)testSetRoot_withBottomTabsAttachModeAfterInitialTab {
420411 XCTAssertTrue (_vc2.isViewLoaded );
421412}
422413
414+ - (void )testMergeOptions_shouldMergeWithChildOnly {
415+ [self .uut setReadyToReceiveCommands: true ];
416+ NSDictionary * mergeOptions = @{@" bottomTab" @" badge" @" Badge"
417+
418+ RNNNavigationOptions* firstChildOptions = [RNNNavigationOptions emptyOptions ];
419+ firstChildOptions.bottomTab .text = [Text withValue: @" First"
420+ RNNNavigationOptions* secondChildOptions = [RNNNavigationOptions emptyOptions ];
421+ secondChildOptions.bottomTab .text = [Text withValue: @" Second"
422+
423+ RNNComponentViewController* firstChild = [RNNComponentViewController createWithComponentId: @" first" initialOptions: firstChildOptions];
424+ RNNComponentViewController* secondChild = [RNNComponentViewController createWithComponentId: @" second" initialOptions: secondChildOptions];
425+
426+ RNNBottomTabsController* tabBarController = [[RNNBottomTabsController alloc ] initWithLayoutInfo: nil creator: nil options: [RNNNavigationOptions emptyOptions ] defaultOptions: [[RNNNavigationOptions alloc ] initEmptyOptions ] presenter: [RNNBasePresenter new ] bottomTabPresenter: [BottomTabPresenterCreator createWithDefaultOptions: [RNNNavigationOptions emptyOptions ]] dotIndicatorPresenter: nil eventEmitter: _eventEmmiter childViewControllers: @[firstChild, secondChild] bottomTabsAttacher: nil ];
427+
428+ OCMStub ([self .controllerFactory createLayout: [OCMArg any ]]).andReturn (tabBarController);
429+ [self .mainWindow setRootViewController: tabBarController];
430+ [secondChild viewWillAppear: YES ];
431+
432+ [self .uut mergeOptions: secondChild.layoutInfo.componentId options: mergeOptions completion: ^{
433+
434+ }];
435+
436+ XCTAssertTrue ([secondChild.tabBarItem.badgeValue isEqualToString: @" Badge"
437+ XCTAssertNil (firstChild.tabBarItem .badgeValue );
438+ XCTAssertTrue ([firstChild.tabBarItem.title isEqualToString: @" First"
439+ XCTAssertTrue ([secondChild.tabBarItem.title isEqualToString: @" Second"
440+ }
441+
423442- (void )testShowModal_shouldShowAnimated {
424443 [self .uut setReadyToReceiveCommands: true ];
425444 self.vc1 .options = [[RNNNavigationOptions alloc ] initEmptyOptions ];
0 commit comments