Skip to content

[MOB-3767] set in-app javascript execution to false #408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roninopf merged 2 commits into from
Dec 17, 2021
Merged

[MOB-3767] set in-app javascript execution to false #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02b90d8
set in-app javascript execution to false
roninopf Dec 2, 2021
d3d7966
fix tests searching for JS enabled webviews
roninopf Dec 15, 2021
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
4 changes: 4 additions & 0 deletions app/src/androidTest/java/com/iterable/iterableapi/MainActivityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ public void checkIfMessageShownAsPopUpForImproperIntent() throws Exception {
onView(withText("Tips and tricks 2")).perform(click());
intended(allOf(hasComponent(IterableInboxMessageActivity.class.getName())), times(0));
onView(withId(R.id.webView)).inRoot(isDialog()).check(matches(isDisplayed()));
onWebView(withId(R.id.webView)).forceJavascriptEnabled();
onWebView().withElement(findElement(Locator.XPATH, "//*[contains(text(),'Ok, got it')]"));
}

Expand All @@ -165,6 +166,7 @@ public void checkIfMessageShownAsPopUpForUnexpectedIntent() throws Exception {
onView(withText("Tips and tricks 2")).perform(click());
intended(allOf(hasComponent(IterableInboxMessageActivity.class.getName())), times(0));
onView(withId(R.id.webView)).inRoot(isDialog()).check(matches(isDisplayed()));
onWebView(withId(R.id.webView)).forceJavascriptEnabled();
onWebView().withElement(findElement(Locator.XPATH, "//*[contains(text(),'Ok, got it')]"));
}

Expand All @@ -182,6 +184,7 @@ public void checkIfMessageShownAsPopUpForNoIntent() throws Exception {
onView(withText("Tips and tricks 2")).perform(click());
intended(allOf(hasComponent(IterableInboxMessageActivity.class.getName())), times(0));
onView(withId(R.id.webView)).inRoot(isDialog()).check(matches(isDisplayed()));
onWebView(withId(R.id.webView)).forceJavascriptEnabled();
onWebView().withElement(findElement(Locator.XPATH, "//*[contains(text(),'Ok, got it')]"));
}

Expand All @@ -203,6 +206,7 @@ public void checkIfMessageShownAsPopUp() throws Exception {
onView(withText("Tips and tricks 2")).perform(click());
intended(allOf(hasComponent(IterableInboxMessageActivity.class.getName())), times(0));
onView(withId(R.id.webView)).inRoot(isDialog()).check(matches(isDisplayed()));
onWebView(withId(R.id.webView)).forceJavascriptEnabled();
onWebView().withElement(findElement(Locator.XPATH, "//*[contains(text(),'Ok, got it')]"));
}

Expand Down
2 changes: 1 addition & 1 deletion iterableapi/src/main/java/com/iterable/iterableapi/IterableWebView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@ public void onProgressChanged(WebView view, int newProgress) {
getSettings().setUseWideViewPort(true);

//resize:
getSettings().setJavaScriptEnabled(true);
getSettings().setJavaScriptEnabled(false);
}
}