diff --git a/qaframework-bdd-tests/package.json b/qaframework-bdd-tests/package.json index 273b5922f..08ca7538b 100644 --- a/qaframework-bdd-tests/package.json +++ b/qaframework-bdd-tests/package.json @@ -3,8 +3,8 @@ "version": "0.1.0", "private": true, "engines": { - "node": ">=14.15.5", - "npm": ">=7.5.3" + "node": ">=16.20.0", + "npm": ">=8.19.4" }, "scripts": { "refappSelenium": "mvn test -Dcucumber.filter.tags='@selenium and not @initialSetup'", diff --git a/qaframework-bdd-tests/pom.xml b/qaframework-bdd-tests/pom.xml index 000c5dc76..14e640d89 100644 --- a/qaframework-bdd-tests/pom.xml +++ b/qaframework-bdd-tests/pom.xml @@ -72,91 +72,6 @@ - - org.apache.maven.plugins - maven-antrun-plugin - 1.8 - - - make-mac-chromedriver-executable - process-test-classes - - - - - false - - - run - - - - make-linux-chromedriver-executable - process-test-classes - - - - - false - - - run - - - - make-windows-chromedriver-executable - process-test-classes - - - - - false - - - run - - - - make-mac-firefoxdriver-executable - process-test-classes - - - - - false - - - run - - - - make-linux-firefoxdriver-executable - process-test-classes - - - - - false - - - run - - - - make-windows-firefoxdriver-executable - process-test-classes - - - - - false - - - run - - - - com.github.eirslett frontend-maven-plugin diff --git a/qaframework-bdd-tests/src/main/java/org/openmrs/contrib/qaframework/helper/TestBase.java b/qaframework-bdd-tests/src/main/java/org/openmrs/contrib/qaframework/helper/TestBase.java index cfe2c7536..1af413379 100644 --- a/qaframework-bdd-tests/src/main/java/org/openmrs/contrib/qaframework/helper/TestBase.java +++ b/qaframework-bdd-tests/src/main/java/org/openmrs/contrib/qaframework/helper/TestBase.java @@ -14,20 +14,12 @@ import java.io.File; import java.io.IOException; -import java.net.URL; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.SystemUtils; import org.apache.commons.lang3.exception.ExceptionUtils; -import org.apache.commons.vfs2.AllFileSelector; -import org.apache.commons.vfs2.FileObject; -import org.apache.commons.vfs2.FileSystemException; -import org.apache.commons.vfs2.VFS; import org.junit.After; -import org.junit.Assert; import org.junit.Before; import org.junit.Rule; import org.junit.rules.TestName; @@ -199,9 +191,6 @@ protected LoginPage getLoginPage() { } WebDriver setupFirefoxDriver() { - if (StringUtils.isBlank(System.getProperty("webdriver.gecko.driver"))) { - System.setProperty("webdriver.gecko.driver", Thread.currentThread().getContextClassLoader().getResource(TestProperties.instance().getFirefoxDriverLocation()).getPath()); - } FirefoxOptions firefoxOptions = new FirefoxOptions(); if ("true".equals(TestProperties.instance().getHeadless())) { firefoxOptions.addArguments("--headless"); @@ -211,53 +200,6 @@ WebDriver setupFirefoxDriver() { } WebDriver setupChromeDriver() { - URL chromedriverExecutable = null; - ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); - - String chromedriverExecutableFilename = null; - if (SystemUtils.IS_OS_MAC_OSX) { - chromedriverExecutableFilename = "chromedriver"; - chromedriverExecutable = classLoader.getResource("chromedriver/mac/chromedriver"); - } else if (SystemUtils.IS_OS_LINUX) { - chromedriverExecutableFilename = "chromedriver"; - chromedriverExecutable = classLoader.getResource("chromedriver/linux/chromedriver"); - } else if (SystemUtils.IS_OS_WINDOWS) { - chromedriverExecutableFilename = "chromedriver.exe"; - chromedriverExecutable = classLoader.getResource("chromedriver/windows/chromedriver.exe"); - } - String errmsg = "cannot find chromedriver executable"; - String chromedriverExecutablePath = null; - if (chromedriverExecutable == null) { - System.err.println(errmsg); - Assert.fail(errmsg); - } else { - chromedriverExecutablePath = chromedriverExecutable.getPath(); - // This ugly bit checks to see if the chromedriver file is inside a - // jar, and if so - // uses VFS to extract it to a temp directory. - if (chromedriverExecutablePath.contains(".jar!")) { - FileObject chromedriver_vfs; - try { - chromedriver_vfs = VFS.getManager().resolveFile( - chromedriverExecutable.toExternalForm()); - File chromedriver_fs = new File(FileUtils.getTempDirectory(), - chromedriverExecutableFilename); - FileObject chromedriverUnzipped = VFS.getManager().toFileObject(chromedriver_fs); - chromedriverUnzipped.delete(); - chromedriverUnzipped.copyFrom(chromedriver_vfs, new AllFileSelector()); - chromedriverExecutablePath = chromedriver_fs.getPath(); - if (!SystemUtils.IS_OS_WINDOWS) { - chromedriver_fs.setExecutable(true); - } - } catch (FileSystemException e) { - System.err.println(errmsg + ": " + e); - e.printStackTrace(); - Assert.fail(errmsg + ": " + e); - } - } - } - System.setProperty(ChromeDriverService.CHROME_DRIVER_EXE_PROPERTY, - chromedriverExecutablePath); String chromedriverFilesDir = "target/chromedriverlogs"; try { FileUtils.forceMkdir(new File(chromedriverFilesDir)); diff --git a/qaframework-bdd-tests/src/test/resources/chromedriver/linux/chromedriver b/qaframework-bdd-tests/src/test/resources/chromedriver/linux/chromedriver deleted file mode 100644 index 43b631c22..000000000 Binary files a/qaframework-bdd-tests/src/test/resources/chromedriver/linux/chromedriver and /dev/null differ diff --git a/qaframework-bdd-tests/src/test/resources/chromedriver/mac/chromedriver b/qaframework-bdd-tests/src/test/resources/chromedriver/mac/chromedriver deleted file mode 100644 index 773d06dd6..000000000 Binary files a/qaframework-bdd-tests/src/test/resources/chromedriver/mac/chromedriver and /dev/null differ diff --git a/qaframework-bdd-tests/src/test/resources/chromedriver/windows/chromedriver.exe b/qaframework-bdd-tests/src/test/resources/chromedriver/windows/chromedriver.exe deleted file mode 100644 index 10036f1ef..000000000 Binary files a/qaframework-bdd-tests/src/test/resources/chromedriver/windows/chromedriver.exe and /dev/null differ diff --git a/qaframework-bdd-tests/src/test/resources/firefoxdriver/linux/geckodriver b/qaframework-bdd-tests/src/test/resources/firefoxdriver/linux/geckodriver deleted file mode 100644 index 01800b4db..000000000 Binary files a/qaframework-bdd-tests/src/test/resources/firefoxdriver/linux/geckodriver and /dev/null differ diff --git a/qaframework-bdd-tests/src/test/resources/firefoxdriver/mac/geckodriver b/qaframework-bdd-tests/src/test/resources/firefoxdriver/mac/geckodriver deleted file mode 100755 index 87916370f..000000000 Binary files a/qaframework-bdd-tests/src/test/resources/firefoxdriver/mac/geckodriver and /dev/null differ diff --git a/qaframework-bdd-tests/src/test/resources/firefoxdriver/windows/geckodriver.exe b/qaframework-bdd-tests/src/test/resources/firefoxdriver/windows/geckodriver.exe deleted file mode 100644 index a01047673..000000000 Binary files a/qaframework-bdd-tests/src/test/resources/firefoxdriver/windows/geckodriver.exe and /dev/null differ diff --git a/qaframework-bdd-tests/src/test/resources/org/openmrs/uitestframework/test-bamboo.properties b/qaframework-bdd-tests/src/test/resources/org/openmrs/uitestframework/test-bamboo.properties index e657e1fe5..5cc5c9fc5 100644 --- a/qaframework-bdd-tests/src/test/resources/org/openmrs/uitestframework/test-bamboo.properties +++ b/qaframework-bdd-tests/src/test/resources/org/openmrs/uitestframework/test-bamboo.properties @@ -4,5 +4,4 @@ login.password=Admin123 login.location=Pharmacy webdriver=chrome headless=true -webdriver.gecko.driver=firefoxdriver/linux/geckodriver includes.csrftoken=true diff --git a/qaframework-bdd-tests/src/test/resources/org/openmrs/uitestframework/test-local-chrome.properties b/qaframework-bdd-tests/src/test/resources/org/openmrs/uitestframework/test-local-chrome.properties index 3998353ff..b8a245478 100644 --- a/qaframework-bdd-tests/src/test/resources/org/openmrs/uitestframework/test-local-chrome.properties +++ b/qaframework-bdd-tests/src/test/resources/org/openmrs/uitestframework/test-local-chrome.properties @@ -6,5 +6,4 @@ webdriver=chrome login.auto=false headless=true db.host=openmrs -webdriver.chrome.driver=chromedriver/linux/chromedriver includes.csrftoken=true diff --git a/qaframework-bdd-tests/src/test/resources/org/openmrs/uitestframework/test-local-firefox.properties b/qaframework-bdd-tests/src/test/resources/org/openmrs/uitestframework/test-local-firefox.properties index 45da0584c..5128aa864 100644 --- a/qaframework-bdd-tests/src/test/resources/org/openmrs/uitestframework/test-local-firefox.properties +++ b/qaframework-bdd-tests/src/test/resources/org/openmrs/uitestframework/test-local-firefox.properties @@ -6,5 +6,4 @@ webdriver=firefox login.auto=false headless=true db.host=openmrs -webdriver.gecko.driver=firefoxdriver/linux/geckodriver includes.csrftoken=true diff --git a/qaframework-bdd-tests/src/test/resources/org/openmrs/uitestframework/test.properties b/qaframework-bdd-tests/src/test/resources/org/openmrs/uitestframework/test.properties index 43273ed66..5cc5c9fc5 100644 --- a/qaframework-bdd-tests/src/test/resources/org/openmrs/uitestframework/test.properties +++ b/qaframework-bdd-tests/src/test/resources/org/openmrs/uitestframework/test.properties @@ -4,5 +4,4 @@ login.password=Admin123 login.location=Pharmacy webdriver=chrome headless=true -webdriver.gecko.driver=firefoxdriver/linux/geckodriver -includes.csrftoken=true \ No newline at end of file +includes.csrftoken=true