Merge pull request #71 from nickebbutt/master

Upgrade to latest selenium libraries, update docs
Chorus-bdd · Dec 11, 2023 · a5ef888 · a5ef888
2 parents abece7b + 27e2e81
commit a5ef888
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 7 deletions.
diff --git a/extensions/chorus-selenium/build.gradle b/extensions/chorus-selenium/build.gradle
@@ -4,10 +4,10 @@ description = "chorus-selenium"
 
 dependencies {
 
-    implementation group: 'org.seleniumhq.selenium', name: 'selenium-firefox-driver', version: '4.8.3'
-    implementation group: 'org.seleniumhq.selenium', name: 'selenium-chrome-driver', version: '4.8.3'
-    implementation group: 'org.seleniumhq.selenium', name: 'selenium-edge-driver', version: '4.8.3'
-    implementation group: 'org.seleniumhq.selenium', name: 'selenium-support', version: '4.8.3'
+    implementation group: 'org.seleniumhq.selenium', name: 'selenium-firefox-driver', version: '4.16.1'
+    implementation group: 'org.seleniumhq.selenium', name: 'selenium-chrome-driver', version: '4.16.1'
+    implementation group: 'org.seleniumhq.selenium', name: 'selenium-edge-driver', version: '4.16.1'
+    implementation group: 'org.seleniumhq.selenium', name: 'selenium-support', version: '4.16.1'
     implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.17.1'
 
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'

diff --git a/...selenium/src/main/java/org/chorusbdd/chorus/selenium/manager/DefaultWebDriverFactory.java b/...selenium/src/main/java/org/chorusbdd/chorus/selenium/manager/DefaultWebDriverFactory.java
@@ -88,7 +88,6 @@ public WebDriver createWebDriver(SeleniumConfig seleniumConfig) {
                         "",   //can't configure version yet
                         Platform.ANY  //can't configure platform yet
                 );
-                capabilities.setJavascriptEnabled(true);
                 Level logLevel = getJavaInfoLogLevel(seleniumConfig);
                 URL url = getRemoteWebDriverURL(seleniumConfig.getRemoteWebDriverURL());
                 RemoteWebDriver remoteWebDriver = new RemoteWebDriver(url, capabilities);

diff --git a/integrationtest/build.gradle b/integrationtest/build.gradle
@@ -16,7 +16,7 @@ sourceSets {
 dependencies {
     testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.17.1'
     testRuntimeOnly group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.17.1'
-    testImplementation group: 'org.seleniumhq.selenium', name: 'selenium-support', version: '4.8.3'
+    testImplementation group: 'org.seleniumhq.selenium', name: 'selenium-support', version: '4.16.1'
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'
     testImplementation group: 'org.apache.derby', name: 'derby', version: '10.15.2.0'
     testImplementation group: 'javax.annotation', name: 'jsr250-api', version: '1.0'

diff --git a/...test/java/org/chorusbdd/chorus/selftest/selenium/customdriver/CustomWebDriverFactory.java b/...test/java/org/chorusbdd/chorus/selftest/selenium/customdriver/CustomWebDriverFactory.java
@@ -23,6 +23,7 @@
  */
 package org.chorusbdd.chorus.selftest.selenium.customdriver;
 
+import org.chorusbdd.chorus.selenium.config.DriverLogLevel;
 import org.chorusbdd.chorus.selenium.config.SeleniumConfig;
 import org.chorusbdd.chorus.selenium.config.SeleniumConfigBean;
 import org.chorusbdd.chorus.selenium.config.SeleniumDriverType;
@@ -51,6 +52,7 @@ public WebDriver createWebDriver(SeleniumConfig seleniumConfig) {
         //create a chrome config to permit a driver to be created in superclass
         SeleniumConfigBean seleniumConfigBean = new SeleniumConfigBean();
         seleniumConfigBean.setDriverType(SeleniumDriverType.CHROME);
+        seleniumConfigBean.setDriverLogLevel(DriverLogLevel.OFF);
         return super.createWebDriver(seleniumConfigBean);
     }
 

diff --git a/site/chorus-website/build.gradle b/site/chorus-website/build.gradle
@@ -28,4 +28,6 @@ task updatePageLinks(group: 'chorus-website', type: JavaExec) {
 
 updatePageLinks.dependsOn(generatePages)
 
-build.finalizedBy(updatePageLinks)
+build {
+    finalizedBy(updatePageLinks)
+}
diff --git a/site/chorus-website/site/pages/BuiltInHandlers/Selenium/SeleniumHandlerDetails.md b/site/chorus-website/site/pages/BuiltInHandlers/Selenium/SeleniumHandlerDetails.md
@@ -228,5 +228,12 @@ See [Chorus JS](/pages/DistributedTesting/ChorusJS)
         <td>SCENARIO</td>
         <td>One of: SCENARIO, FEATURE</td>
     </tr>
+    <tr>
+        <td>driverLogLevel</td>
+        <td>no</td>
+        <td>Desired log level for the selenium web driver, an attempt will be made to configure this level if the driver supports it</td>
+        <td>OFF</td>
+        <td>One of: ALL, INFO, DEBUG, WARNING, SEVERE, OFF</td>
+    </tr>
 
 </table>