Remove findElement methods from WebDriverUtils driver utility class

3 files changed, 3 insertions, 15 deletions

diff --git a/src/main/java/com/mavlushechka/a1qa/driverUtils/WebDriverSingleton.java b/src/main/java/com/mavlushechka/a1qa/driverUtils/WebDriverSingleton.java
index ba6f91c..e363ae7 100644
--- a/src/main/java/com/mavlushechka/a1qa/driverUtils/WebDriverSingleton.java
+++ b/src/main/java/com/mavlushechka/a1qa/driverUtils/WebDriverSingleton.java
@@ -10,7 +10,7 @@ public class WebDriverSingleton {
     private WebDriverSingleton() {
     }
 
-    protected static WebDriver getInstance() {
+    public static WebDriver getInstance() {
         if (instance == null) {
             instance = WebDriverFactory.createWebDriver();
         }
diff --git a/src/main/java/com/mavlushechka/a1qa/driverUtils/WebDriverUtils.java b/src/main/java/com/mavlushechka/a1qa/driverUtils/WebDriverUtils.java
index f4c5ec3..a95717a 100644
--- a/src/main/java/com/mavlushechka/a1qa/driverUtils/WebDriverUtils.java
+++ b/src/main/java/com/mavlushechka/a1qa/driverUtils/WebDriverUtils.java
@@ -1,10 +1,6 @@
 package com.mavlushechka.a1qa.driverUtils;
 
-import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-
-import java.util.List;
 
 public class WebDriverUtils {
 
@@ -18,14 +14,6 @@ public class WebDriverUtils {
         webDriver.get(address);
     }
 
-    public static WebElement findElement(By locator) {
-        return webDriver.findElement(locator);
-    }
-
-    public static List<WebElement> findElements(By locator) {
-        return webDriver.findElements(locator);
-    }
-
     public static int getWindowHandlesCount() {
         return webDriver.getWindowHandles().size();
     }
diff --git a/src/main/java/com/mavlushechka/a1qa/elements/BaseElement.java b/src/main/java/com/mavlushechka/a1qa/elements/BaseElement.java
index a2dc55a..6f40af6 100644
--- a/src/main/java/com/mavlushechka/a1qa/elements/BaseElement.java
+++ b/src/main/java/com/mavlushechka/a1qa/elements/BaseElement.java
@@ -1,7 +1,7 @@
 package com.mavlushechka.a1qa.elements;
 
 import com.mavlushechka.a1qa.driverUtils.ActionUtils;
-import com.mavlushechka.a1qa.driverUtils.WebDriverUtils;
+import com.mavlushechka.a1qa.driverUtils.WebDriverSingleton;
 import com.mavlushechka.a1qa.driverUtils.WebDriverWaitFactory;
 import com.mavlushechka.a1qa.utils.LoggerUtils;
 import org.openqa.selenium.By;
@@ -73,7 +73,7 @@ public abstract class BaseElement {
     protected WebElement find() {
         isVisible();
         LoggerUtils.info("Finding the \"" + name + "\" element.");
-        return WebDriverUtils.findElement(locator);
+        return WebDriverSingleton.getInstance().findElement(locator);
     }
 
     protected void scrollTo() {