Skip to content

Update to selenium 3.7.1 #778

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
TikhomirovSergey merged 2 commits into from
Dec 2, 2017
Merged

Update to selenium 3.7.1 #778

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
d07eb69
Update to selenium 3.7.1
TikhomirovSergey Dec 1, 2017
ed22772
improved java doc comment
TikhomirovSergey Dec 2, 2017
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
7 changes: 6 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ compileJava {
]
}

ext.seleniumVersion = '3.6.0'
ext.seleniumVersion = '3.7.1'

dependencies {
compile ("org.seleniumhq.selenium:selenium-java:${seleniumVersion}") {
Expand Down Expand Up @@ -197,6 +197,11 @@ uploadArchives {
url 'https://github.com/SrinivasanTarget'
id 'SrinivasanTarget'
};
developer {
name 'Mykola Mokhnach'
Copy link
Member

@SrinivasanTarget SrinivasanTarget Dec 2, 2017

Choose a reason for hiding this comment

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

👍

url 'https://github.com/mykola-mokhnach'
id 'mykola-mokhnach'
};
}
licenses {
license {
Expand Down
23 changes: 0 additions & 23 deletions src/main/java/io/appium/java_client/events/DefaultAspect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@ class DefaultAspect {
+ "dismiss(..))";
private static final String EXECUTION_ALERT_SEND_KEYS = "execution(* org.openqa.selenium.Alert."
+ "sendKeys(..))";
private static final String EXECUTION_ALERT_AUTHENTICATION = "execution(* org.openqa.selenium."
+ "Alert.setCredentials(..)) || "
+ "execution(* org.openqa.selenium.Alert.authenticateUsing(..))";
private static final String EXECUTION_WINDOW_SET_SIZE = "execution(* org.openqa.selenium."
+ "WebDriver.Window.setSize(..))";
private static final String EXECUTION_WINDOW_SET_POSITION = "execution(* org.openqa.selenium.WebDriver."
Expand Down Expand Up @@ -408,26 +405,6 @@ public void afterAlertSendKeys(JoinPoint joinPoint) throws Throwable {
}
}

@Before(EXECUTION_ALERT_AUTHENTICATION)
public void beforeAlertAuthentication(JoinPoint joinPoint) throws Throwable {
try {
listener.beforeAuthentication(driver,
castTarget(joinPoint), castArgument(joinPoint, 0));
} catch (Throwable t) {
throw getRootCause(t);
}
}

@After(EXECUTION_ALERT_AUTHENTICATION)
public void afterAlertAuthentication(JoinPoint joinPoint) throws Throwable {
try {
listener.afterAuthentication(driver, castTarget(joinPoint),
castArgument(joinPoint, 0));
} catch (Throwable t) {
throw getRootCause(t);
}
}

@Before(EXECUTION_WINDOW_SET_SIZE)
public void beforeWindowIsResized(JoinPoint joinPoint) throws Throwable {
try {
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/io/appium/java_client/events/DefaultListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,11 +183,13 @@ public void beforeAlertDismiss(WebDriver driver) {
}

@Override
@Deprecated
public void beforeAuthentication(WebDriver driver, Alert alert, Credentials credentials) {
((AlertEventListener) dispatcher).beforeAuthentication(driver, alert, credentials);
}

@Override
@Deprecated
public void afterAuthentication(WebDriver driver, Alert alert, Credentials credentials) {
((AlertEventListener) dispatcher).afterAuthentication(driver, alert, credentials);
}
Expand Down
10 changes: 9 additions & 1 deletion src/main/java/io/appium/java_client/events/api/general/AlertEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,23 +79,31 @@ public interface AlertEventListener extends Listener {
* This action will be performed each time before
* {@link org.openqa.selenium.Alert#setCredentials(Credentials)} and
* {@link org.openqa.selenium.Alert#authenticateUsing(Credentials)}
* It is deprecated because methods {@link org.openqa.selenium.Alert#setCredentials(Credentials)} and
* {@link org.openqa.selenium.Alert#authenticateUsing(Credentials)} were removed from selenium java client
* at 3.8.0. This listener method is going to be removed as well.
*
* @param driver WebDriver
* @param alert {@link org.openqa.selenium.Alert} which is receiving user credentials
* @param credentials which are being sent
*/
@Deprecated
void beforeAuthentication(WebDriver driver, Alert alert,
Credentials credentials);

/**
* This action will be performed each time after
* {@link org.openqa.selenium.Alert#setCredentials(Credentials)} and
* {@link org.openqa.selenium.Alert#authenticateUsing(Credentials)}
* {@link org.openqa.selenium.Alert#authenticateUsing(Credentials)}.
* It is deprecated because methods {@link org.openqa.selenium.Alert#setCredentials(Credentials)} and
* {@link org.openqa.selenium.Alert#authenticateUsing(Credentials)} were removed from selenium java client
* at 3.8.0. This listener method is going to be removed as well.
*
* @param driver WebDriver
* @param alert {@link org.openqa.selenium.Alert} which has received user credentials
* @param credentials which have been sent
*/
@Deprecated
void afterAuthentication(WebDriver driver, Alert alert,
Credentials credentials);
}
Loading