diff --git a/backend/src/integration/groovy/jp/vmi/selenium/selenese/Runner.java b/backend/src/integration/groovy/jp/vmi/selenium/selenese/Runner.java index acc94ad8d..c1675f5f5 100644 --- a/backend/src/integration/groovy/jp/vmi/selenium/selenese/Runner.java +++ b/backend/src/integration/groovy/jp/vmi/selenium/selenese/Runner.java @@ -1,7 +1,7 @@ package jp.vmi.selenium.selenese; +import com.assertthat.selenium_shutterbug.core.Capture; import com.assertthat.selenium_shutterbug.core.Shutterbug; -import com.assertthat.selenium_shutterbug.utils.web.ScrollStrategy; import jp.vmi.html.result.HtmlResult; import jp.vmi.html.result.HtmlResultHolder; import jp.vmi.junit.result.JUnitResult; @@ -223,7 +223,7 @@ private String takeScreenshot(TakesScreenshot tss, File file, boolean entirePage Map initialCoord = (Map) je.executeScript(getScrollCoord); - Shutterbug.shootPage((WebDriver) tss, ScrollStrategy.BOTH_DIRECTIONS, screenshotScrollTimeout) + Shutterbug.shootPage((WebDriver) tss, Capture.FULL_SCROLL, screenshotScrollTimeout) .withName(FilenameUtils.removeExtension(tmp.getName())) .save(dir.getPath()); @@ -455,7 +455,7 @@ public boolean isInteractive() { @Override public boolean isW3cAction() { - return isW3cAction != null ? isW3cAction : MouseUtils.isW3cAction(getBrowserName()); + return isW3cAction != null ? isW3cAction : MouseUtils.isW3cAction(driver); } /** @@ -846,7 +846,7 @@ public void unhighlight() { * Setup MaxTimeActiveTimer. * @param maxTime the maxTime in milliseconds. */ - void setupMaxTimeTimer(long maxTime) { + public void setupMaxTimeTimer(long maxTime) { this.maxTimeTimer = new MaxTimeActiveTimer(maxTime); } } \ No newline at end of file