Addressing issues #21, #28, #24, #29 and #30. Adding some formatting for code to adhere to line length suggestions.

travis-ci · travis-ci · commit be7467d6af20 · 2020-01-27T13:48:04.000Z
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ dist: trusty
 language: java
 
 jdk:
-  - openjdk12
+  - openjdk8
 
 cache:
   directories:
diff --git a/pom.xml b/pom.xml
@@ -65,6 +65,7 @@
         <jacoco.maven.plugin.version>0.8.5</jacoco.maven.plugin.version>
         <javadoc.maven.plugin.version>3.1.1</javadoc.maven.plugin.version>
         <joda.time.version>2.7</joda.time.version>
+        <restassured.version>4.2.0</restassured.version>
     </properties>
 
     <dependencies>
@@ -128,6 +129,11 @@
             <artifactId>junit-jupiter</artifactId>
             <version>${junit.jupiter.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <version>${restassured.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-library</artifactId>
diff --git a/src/main/java/uk/co/evoco/webdriver/configuration/ConfigurationLoader.java b/src/main/java/uk/co/evoco/webdriver/configuration/ConfigurationLoader.java
@@ -39,7 +39,8 @@ public ConfigurationLoader decideWhichConfigurationToUse() {
      */
     public WebDriverConfig build() {
         try {
-            return JsonUtils.fromFile(FileLoaderUtils.loadFromClasspathOrFileSystem(targetConfigurationFile), WebDriverConfig.class);
+            return JsonUtils.fromFile(
+                    FileLoaderUtils.loadFromClasspathOrFileSystem(targetConfigurationFile), WebDriverConfig.class);
         } catch (IOException e) {
             throw new RuntimeException("Unable to load configuration from " + targetConfigurationFile);
         }
diff --git a/src/main/java/uk/co/evoco/webdriver/configuration/WebDriverConfig.java b/src/main/java/uk/co/evoco/webdriver/configuration/WebDriverConfig.java
@@ -88,7 +88,8 @@ public void setWebDriverWaitTimeout(String webDriverWaitTimeout) {
     /**
      *
      * @param item the name of the key for which the value you want to retrieve
-     * @return String returns the target item that exists in the list of open options that can be passed in the config file
+     * @return String returns the target item that exists in the list of open options that can be passed in
+     * the config file
      */
     public String getTestConfigItem(String item) {
         return this.testConfig.get(item).textValue();
@@ -164,7 +165,8 @@ public List<String> getExceptionsToHandleOnTolerantActions() {
 
     /**
      *
-     * @param exceptionsToHandleOnTolerantActions sets the list of exceptions for WebDriver that we will retry on when using our tolerant wrapper
+     * @param exceptionsToHandleOnTolerantActions sets the list of exceptions for WebDriver that we will retry
+     *                                            on when using our tolerant wrapper
      */
     @JsonProperty("exceptionsToHandleOnTolerantActions")
     public void setExceptionsToHandleOnTolerantActions(List<String> exceptionsToHandleOnTolerantActions) {
diff --git a/src/main/java/uk/co/evoco/webdriver/configuration/driver/ConfiguredChromeDriver.java b/src/main/java/uk/co/evoco/webdriver/configuration/driver/ConfiguredChromeDriver.java
@@ -19,7 +19,8 @@ public class ConfiguredChromeDriver implements ConfiguredDriver {
      * @return WebDriver representing RemoteWebDriver grid
      */
     public WebDriver getRemoteDriver() {
-        return new RemoteWebDriver(TestConfigManager.getInstance().getWebDriverConfig().getGridConfig().getGridUrl(), this.getOptions());
+        return new RemoteWebDriver(
+                TestConfigManager.getInstance().getWebDriverConfig().getGridConfig().getGridUrl(), this.getOptions());
     }
 
     /**
diff --git a/src/main/java/uk/co/evoco/webdriver/configuration/driver/ConfiguredDriver.java b/src/main/java/uk/co/evoco/webdriver/configuration/driver/ConfiguredDriver.java
@@ -25,7 +25,8 @@ public interface ConfiguredDriver {
      * @param screenshotDirectory path to store screenshots
      * @return configured options object for target browser driver
      */
-    default EventFiringWebDriver configureEventFiringWebDriver(WebDriver webDriver, long timeout, File screenshotDirectory) {
+    default EventFiringWebDriver configureEventFiringWebDriver(
+            WebDriver webDriver, long timeout, File screenshotDirectory) {
         EventFiringWebDriver eventFiringWebDriver = new EventFiringWebDriver(webDriver);
         WebDriverListener eventListener = new WebDriverListener();
         eventListener.setWebdriverWaitTimeout(timeout);
diff --git a/src/main/java/uk/co/evoco/webdriver/configuration/driver/ConfiguredEdgeDriver.java b/src/main/java/uk/co/evoco/webdriver/configuration/driver/ConfiguredEdgeDriver.java
@@ -18,7 +18,8 @@ public class ConfiguredEdgeDriver implements ConfiguredDriver {
      * @return WebDriver representing RemoteWebDriver grid
      */
     public WebDriver getRemoteDriver() {
-        return new RemoteWebDriver(TestConfigManager.getInstance().getWebDriverConfig().getGridConfig().getGridUrl(), this.getOptions());
+        return new RemoteWebDriver(
+                TestConfigManager.getInstance().getWebDriverConfig().getGridConfig().getGridUrl(), this.getOptions());
     }
 
     /**
diff --git a/src/main/java/uk/co/evoco/webdriver/configuration/driver/ConfiguredFirefoxDriver.java b/src/main/java/uk/co/evoco/webdriver/configuration/driver/ConfiguredFirefoxDriver.java
@@ -19,7 +19,8 @@ public class ConfiguredFirefoxDriver implements ConfiguredDriver {
      * @return WebDriver representing RemoteWebDriver grid
      */
     public WebDriver getRemoteDriver() {
-        return new RemoteWebDriver(TestConfigManager.getInstance().getWebDriverConfig().getGridConfig().getGridUrl(), this.getOptions());
+        return new RemoteWebDriver(
+                TestConfigManager.getInstance().getWebDriverConfig().getGridConfig().getGridUrl(), this.getOptions());
     }
 
     /**
diff --git a/src/main/java/uk/co/evoco/webdriver/configuration/driver/ConfiguredInternetExplorerDriver.java b/src/main/java/uk/co/evoco/webdriver/configuration/driver/ConfiguredInternetExplorerDriver.java
@@ -18,7 +18,8 @@ public class ConfiguredInternetExplorerDriver implements ConfiguredDriver {
      * @return WebDriver representing RemoteWebDriver grid
      */
     public WebDriver getRemoteDriver() {
-        return new RemoteWebDriver(TestConfigManager.getInstance().getWebDriverConfig().getGridConfig().getGridUrl(), this.getOptions());
+        return new RemoteWebDriver(
+                TestConfigManager.getInstance().getWebDriverConfig().getGridConfig().getGridUrl(), this.getOptions());
     }
 
     /**
diff --git a/src/main/java/uk/co/evoco/webdriver/configuration/driver/ConfiguredSafariDriver.java b/src/main/java/uk/co/evoco/webdriver/configuration/driver/ConfiguredSafariDriver.java
@@ -17,7 +17,8 @@ public class ConfiguredSafariDriver implements ConfiguredDriver {
      * @return WebDriver representing RemoteWebDriver grid
      */
     public WebDriver getRemoteDriver() {
-        return new RemoteWebDriver(TestConfigManager.getInstance().getWebDriverConfig().getGridConfig().getGridUrl(), this.getOptions());
+        return new RemoteWebDriver(
+                TestConfigManager.getInstance().getWebDriverConfig().getGridConfig().getGridUrl(), this.getOptions());
     }
 
     /**
diff --git a/src/main/java/uk/co/evoco/webdriver/results/ResultsManager.java b/src/main/java/uk/co/evoco/webdriver/results/ResultsManager.java
@@ -25,7 +25,8 @@ public ResultsManager() {
      * @return File representing created screenshot directory
      */
     public File createScreenshotDirectory() {
-        this.screenshotDirectory = new File(Paths.get("target").toString() + "/screenshots-" + timestamp.format(new Date()));
+        this.screenshotDirectory = new File(
+                Paths.get("target").toString() + "/screenshots-" + timestamp.format(new Date()));
         this.screenshotDirectory.mkdir();
         return this.screenshotDirectory;
     }
diff --git a/src/main/java/uk/co/evoco/webdriver/utils/ClickUtils.java b/src/main/java/uk/co/evoco/webdriver/utils/ClickUtils.java
@@ -28,9 +28,10 @@ public final class ClickUtils {
      *
      * @param webDriver active WebDriver instance
      * @param webElement active WebElement, already located
+     * @param waitTimeBeforeRetry time to wait explicitly before we retry
      * @throws InterruptedException because there is a Thread.sleep in this method.
      */
-    public static void tolerantClick(WebDriver webDriver, WebElement webElement) throws InterruptedException {
+    public static void tolerantClick(WebDriver webDriver, WebElement webElement, int waitTimeBeforeRetry) throws InterruptedException {
         try {
             click(webDriver, webElement, TestConfigManager.getInstance().getWebDriverConfig().getWebDriverWaitTimeout());
         } catch(Exception e) {
@@ -39,7 +40,7 @@ public static void tolerantClick(WebDriver webDriver, WebElement webElement) thr
             for(String exceptionToHandle : TestConfigManager.getInstance().getWebDriverConfig().getExceptionsToHandleOnTolerantActions()) {
                 if(e.getClass().getName().contains(exceptionToHandle)) {
                     logger.error("Exception {} is tolerated, retrying after a 3 second wait", exceptionToHandle);
-                    Thread.sleep(3);
+                    Thread.sleep(waitTimeBeforeRetry);
                     logger.error("Waited 3 seconds after {}, now retrying", exceptionToHandle);
                     click(webDriver, webElement, TestConfigManager.getInstance().getWebDriverConfig().getWebDriverWaitTimeout());
                 }
@@ -61,9 +62,10 @@ public static void tolerantClick(WebDriver webDriver, WebElement webElement) thr
      *
      * @param webDriver active WebDriver instance
      * @param locator locator we will use to re-lookup the element on retry
+     * @param waitTimeBeforeRetry time to wait explicitly before we retry
      * @throws InterruptedException
      */
-    public static void tolerantClick(WebDriver webDriver, By locator) throws InterruptedException {
+    public static void tolerantClick(WebDriver webDriver, By locator, int waitTimeBeforeRetry) throws InterruptedException {
         try {
             click(webDriver, locator, TestConfigManager.getInstance().getWebDriverConfig().getWebDriverWaitTimeout());
         } catch(Exception e) {
@@ -72,7 +74,7 @@ public static void tolerantClick(WebDriver webDriver, By locator) throws Interru
             for(String exceptionToHandle : TestConfigManager.getInstance().getWebDriverConfig().getExceptionsToHandleOnTolerantActions()) {
                 if(e.getClass().getName().contains(exceptionToHandle)) {
                     logger.error("Exception {} is tolerated, retrying after a 3 second wait", exceptionToHandle);
-                    Thread.sleep(3);
+                    Thread.sleep(waitTimeBeforeRetry);
                     logger.error("Waited 3 seconds after {}, now retrying", exceptionToHandle);
                     click(webDriver, locator, TestConfigManager.getInstance().getWebDriverConfig().getWebDriverWaitTimeout());
                 }
diff --git a/src/main/java/uk/co/evoco/webdriver/utils/FindByUtils.java b/src/main/java/uk/co/evoco/webdriver/utils/FindByUtils.java
@@ -26,7 +26,8 @@ public final class FindByUtils {
      * @param locator selector for target WebElement
      * @return active WebElement, already located
      */
-    public static WebElement multipleLocatorMatchGetDisplayed(WebDriver webDriver, By locator) throws WebDriverException {
+    public static WebElement multipleLocatorMatchGetDisplayed(WebDriver webDriver, By locator)
+            throws WebDriverException {
         List<WebElement> elements = webDriver.findElements(locator);
         logger.info("Found {} elements with locator: {}", elements.size(), locator.toString());
         for(WebElement element : elements) {
diff --git a/src/main/java/uk/co/evoco/webdriver/utils/data/BankHoliday.java b/src/main/java/uk/co/evoco/webdriver/utils/data/BankHoliday.java
@@ -0,0 +1,37 @@
+package uk.co.evoco.webdriver.utils.data;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.joda.time.LocalDate;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class BankHoliday {
+
+    private String title;
+    private LocalDate localDate;
+
+    public String getTitle() {
+        return title;
+    }
+
+    @JsonProperty("title")
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getLocalDate(String dateFormat) {
+        DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern(dateFormat);
+        return this.localDate.toString(dateTimeFormatter);
+    }
+
+    public LocalDate getLocalDate() {
+        return this.localDate;
+    }
+
+    @JsonProperty("date")
+    public void setLocalDate(String localDate) {
+        this.localDate = new LocalDate().parse(localDate);
+    }
+}
diff --git a/src/main/java/uk/co/evoco/webdriver/utils/data/BankHolidays.java b/src/main/java/uk/co/evoco/webdriver/utils/data/BankHolidays.java
@@ -0,0 +1,56 @@
+package uk.co.evoco.webdriver.utils.data;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
+import uk.co.evoco.webdriver.utils.JsonUtils;
+
+import java.util.List;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class BankHolidays {
+
+    private Locale locale;
+    private List<BankHoliday> englandAndWalesBankHolidays;
+    private List<BankHoliday> scotlandBankHolidays;
+    private List<BankHoliday> northernIrelandBankHolidays;
+
+    public Locale getLocale() {
+        return locale;
+    }
+
+    public void setLocale(String locale) {
+        this.locale = Locale.valueOf(locale.replace("-", "_").toUpperCase());
+    }
+
+    @JsonProperty("england-and-wales")
+    public void setEnglandAndWalesHolidays(JsonNode jsonNode) throws JsonProcessingException {
+        this.englandAndWalesBankHolidays = JsonUtils.fromString(jsonNode.get("events").toString(), new TypeReference<>() {
+        });
+    }
+
+    @JsonProperty("scotland")
+    public void scotlandHolidays(JsonNode jsonNode) throws JsonProcessingException {
+        this.scotlandBankHolidays = JsonUtils.fromString(jsonNode.get("events").toString(), new TypeReference<>() {});
+    }
+
+    @JsonProperty("northern-ireland")
+    public void northernIrelandHolidays(JsonNode jsonNode) throws JsonProcessingException {
+        this.northernIrelandBankHolidays = JsonUtils.fromString(jsonNode.get("events").toString(), new TypeReference<>() {});
+    }
+
+    public List<BankHoliday> get(Locale locale) {
+        switch(locale) {
+            case ENGLAND_AND_WALES:
+                return this.englandAndWalesBankHolidays;
+            case SCOTLAND:
+                return this.scotlandBankHolidays;
+            case NORTHERN_IRELAND:
+                return this.northernIrelandBankHolidays;
+            default:
+                throw new IllegalArgumentException("Locale must be ENGLAND_AND_WALES, SCOTLAND or NORTHERN_IRELAND");
+        }
+    }
+}
diff --git a/src/main/java/uk/co/evoco/webdriver/utils/data/Dates.java b/src/main/java/uk/co/evoco/webdriver/utils/data/Dates.java
@@ -1,24 +1,27 @@
 package uk.co.evoco.webdriver.utils.data;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import net.andreinc.mockneat.abstraction.MockUnitBase;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
+import uk.co.evoco.webdriver.utils.JsonUtils;
 
-public class Dates extends MockUnitBase {
+import static io.restassured.RestAssured.get;
 
-    private static final String DATE_FORMAT = "dd/MM/yyyy";
+public class Dates extends MockUnitBase {
 
     /**
      * Returns a string that represents the date that is the given days
      * ahead of the start date
      * @param startDate start date
      * @param daysToAdd days to add to start date
+     * @param dateFormat date format (e.g. "dd/MM/yyyy")
      * @return String representing resulting date
      */
-    public static String futureDate(String startDate, int daysToAdd) {
-        DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern(DATE_FORMAT);
+    public static String futureDate(String startDate, int daysToAdd, String dateFormat) {
+        DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern(dateFormat);
         LocalDate date = DateTime.parse(startDate, dateTimeFormatter).plusDays(daysToAdd).toLocalDate();
         return date.toString(dateTimeFormatter);
     }
@@ -28,20 +31,22 @@ public static String futureDate(String startDate, int daysToAdd) {
      * behind of the start date
      * @param startDate start date
      * @param daysToRemove days to remove from start date
+     * @param dateFormat date format (e.g. "dd/MM/yyyy")
      * @return String representing resulting date
      */
-    public static String pastDate(String startDate, int daysToRemove) {
-        DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern(DATE_FORMAT);
+    public static String pastDate(String startDate, int daysToRemove, String dateFormat) {
+        DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern(dateFormat);
         LocalDate date = DateTime.parse(startDate, dateTimeFormatter).minusDays(daysToRemove).toLocalDate();
         return date.toString(dateTimeFormatter);
     }
 
     /**
      * Returns the current date for today
+     * @param dateFormat date format (e.g. "dd/MM/yyyy")
      * @return String representing resulting date
      */
-    public static String now() {
-        DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern(DATE_FORMAT);
+    public static String now(String dateFormat) {
+        DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern(dateFormat);
         LocalDate date = DateTime.now().toLocalDate();
         return date.toString(dateTimeFormatter);
     }
@@ -50,10 +55,11 @@ public static String now() {
      *
      * @param startDate the date to start with
      * @param numberOfBusinessDaysToAdd Days to add, avoiding weekends
+     * @param dateFormat date format (e.g. "dd/MM/yyyy")
      * @return String representing resulting date
      */
-    public static String futureDateBusinessDays(String startDate, int numberOfBusinessDaysToAdd) {
-        DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern(DATE_FORMAT);
+    public static String futureDateBusinessDays(String startDate, int numberOfBusinessDaysToAdd, String dateFormat) {
+        DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern(dateFormat);
         LocalDate futureDate = DateTime.parse(startDate, dateTimeFormatter).toLocalDate();
         int addedDays = 0;
         while (addedDays < numberOfBusinessDaysToAdd) {
@@ -64,4 +70,35 @@ public static String futureDateBusinessDays(String startDate, int numberOfBusine
         }
         return futureDate.toString(dateTimeFormatter);
     }
+
+    /**
+     *
+     * @param locale the location for UK bank holidays (see @link uk.co.evoco.webdriver.utils.data.Dates)
+     * @param startDate the date to start with
+     * @param numberOfBusinessDaysToAdd Days to add, avoiding weekends and UK bank holidays
+     * @param dateFormat date format (e.g. "dd/MM/yyyy")
+     * @return String representing resulting date
+     * @throws JsonProcessingException if the JSON source for bank holidays cannot be read
+     */
+    public static String futureDateBusinessDaysAvoidingBankHolidays(
+            Locale locale, String startDate,
+            int numberOfBusinessDaysToAdd, String dateFormat) throws JsonProcessingException {
+        BankHolidays bankHolidays = JsonUtils.fromString(
+                get("https://www.gov.uk/bank-holidays.json").body().asString(), BankHolidays.class);
+        DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern(dateFormat);
+        LocalDate now = DateTime.parse(startDate, dateTimeFormatter).toLocalDate();
+        LocalDate futureDate = DateTime.parse(
+                futureDateBusinessDays(
+                        startDate,
+                        numberOfBusinessDaysToAdd,
+                        dateFormat), dateTimeFormatter).toLocalDate();
+        int bankHolidayCount = 0;
+        for(BankHoliday bankHoliday : bankHolidays.get(locale)) {
+            if (!bankHoliday.getLocalDate().isBefore(now) && !bankHoliday.getLocalDate().isAfter(futureDate)) {
+                bankHolidayCount++;
+            }
+        }
+        futureDate = futureDate.plusDays(bankHolidayCount);
+        return futureDate.toString(dateTimeFormatter);
+    }
 }
diff --git a/src/main/java/uk/co/evoco/webdriver/utils/data/Locale.java b/src/main/java/uk/co/evoco/webdriver/utils/data/Locale.java
@@ -0,0 +1,7 @@
+package uk.co.evoco.webdriver.utils.data;
+
+public enum Locale {
+    ENGLAND_AND_WALES,
+    SCOTLAND,
+    NORTHERN_IRELAND
+}
diff --git a/src/test/java/uk/co/evoco/webdriver/configuration/ConfigurationLoaderTests.java b/src/test/java/uk/co/evoco/webdriver/configuration/ConfigurationLoaderTests.java
diff --git a/src/test/java/uk/co/evoco/webdriver/configuration/TestConfigManagerTests.java b/src/test/java/uk/co/evoco/webdriver/configuration/TestConfigManagerTests.java
diff --git a/src/test/java/uk/co/evoco/webdriver/configuration/WebDriverConfigTests.java b/src/test/java/uk/co/evoco/webdriver/configuration/WebDriverConfigTests.java
diff --git a/src/test/java/uk/co/evoco/webdriver/configuration/driver/ConfiguredEdgeDriverIT.java b/src/test/java/uk/co/evoco/webdriver/configuration/driver/ConfiguredEdgeDriverIT.java
diff --git a/src/test/java/uk/co/evoco/webdriver/configuration/driver/ConfiguredInternetExplorerDriverIT.java b/src/test/java/uk/co/evoco/webdriver/configuration/driver/ConfiguredInternetExplorerDriverIT.java
diff --git a/src/test/java/uk/co/evoco/webdriver/configuration/driver/ConfiguredSafariDriverIT.java b/src/test/java/uk/co/evoco/webdriver/configuration/driver/ConfiguredSafariDriverIT.java
diff --git a/src/test/java/uk/co/evoco/webdriver/utils/EmbeddedJetty.java b/src/test/java/uk/co/evoco/webdriver/utils/EmbeddedJetty.java
diff --git a/src/test/java/uk/co/evoco/webdriver/utils/data/DatesTests.java b/src/test/java/uk/co/evoco/webdriver/utils/data/DatesTests.java

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,8 @@ public class ConfiguredChromeDriver implements ConfiguredDriver {`
`19`	`19`	`* @return WebDriver representing RemoteWebDriver grid`
`20`	`20`	`*/`
`21`	`21`	`public WebDriver getRemoteDriver() {`
`22`		`- return new RemoteWebDriver(TestConfigManager.getInstance().getWebDriverConfig().getGridConfig().getGridUrl(), this.getOptions());`
	`22`	`+ return new RemoteWebDriver(`
	`23`	`+ TestConfigManager.getInstance().getWebDriverConfig().getGridConfig().getGridUrl(), this.getOptions());`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,8 @@ public class ConfiguredEdgeDriver implements ConfiguredDriver {`
`18`	`18`	`* @return WebDriver representing RemoteWebDriver grid`
`19`	`19`	`*/`
`20`	`20`	`public WebDriver getRemoteDriver() {`
`21`		`- return new RemoteWebDriver(TestConfigManager.getInstance().getWebDriverConfig().getGridConfig().getGridUrl(), this.getOptions());`
	`21`	`+ return new RemoteWebDriver(`
	`22`	`+ TestConfigManager.getInstance().getWebDriverConfig().getGridConfig().getGridUrl(), this.getOptions());`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@ public class ConfiguredSafariDriver implements ConfiguredDriver {`
`17`	`17`	`* @return WebDriver representing RemoteWebDriver grid`
`18`	`18`	`*/`
`19`	`19`	`public WebDriver getRemoteDriver() {`
`20`		`- return new RemoteWebDriver(TestConfigManager.getInstance().getWebDriverConfig().getGridConfig().getGridUrl(), this.getOptions());`
	`20`	`+ return new RemoteWebDriver(`
	`21`	`+ TestConfigManager.getInstance().getWebDriverConfig().getGridConfig().getGridUrl(), this.getOptions());`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`/**`