some more fixes

HtmlUnit · Nov 20, 2024 · abeae64 · abeae64
1 parent 13a3732
commit abeae64
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 2 deletions.
diff --git a/src/main/java/org/htmlunit/javascript/host/MimeTypeArray.java b/src/main/java/org/htmlunit/javascript/host/MimeTypeArray.java
@@ -79,6 +79,18 @@ protected Object getWithPreemption(final String name) {
         return NOT_FOUND;
     }
 
+    /**
+     * {@inheritDoc}.
+     */
+    @Override
+    public boolean has(final String name, final Scriptable start) {
+        if (NOT_FOUND != getWithPreemption(name)) {
+            return true;
+        }
+
+        return super.has(name, start);
+    }
+
     /**
      * Returns the element at the specified index, or {@code null} if the index is invalid.
      * {@inheritDoc}

diff --git a/src/main/java/org/htmlunit/javascript/host/Plugin.java b/src/main/java/org/htmlunit/javascript/host/Plugin.java
@@ -101,14 +101,14 @@ protected Object getWithPreemption(final String name) {
      * {@inheritDoc}
      */
     @Override
-    public final MimeType get(final int index, final Scriptable start) {
+    public final Object get(final int index, final Scriptable start) {
         final Plugin plugin = (Plugin) start;
         final List<MimeType> elements = plugin.elements_;
 
         if (index >= 0 && index < elements.size()) {
             return elements.get(index);
         }
-        return null;
+        return NOT_FOUND;
     }
 
     /**

diff --git a/src/main/java/org/htmlunit/javascript/host/PluginArray.java b/src/main/java/org/htmlunit/javascript/host/PluginArray.java
@@ -73,6 +73,18 @@ protected Object getWithPreemption(final String name) {
         return NOT_FOUND;
     }
 
+    /**
+     * {@inheritDoc}.
+     */
+    @Override
+    public boolean has(final String name, final Scriptable start) {
+        if (NOT_FOUND != getWithPreemption(name)) {
+            return true;
+        }
+
+        return super.has(name, start);
+    }
+
     /**
      * Returns the element at the specified index, or {@code null} if the index is invalid.
      * {@inheritDoc}

diff --git a/src/test/java/org/htmlunit/javascript/host/MimeTypeTest.java b/src/test/java/org/htmlunit/javascript/host/MimeTypeTest.java
@@ -56,6 +56,24 @@ public void mimeType() throws Exception {
         loadPageVerifyTitle2(html);
     }
 
+    /**
+     * @throws Exception if the test fails
+     */
+    @Test
+    @Alerts({"true", "false"})
+    public void in() throws Exception {
+        final String html = "<html><head><script>\n"
+            + LOG_TITLE_FUNCTION
+            + "function test() {\n"
+            + "  log('application/pdf' in navigator.mimeTypes);\n"
+            + "  log('pdf' in navigator.mimeTypes);\n"
+            + "}\n"
+            + "</script></head>\n"
+            + "<body onload='test()'></body></html>";
+
+        loadPageVerifyTitle2(html);
+    }
+
     /**
      * Tests default configuration of Pdf plugin.
      * @throws Exception if the test fails