Allow access to scroll timeout through public API

Author: glibas

src/main/java/com/assertthat/selenium_shutterbug/core/Shutterbug.java

@@ -5,7 +5,6 @@
 
 package com.assertthat.selenium_shutterbug.core;
 
-import com.assertthat.selenium_shutterbug.utils.image.ImageProcessor;
 import com.assertthat.selenium_shutterbug.utils.web.Browser;
 import com.assertthat.selenium_shutterbug.utils.web.ScrollStrategy;
 import org.openqa.selenium.WebDriver;
@@ -16,6 +15,8 @@
  */
 public class Shutterbug {
 
+    private static final int DEFAULT_SCROLL_TIMEOUT = 100;
+
     /**
      * Make screenshot of the viewport only.
      * To be used when screenshotting the page
@@ -41,7 +42,22 @@ public static PageSnapshot shootPage(WebDriver driver) {
      * @return PageSnapshot instance
      */
     public static PageSnapshot shootPage(WebDriver driver, ScrollStrategy scroll) {
+        return shootPage(driver, scroll, DEFAULT_SCROLL_TIMEOUT);
+    }
+
+    /**
+     * To be used when screenshotting the page
+     * and need to scroll while making screenshots, either vertically or
+     * horizontally or both directions (Chrome).
+     *
+     * @param driver WebDriver instance
+     * @param scroll ScrollStrategy How you need to scroll
+     * @param  scrollTimeout Timeout to wait after scrolling and before taking screenshot
+     * @return PageSnapshot instance
+     */
+    public static PageSnapshot shootPage(WebDriver driver, ScrollStrategy scroll, int scrollTimeout) {
         Browser browser = new Browser(driver);
+        browser.setScrollTimeout(scrollTimeout);
         PageSnapshot pageScreenshot = new PageSnapshot(driver);
         switch (scroll) {
             case HORIZONTALLY:

src/main/java/com/assertthat/selenium_shutterbug/core/Snapshot.java

@@ -24,7 +24,7 @@
 public abstract class Snapshot<T extends Snapshot> {
 
     private static final String EXTENSION = "PNG";
-    protected static final String ELEMENT_OUT_OF_VIEWPORT_EX_MESSAGE = "Use ScrollStrategy.HORIZONTALLY,  ScrollStrategy.VERTICALLY or ScrollStrategy.BOTH_DIRECTIONS to shoot the element outside the viewport";
+    protected static final String ELEMENT_OUT_OF_VIEWPORT_EX_MESSAGE = "Requested element is outside the viewport";
     protected BufferedImage image;
     protected BufferedImage thumbnailImage;
     protected WebDriver driver;

src/main/java/com/assertthat/selenium_shutterbug/utils/web/Browser.java

@@ -39,6 +39,7 @@ public class Browser {
     private int viewportHeight = -1;
     private int currentScrollX;
     private int currentScrollY;
+    private int scrollTimeout;
 
     public Browser(WebDriver driver) {
         this.driver = driver;
@@ -52,6 +53,10 @@ public static void wait(int milis) {
         }
     }
 
+    public void setScrollTimeout(int scrollTimeout){
+        this.scrollTimeout = scrollTimeout;
+    }
+
     public BufferedImage takeScreenshot() {
         File srcFile = ((TakesScreenshot) this.getUnderlyingDriver()).getScreenshotAs(OutputType.FILE);
         try {
@@ -66,16 +71,16 @@ public BufferedImage takeScreenshotEntirePage() {
         Graphics2D g = combinedImage.createGraphics();
         int horizontalIterations = (int) Math.ceil(((double) this.getDocWidth()) / this.getViewportWidth());
         int verticalIterations = (int) Math.ceil(((double) this.getDocHeight()) / this.getViewportHeight());
-        outerloop:
+        outer_loop:
         for (int j = 0; j < verticalIterations; j++) {
             this.scrollTo(0, j * this.getViewportHeight());
             for (int i = 0; i < horizontalIterations; i++) {
                 this.scrollTo(i * this.getViewportWidth(), this.getViewportHeight() * j);
-                wait(50);
+                wait(scrollTimeout);
                 Image image = takeScreenshot();
                 g.drawImage(image, this.getCurrentScrollX(), this.getCurrentScrollY(), null);
                 if(this.getDocWidth() == image.getWidth(null) && this.getDocHeight() == image.getHeight(null)){
-                    break outerloop;
+                    break outer_loop;
                 }
             }
         }
@@ -89,6 +94,7 @@ public BufferedImage takeScreenshotScrollHorizontally() {
         int horizontalIterations = (int) Math.ceil(((double) this.getDocWidth()) / this.getViewportWidth());
         for (int i = 0; i < horizontalIterations; i++) {
             this.scrollTo(i * this.getViewportWidth(), 0);
+            wait(scrollTimeout);
             Image image = takeScreenshot();
             g.drawImage(image, this.getCurrentScrollX(), 0, null);
             if(this.getDocWidth() == image.getWidth(null)){
@@ -105,6 +111,7 @@ public BufferedImage takeScreenshotScrollVertically() {
         int verticalIterations = (int) Math.ceil(((double) this.getDocHeight()) / this.getViewportHeight());
         for (int j = 0; j < verticalIterations; j++) {
             this.scrollTo(0, j * this.getViewportHeight());
+            wait(scrollTimeout);
             Image image = takeScreenshot();
             g.drawImage(image, 0, this.getCurrentScrollY(), null);
             if(this.getDocHeight() == image.getHeight(null)){