Skip to content

Add async javascript in browser #26 #38

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
merged 11 commits into from
Aug 22, 2019
Merged

Add async javascript in browser #26 #38

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7125a1a
refactored state of elements
Aug 8, 2019
0c16676
re-check waitForNotExists methods for correct work. split 1 test to 2…
Aug 9, 2019
b0567a6
removed IElementWithState interface
Aug 9, 2019
9fc21fd
refactored conditional wait
Aug 9, 2019
59f2641
merged with the master branch
Aug 9, 2019
6e6fe54
Merge branch 'master' of https://github.com/aquality-automation/aqual…
Aug 13, 2019
f1ca748
Merge branch 'master' of https://github.com/aquality-automation/aqual…
Aug 16, 2019
7f03255
Merge branch 'master' of https://github.com/aquality-automation/aqual…
Aug 21, 2019
1dc49f6
Merge branch 'master' of https://github.com/aquality-automation/aqual…
Aug 21, 2019
f622b5d
added methods for async javascript in browser #26
Aug 21, 2019
06e8f5f
removed unnecessary casting to boolean
Aug 22, 2019
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
removed unnecessary casting to boolean
  • Loading branch information
d.bogatko authored and d.bogatko committed Aug 22, 2019
commit 06e8f5fa8b5d41e94ce298a0430ff6f987f6eb4f
6 changes: 2 additions & 4 deletions src/main/java/aquality/selenium/browser/Browser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,7 @@ public byte[] getScreenshot() {
* @return Result object of script execution
*/
public Object executeAsyncScript(final String script, Object... arguments) {
Object result = executeJavaScript(() -> getDriver().executeAsyncScript(script, arguments));
return result instanceof Boolean ? Boolean.parseBoolean(result.toString()) : result;
return executeJavaScript(() -> getDriver().executeAsyncScript(script, arguments));
}

/**
Expand Down Expand Up @@ -222,8 +221,7 @@ public Object executeAsyncScript(final File file, Object... arguments) throws IO
* @return Result object of script execution
*/
public Object executeScript(final String script, Object... arguments) {
Object result = executeJavaScript(() -> getDriver().executeScript(script, arguments));
return result instanceof Boolean ? Boolean.parseBoolean(result.toString()) : result;
return executeJavaScript(() -> getDriver().executeScript(script, arguments));
}

private Object executeJavaScript(Supplier<Object> executeScriptFunc){
Expand Down