diff --git a/README.md b/README.md index 148e153..572b749 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ Here is the updated **Getting Started** section formatted for your README file: 21 21 UTF-8 - 1.0.9 + 1.1.0 diff --git a/pom.xml b/pom.xml index 748e741..68e900e 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ - 1.0.9 + 1.1.0 21 21 UTF-8 diff --git a/src/main/java/Ellithium/Utilities/interactions/DriverActions.java b/src/main/java/Ellithium/Utilities/interactions/DriverActions.java index 4ff0f7e..2965a88 100644 --- a/src/main/java/Ellithium/Utilities/interactions/DriverActions.java +++ b/src/main/java/Ellithium/Utilities/interactions/DriverActions.java @@ -52,8 +52,8 @@ public String getText( By locator, int timeout, int pollingEvery) { return text; } public void clickOnElement( By locator, int timeout, int pollingEvery) { - getFluentWait(timeout,pollingEvery) - .until(ExpectedConditions.elementToBeClickable(locator)); + getFluentWait(timeout,pollingEvery) + .until(ExpectedConditions.visibilityOfElementLocated(locator)); findWebElement(locator).click(); } public WebDriverWait generalWait(int timeout) { diff --git a/src/main/resources/properties/config.properties b/src/main/resources/properties/config.properties index 8fba976..7011636 100644 --- a/src/main/resources/properties/config.properties +++ b/src/main/resources/properties/config.properties @@ -1,6 +1,6 @@ #Mon Sep 09 13:46:17 EEST 2024 #Do not delete it, you can change it to the current version you use if needed -EllithiumVersion=1.0.9 +EllithiumVersion=1.1.0 allureVersion=2.30.0 #runMode Options: BDD, NonBDD diff --git a/src/test/java/Base/AppiumBase.java b/src/test/java/Base/AppiumBase.java index 0513351..78eb5d3 100644 --- a/src/test/java/Base/AppiumBase.java +++ b/src/test/java/Base/AppiumBase.java @@ -1,6 +1,6 @@ package Base; -import Ellithium.Utilities.interactions.WebDriverActions; +import Ellithium.Utilities.interactions.DriverActions; import Ellithium.core.base.NonBDDSetup; import io.appium.java_client.android.AndroidDriver; import io.appium.java_client.service.local.AppiumDriverLocalService; @@ -13,7 +13,7 @@ public class AppiumBase extends NonBDDSetup { protected AndroidDriver androidDriver; protected AppiumDriverLocalService serviceBuilder; - protected WebDriverActions driverActions; + protected DriverActions driverActions; @BeforeClass public void setup() { String appiumMainJsPath=System.getProperty("user.home").concat("\\AppData\\Roaming\\npm\\node_modules\\appium\\build\\lib\\main.js"); diff --git a/src/test/java/Pages/LoginPage.java b/src/test/java/Pages/LoginPage.java index 26f0ee0..4e58970 100644 --- a/src/test/java/Pages/LoginPage.java +++ b/src/test/java/Pages/LoginPage.java @@ -1,14 +1,14 @@ package Pages; -import Ellithium.Utilities.interactions.WebDriverActions; +import Ellithium.Utilities.interactions.DriverActions; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; public class LoginPage { WebDriver driver; - WebDriverActions driverActions; + DriverActions driverActions; public LoginPage(WebDriver driver) { this.driver=driver; - driverActions=new WebDriverActions(driver); + driverActions=new DriverActions(driver); } public void setUserName(String username){ driverActions.sendData(By.id("username"),username); diff --git a/src/test/java/Pages/SearchPage.java b/src/test/java/Pages/SearchPage.java index 8d74c15..b05322b 100644 --- a/src/test/java/Pages/SearchPage.java +++ b/src/test/java/Pages/SearchPage.java @@ -1,6 +1,6 @@ package Pages; -import Ellithium.Utilities.interactions.WebDriverActions; +import Ellithium.Utilities.interactions.DriverActions; import org.openqa.selenium.By; import org.openqa.selenium.Keys; import org.openqa.selenium.WebDriver; @@ -9,10 +9,10 @@ public class SearchPage { WebDriver driver; - WebDriverActions driverActions; + DriverActions driverActions; public SearchPage(WebDriver driver){ this.driver=driver; - driverActions=new WebDriverActions(driver); + driverActions=new DriverActions(driver); } public void searchItem(String itemName){ driverActions.sendData(By.id("searchBar"),itemName ); diff --git a/src/test/java/Pages/SecureAreaPage.java b/src/test/java/Pages/SecureAreaPage.java index 877a77d..dc76e81 100644 --- a/src/test/java/Pages/SecureAreaPage.java +++ b/src/test/java/Pages/SecureAreaPage.java @@ -1,15 +1,15 @@ package Pages; -import Ellithium.Utilities.interactions.WebDriverActions; +import Ellithium.Utilities.interactions.DriverActions; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; public class SecureAreaPage { WebDriver driver; - WebDriverActions driverActions; + DriverActions driverActions; public SecureAreaPage(WebDriver Driver){ driver=Driver; - driverActions=new WebDriverActions(driver); + driverActions=new DriverActions(driver); } public String getLoginMassega(){ return driverActions.getText(By.id("flash")); diff --git a/src/test/java/Tests/AppiumTest.java b/src/test/java/Tests/AppiumTest.java index d75c139..e87e771 100644 --- a/src/test/java/Tests/AppiumTest.java +++ b/src/test/java/Tests/AppiumTest.java @@ -1,7 +1,7 @@ package Tests; import Base.AppiumBase; -import Ellithium.Utilities.interactions.WebDriverActions; +import Ellithium.Utilities.interactions.DriverActions; import Ellithium.core.driver.DriverFactory; import Ellithium.core.driver.DriverType; import io.appium.java_client.AppiumBy; @@ -19,6 +19,6 @@ public void SmokeMobileTest() throws MalformedURLException, InterruptedException options.setAppActivity("com.appyinnovate.e_invoice.MainActivity"); options.setAppPackage("com.appyinnovate.e_invoice"); androidDriver= DriverFactory.getNewDriver(DriverType.Android,new URL("http://0.0.0.0:4723"),options); - driverActions=new WebDriverActions(androidDriver); + driverActions=new DriverActions(androidDriver); } }