Merge pull request #7 from sbabcoc/pr/fix-standalone-grid

Fix standalone grid operation

Author: sbabcoc

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>com.nordstrom.ui-tools</groupId>
   <artifactId>htmlunit-remote</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>4.22.0-SNAPSHOT</version>
 
   <name>htmlunit-remote</name>
 
@@ -15,7 +15,7 @@
     <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
-    <selenium.version>4.21.0</selenium.version>
+    <selenium.version>4.22.0</selenium.version>
     <checkstyle.version>10.15.0</checkstyle.version>
     <spotbugs.version>4.8.4</spotbugs.version>
     <archunit.version>1.3.0</archunit.version>
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>org.seleniumhq.selenium</groupId>
       <artifactId>htmlunit3-driver</artifactId>
-      <version>4.21.0-SNAPSHOT</version>
+      <version>4.22.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -169,17 +169,17 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
         <version>3.7.1</version>
+        <configuration>
+          <descriptors>
+            <descriptor>src/assembly/assembly.xml</descriptor>
+          </descriptors>
+        </configuration>
         <executions>
           <execution>
             <phase>package</phase>
             <goals>
               <goal>single</goal>
             </goals>
-            <configuration>
-              <descriptorRefs>
-                <descriptorRef>jar-with-dependencies</descriptorRef>
-              </descriptorRefs>
-            </configuration>
           </execution>
         </executions>
       </plugin>

src/assembly/assembly.xml

@@ -0,0 +1,42 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd">
+  <id>jar-with-deps</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+      <unpack>true</unpack>
+      <scope>runtime</scope>
+      <includes>
+        <include>com.nordstrom.ui-tools:htmlunit-remote</include>
+        <include>org.seleniumhq.selenium:htmlunit3-driver</include>
+        <include>org.htmlunit:htmlunit</include>
+        <include>org.apache.httpcomponents:httpmime</include>
+        <include>org.apache.httpcomponents:httpclient</include>
+        <include>org.apache.httpcomponents:httpcore</include>
+        <include>org.htmlunit:htmlunit-core-js</include>
+        <include>org.htmlunit:neko-htmlunit</include>
+        <include>org.htmlunit:htmlunit-cssparser</include>
+        <include>org.htmlunit:htmlunit-xpath</include>
+        <include>org.htmlunit:htmlunit-csp</include>
+        <include>org.htmlunit:htmlunit-websocket-client</include>
+        <include>org.apache.commons:commons-lang3</include>
+        <include>org.apache.commons:commons-text</include>
+        <include>commons-io:commons-io</include>
+        <include>commons-logging:commons-logging</include>
+        <include>commons-net:commons-net</include>
+        <include>commons-codec:commons-codec</include>
+        <include>org.brotli:dec</include>
+      </includes>
+    </dependencySet>
+  </dependencySets>
+  <containerDescriptorHandlers>
+    <containerDescriptorHandler>
+      <handlerName>metaInf-services</handlerName>
+    </containerDescriptorHandler>
+  </containerDescriptorHandlers>
+</assembly>

src/main/java/org/openqa/selenium/htmlunit/remote/HtmlUnitDriverService.java

@@ -24,6 +24,7 @@
 import java.time.Duration;
 import java.util.List;
 import java.util.Map;
+
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.grid.config.MapConfig;

src/main/java/org/openqa/selenium/htmlunit/remote/HtmlUnitSlotMatcher.java

@@ -0,0 +1,32 @@
+package org.openqa.selenium.htmlunit.remote;
+
+import java.io.Serializable;
+import org.openqa.selenium.Capabilities;
+import org.openqa.selenium.grid.data.SlotMatcher;
+import org.openqa.selenium.remote.Browser;
+
+public class HtmlUnitSlotMatcher implements SlotMatcher, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public boolean matches(Capabilities stereotype, Capabilities capabilities) {
+
+        if (capabilities.asMap().isEmpty()) {
+            return false;
+        }
+
+        if (!managedDownloadsEnabled(stereotype, capabilities)) {
+            return false;
+        }
+        
+        return Browser.HTMLUNIT.is(capabilities);
+    }
+
+    private Boolean managedDownloadsEnabled(Capabilities stereotype, Capabilities capabilities) {
+        if (!Boolean.parseBoolean(String.valueOf(capabilities.getCapability("se:downloadsEnabled")))) {
+            return true;
+        }
+        return Boolean.parseBoolean(String.valueOf(stereotype.getCapability("se:downloadsEnabled")));
+    }
+}

src/test/java/org/openqa/selenium/htmlunit/remote/HtmlUnitDriverRemoteContextTest.java

@@ -147,7 +147,7 @@ public void shouldBeAbleToGetWindowRect() {
         assertEquals("Failed getting window rect", HTTP_OK, response.getStatus());
         Map<String, Object> windowRect = extractMap(response);
         assertEquals("Window width", 1272L, windowRect.get("width"));
-        assertEquals("Window height", 753L, windowRect.get("height"));
+        assertEquals("Window height", 752L, windowRect.get("height"));
         assertEquals("Window 'x' position", 0L, windowRect.get("x"));
         assertEquals("Window 'y' position", 0L, windowRect.get("y"));
     }
@@ -172,7 +172,7 @@ public void shouldBeAbleToMaximizeWindow() {
         assertEquals("Failed maximizing window", HTTP_OK, response.getStatus());
         Map<String, Object> windowRect = extractMap(response);
         assertEquals("Window width", 1272L, windowRect.get("width"));
-        assertEquals("Window height", 753L, windowRect.get("height"));
+        assertEquals("Window height", 752L, windowRect.get("height"));
         assertEquals("Window 'x' position", 0L, windowRect.get("x"));
         assertEquals("Window 'y' position", 0L, windowRect.get("y"));
     }
@@ -183,7 +183,7 @@ public void shouldBeAbleToFullscreenWindow() {
         assertEquals("Failed maximizing window", HTTP_OK, response.getStatus());
         Map<String, Object> windowRect = extractMap(response);
         assertEquals("Window width", 1272L, windowRect.get("width"));
-        assertEquals("Window height", 753L, windowRect.get("height"));
+        assertEquals("Window height", 752L, windowRect.get("height"));
         assertEquals("Window 'x' position", 0L, windowRect.get("x"));
         assertEquals("Window 'y' position", 0L, windowRect.get("y"));
     }