From 041ee45251ca2eaf2d95d3fc2d675ebebfff8a7f Mon Sep 17 00:00:00 2001 From: hmalik144 Date: Tue, 19 Jan 2021 14:26:02 +0000 Subject: [PATCH] Updates to naming conventions --- src/test/kotlin/stepDefinition/PracticeFormPageSteps.kt | 2 +- src/test/kotlin/stepDefinition/baseSteps/Driver.kt | 5 ++++- src/test/kotlin/stepDefinition/baseSteps/DriverSteps.kt | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/test/kotlin/stepDefinition/PracticeFormPageSteps.kt b/src/test/kotlin/stepDefinition/PracticeFormPageSteps.kt index 105e7a9..d1f71ee 100644 --- a/src/test/kotlin/stepDefinition/PracticeFormPageSteps.kt +++ b/src/test/kotlin/stepDefinition/PracticeFormPageSteps.kt @@ -24,7 +24,7 @@ class PracticeFormPageSteps: DriverSteps() { @Before fun setup(){ - webDriver = createWebDriver(Drivers.Chrome) + webDriver = retrieveWebDriver(Drivers.Chrome) formPageFactory = FormPageFactory(webDriver) submittedFormFactory = SubmittedFormFactory(webDriver) diff --git a/src/test/kotlin/stepDefinition/baseSteps/Driver.kt b/src/test/kotlin/stepDefinition/baseSteps/Driver.kt index 1daac0a..1d1a049 100644 --- a/src/test/kotlin/stepDefinition/baseSteps/Driver.kt +++ b/src/test/kotlin/stepDefinition/baseSteps/Driver.kt @@ -7,7 +7,10 @@ import java.io.IOException abstract class Driver{ - fun createChromeDriver(driver: Drivers): WebDriver { + /* + * create a web driver based on Browser selection + */ + fun createWebDriver(driver: Drivers): WebDriver { val path = System.getProperty("user.dir") System.setProperty(driver.driverProperty, "$path\\src\\test\\resources\\drivers\\${driver.driverFileName}") diff --git a/src/test/kotlin/stepDefinition/baseSteps/DriverSteps.kt b/src/test/kotlin/stepDefinition/baseSteps/DriverSteps.kt index 72b468b..62f40d9 100644 --- a/src/test/kotlin/stepDefinition/baseSteps/DriverSteps.kt +++ b/src/test/kotlin/stepDefinition/baseSteps/DriverSteps.kt @@ -8,8 +8,8 @@ import java.util.concurrent.TimeUnit abstract class DriverSteps : Driver(){ - fun createWebDriver(driver: Drivers): WebDriver{ - return createChromeDriver(driver).apply { + fun retrieveWebDriver(driver: Drivers): WebDriver{ + return createWebDriver(driver).apply { manage().timeouts().let { tO -> tO.implicitlyWait(TIMEOUT_DURATION, TimeUnit.SECONDS) tO.pageLoadTimeout(TIMEOUT_DURATION, TimeUnit.SECONDS)