Merge pull request #13 from robertgates55/develop

Created a method for AngularJS requests in BasePage due to needing to…

pom.xml

@@ -3,7 +3,7 @@
 
   <groupId>com.frameworkium</groupId>
   <artifactId>Frameworkium-core</artifactId>
-  <version>1.1.1</version>
+  <version>1.1.2</version>
 
   <name>Frameworkium-core</name>
   <description>Frameworkium core code. Referenced by the com.frameworkium project, with example tests.</description>

src/main/java/com/frameworkium/pages/internal/BasePage.java

@@ -5,6 +5,7 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import com.paulhammant.ngwebdriver.WaitForAngularRequestsToFinish;
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -25,8 +26,6 @@
 import com.frameworkium.tests.internal.BaseTest;
 import com.google.inject.Inject;
 
-import static com.paulhammant.ngwebdriver.WaitForAngularRequestsToFinish.waitForAngularRequestsToFinish;
-
 public abstract class BasePage<T extends BasePage<T>> {
 
     @Inject
@@ -59,7 +58,7 @@ public T get() {
         HtmlElementLoader.populatePageObject(this, driver);
         try {
             if(isPageAngularJS()) {
-                waitForAngularRequestsToFinish((JavascriptExecutor) driver);
+                waitForAngularRequestsToFinish();
             }
             waitForExpectedVisibleElements(this);
             try {
@@ -204,6 +203,15 @@ public Object executeJS(String javascript) {
         return returnObj;
     }
 
+    /**
+     * Method to wait for AngularJS requests to finish on the page
+     */
+    public void waitForAngularRequestsToFinish() {
+        driver.manage().timeouts().setScriptTimeout(10, TimeUnit.SECONDS);
+        WaitForAngularRequestsToFinish
+                .waitForAngularRequestsToFinish((JavascriptExecutor) driver);
+    }
+
     /**
      * Method which executes an async JS call
      *