CB-13093: (iOS) Infinite looping when stressing navigation (#328)

* CB-13093: (iOS) Infinite looping when stressing navigation * CB-13093: added a unit test to reproduce the issue
apache · Aug 8, 2017 · d44cec6 · d44cec6
1 parent 8edd13a
commit d44cec6
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/CordovaLib/Classes/Private/Plugins/CDVUIWebViewEngine/CDVUIWebViewDelegate.m b/CordovaLib/Classes/Private/Plugins/CDVUIWebViewEngine/CDVUIWebViewDelegate.m
@@ -256,11 +256,10 @@ - (BOOL)webView:(UIWebView*)webView shouldStartLoadWithRequest:(NSURLRequest*)re
                         NSLog(@"%@", description);
                         _loadCount = 0;
                         _state = STATE_WAITING_FOR_LOAD_START;
-                        if ([_delegate respondsToSelector:@selector(webView:didFailLoadWithError:)]) {
-                            NSDictionary* errorDictionary = @{NSLocalizedDescriptionKey : description};
-                            NSError* error = [[NSError alloc] initWithDomain:@"CDVUIWebViewDelegate" code:1 userInfo:errorDictionary];
-                            [_delegate webView:webView didFailLoadWithError:error];
-                        }
+
+                        NSDictionary* errorDictionary = @{NSLocalizedDescriptionKey : description};
+                        NSError* error = [[NSError alloc] initWithDomain:@"CDVUIWebViewDelegate" code:1 userInfo:errorDictionary];
+                        [self webView:webView didFailLoadWithError:error];
                     }
             }
         } else {

diff --git a/tests/CordovaLibTests/CDVWebViewDelegateTests.m b/tests/CordovaLibTests/CDVWebViewDelegateTests.m
@@ -47,6 +47,8 @@ @interface CDVUIWebViewDelegate ()
 // expose private interface
 - (BOOL)shouldLoadRequest:(NSURLRequest*)request;
 
+-(BOOL)webView:(UIWebView*)webView shouldStartLoadWithRequest:(NSURLRequest*)request navigationType:(UIWebViewNavigationType)navigationType;
+
 @end
 
 @interface CDVWebViewDelegateTests : XCTestCase
@@ -64,6 +66,21 @@ - (void)tearDown
     [super tearDown];
 }
 
+- (void)testShouldLoadRequestWithStateWaitForStart
+{
+    NSInteger initialState = 1; // STATE_WAITING_FOR_LOAD_START;
+    NSInteger expectedState = 0; // STATE_IDLE;
+
+    CDVWebViewDelegate2* wvd = [[CDVWebViewDelegate2 alloc] initWithDelegate:nil]; // not really testing delegate handling
+    wvd.state = initialState;
+
+    // Testing a top-level navigation
+    [wvd webView:[UIWebView new] shouldStartLoadWithRequest:nil navigationType:UIWebViewNavigationTypeLinkClicked];
+
+    XCTAssertTrue(wvd.state == expectedState, @"If the navigation started with state STATE_WAITING_FOR_LOAD_START then it must fail and the state should be STATE_IDLE");
+}
+
+
 - (void)testFailLoadStateCancelled
 {
     NSInteger initialState = 1; // STATE_WAITING_FOR_LOAD_START;