Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions Tests/WebViewJavascriptBridgeTests/BridgeTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,23 @@ - (void)classSpecificTestJavascriptReceiveResponse:(id)webView {
}];
}


- (void)testJavascriptInvokeUndefinedHandler {
[self classSpecificTestJavascriptInvokeUndefinedHandler:_uiWebView];
[self classSpecificTestJavascriptInvokeUndefinedHandler:_wkWebView];
[self waitForExpectationsWithTimeout:timeoutSec handler:NULL];
}
- (void)classSpecificTestJavascriptInvokeUndefinedHandler:(id)webView {
WebViewJavascriptBridge *bridge = [self bridgeForWebView:webView];
loadEchoSample(webView);
XCTestExpectation *callbackInvocked = [self expectationWithDescription:@"Callback invoked"];
[bridge callHandler:@"jsInvokeUndefinedHandlerTest" data:nil responseCallback:^(id responseData) {
XCTAssertEqualObjects(responseData, @"Response from JS");
[callbackInvocked fulfill];
}];
}


- (void)testJavascriptReceiveResponseWithoutSafetyTimeout {
[self classSpecificTestJavascriptReceiveResponseWithoutSafetyTimeout:_uiWebView];
[self classSpecificTestJavascriptReceiveResponseWithoutSafetyTimeout:_wkWebView];
Expand Down
9 changes: 9 additions & 0 deletions Tests/WebViewJavascriptBridgeTests/echo.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,15 @@
}
})
})
bridge.registerHandler('jsInvokeUndefinedHandlerTest', function(data, responseCallback) {
bridge.callHandler('undefinedHandler', { foo:'bar' }, function(response) {
if (response && Object.keys(response).length == 0) {
responseCallback("Response from JS")
} else {
responseCallback("Failed")
}
})
})
})
</script>
</body></html>
1 change: 1 addition & 0 deletions WebViewJavascriptBridge/WKWebViewJavascriptBridge.m
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ - (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigati
[_base logUnkownMessage:url];
}
decisionHandler(WKNavigationActionPolicyCancel);
return;
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has been fixed in #296. Will evaluate the other parts for merge.

}

if (strongDelegate && [strongDelegate respondsToSelector:@selector(webView:decidePolicyForNavigationAction:decisionHandler:)]) {
Expand Down
1 change: 1 addition & 0 deletions WebViewJavascriptBridge/WebViewJavascriptBridgeBase.m
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ - (void)flushMessageQueue:(NSString *)messageQueueString{

if (!handler) {
NSLog(@"WVJBNoHandlerException, No handler for message from JS: %@", message);
responseCallback(@{});
continue;
}

Expand Down
2 changes: 1 addition & 1 deletion WebViewJavascriptBridge/WebViewJavascriptBridge_JS.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#import <Foundation/Foundation.h>

NSString * WebViewJavascriptBridge_js();
NSString * WebViewJavascriptBridge_js(void);