Fix https webpage loads, and add unit test for this failure case. Fix marcuswestin#256

marcuswestin · marcuswestin · commit f40e3d3a280d · 2016-12-29T12:32:54.000-05:00
diff --git a/Tests/WebViewJavascriptBridgeTests/BridgeTests.m b/Tests/WebViewJavascriptBridgeTests/BridgeTests.m
@@ -14,7 +14,9 @@
 static NSString *const echoHandler = @"echoHandler";
 
 @interface BridgeTests : XCTestCase
-
+@end
+@interface TestWebPageLoadDelegate : NSObject<UIWebViewDelegate>
+@property XCTestExpectation* expectation;
 @end
 
 @implementation BridgeTests {
@@ -57,7 +59,7 @@ static void loadEchoSample(id webView) {
     [(UIWebView*)webView loadRequest:request];
 }
 
-const NSTimeInterval timeoutSec = 100;
+const NSTimeInterval timeoutSec = 5;
 
 - (void)testInitialization {
     [self classSpecificTestInitialization:_uiWebView];
@@ -171,4 +173,26 @@ - (void)classSpecificTestJavascriptReceiveResponseWithoutSafetyTimeout:(id)webVi
         [callbackInvocked fulfill];
     }];
 }
+
+- (void)testWebpageLoad {
+    TestWebPageLoadDelegate* delegate = [self classSpecificTestWebpageLoad:_uiWebView]; // to retain it
+//    [self classSpecificTestWebpageLoad:_wkWebView];
+    [self waitForExpectationsWithTimeout:timeoutSec handler:NULL];
+    NSLog(@"Retain delegate %@", delegate);
+}
+- (TestWebPageLoadDelegate*)classSpecificTestWebpageLoad:(id)webView {
+    WebViewJavascriptBridge* bridge = [self bridgeForWebView:webView];
+    TestWebPageLoadDelegate* delegate = [TestWebPageLoadDelegate new];
+    delegate.expectation = [self expectationWithDescription:@"Webpage loaded"];
+    [bridge setWebViewDelegate:delegate];
+    NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:@"https://example.com"]];
+    [(UIWebView*)webView loadRequest:request];
+    return delegate;
+}
+@end
+
+@implementation TestWebPageLoadDelegate
+- (void)webViewDidFinishLoad:(UIWebView *)webView {
+    [self.expectation fulfill];
+}
 @end
diff --git a/WebViewJavascriptBridge/WKWebViewJavascriptBridge.m b/WebViewJavascriptBridge/WKWebViewJavascriptBridge.m
@@ -134,7 +134,7 @@ - (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigati
     NSURL *url = navigationAction.request.URL;
     __strong typeof(_webViewDelegate) strongDelegate = _webViewDelegate;
 
-    if ([_base isCorrectProcotocolScheme:url]) {
+    if ([_base isWebViewJavascriptBridgeURL:url]) {
         if ([_base isBridgeLoadedURL:url]) {
             [_base injectJavascriptFile];
         } else if ([_base isQueueMessageURL:url]) {
diff --git a/WebViewJavascriptBridge/WebViewJavascriptBridge.h b/WebViewJavascriptBridge/WebViewJavascriptBridge.h
@@ -33,7 +33,7 @@
 @interface WebViewJavascriptBridge : WVJB_WEBVIEW_DELEGATE_INTERFACE
 
 
-+ (instancetype)bridgeForWebView:(id)webView DEPRECATED_MSG_ATTRIBUTE("Use bridge instead");
++ (instancetype)bridgeForWebView:(id)webView;
 + (instancetype)bridge:(id)webView;
 
 + (void)enableLogging;
diff --git a/WebViewJavascriptBridge/WebViewJavascriptBridge.m b/WebViewJavascriptBridge/WebViewJavascriptBridge.m
@@ -123,7 +123,7 @@ - (void)webView:(WebView *)webView decidePolicyForNavigationAction:(NSDictionary
     if (webView != _webView) { return; }
     
     NSURL *url = [request URL];
-    if ([_base isCorrectProcotocolScheme:url]) {
+    if ([_base isWebViewJavascriptBridgeURL:url]) {
         if ([_base isBridgeLoadedURL:url]) {
             [_base injectJavascriptFile];
         } else if ([_base isQueueMessageURL:url]) {
@@ -180,7 +180,7 @@ - (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)
     
     NSURL *url = [request URL];
     __strong WVJB_WEBVIEW_DELEGATE_TYPE* strongDelegate = _webViewDelegate;
-    if ([_base isCorrectProcotocolScheme:url]) {
+    if ([_base isWebViewJavascriptBridgeURL:url]) {
         if ([_base isBridgeLoadedURL:url]) {
             [_base injectJavascriptFile];
         } else if ([_base isQueueMessageURL:url]) {
diff --git a/WebViewJavascriptBridge/WebViewJavascriptBridgeBase.h b/WebViewJavascriptBridge/WebViewJavascriptBridgeBase.h
@@ -34,7 +34,7 @@ typedef NSDictionary WVJBMessage;
 - (void)sendData:(id)data responseCallback:(WVJBResponseCallback)responseCallback handlerName:(NSString*)handlerName;
 - (void)flushMessageQueue:(NSString *)messageQueueString;
 - (void)injectJavascriptFile;
-- (BOOL)isCorrectProcotocolScheme:(NSURL*)url;
+- (BOOL)isWebViewJavascriptBridgeURL:(NSURL*)url;
 - (BOOL)isQueueMessageURL:(NSURL*)urll;
 - (BOOL)isBridgeLoadedURL:(NSURL*)urll;
 - (void)logUnkownMessage:(NSURL*)url;
diff --git a/WebViewJavascriptBridge/WebViewJavascriptBridgeBase.m b/WebViewJavascriptBridge/WebViewJavascriptBridgeBase.m
@@ -122,12 +122,11 @@ - (void)injectJavascriptFile {
     }
 }
 
-- (BOOL)isCorrectProcotocolScheme:(NSURL*)url {
-    if([[url scheme] isEqualToString:kCustomProtocolScheme]){
-        return YES;
-    } else {
+- (BOOL)isWebViewJavascriptBridgeURL:(NSURL*)url {
+    if (![[url scheme] isEqualToString:kCustomProtocolScheme]){
         return NO;
     }
+    return ([self isBridgeLoadedURL:url] || [self isQueueMessageURL:url]);
 }
 
 - (BOOL)isQueueMessageURL:(NSURL*)url {

Original file line number	Diff line number	Diff line change
`@@ -122,12 +122,11 @@ - (void)injectJavascriptFile {`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`
`125`		`-- (BOOL)isCorrectProcotocolScheme:(NSURL*)url {`
`126`		`- if([[url scheme] isEqualToString:kCustomProtocolScheme]){`
`127`		`- return YES;`
`128`		`- } else {`
	`125`	`+- (BOOL)isWebViewJavascriptBridgeURL:(NSURL*)url {`
	`126`	`+ if (![[url scheme] isEqualToString:kCustomProtocolScheme]){`
`129`	`127`	`return NO;`
`130`	`128`	`}`
	`129`	`+ return ([self isBridgeLoadedURL:url] \|\| [self isQueueMessageURL:url]);`
`131`	`130`	`}`
`132`	`131`
`133`	`132`	`- (BOOL)isQueueMessageURL:(NSURL*)url {`