Merge pull request #187 from radiantly/fix-query

fix: use correct class name and id selector in query()

Author: thalissonvs

pydoll/elements/mixins/find_elements_mixin.py

@@ -1,5 +1,4 @@
 import asyncio
-import re
 from typing import TYPE_CHECKING, Optional, TypeVar, Union
 
 from pydoll.commands import (
@@ -352,18 +351,11 @@ def _get_expression_type(expression: str) -> By:
         Auto-detect selector type from expression syntax.
 
         Patterns:
-        - XPath: starts with //, .// , ./, or /
-        - ID: starts with #
-        - Class: starts with . (but not ./)
+        - XPath: starts with ./, or /
         - Default: CSS_SELECTOR
         """
-        xpath_pattern = r'^(//|\.//|\.\/|/)'
-        if re.match(xpath_pattern, expression):
+        if expression.startswith('./') or expression.startswith('/'):
             return By.XPATH
-        if expression.startswith('#'):
-            return By.ID
-        if expression.startswith('.') and not expression.startswith('./'):
-            return By.CLASS_NAME
 
         return By.CSS_SELECTOR
 
@@ -435,7 +427,7 @@ def _get_find_elements_command(self, by: By, value: str, object_id: str = ''):
             case _:
                 selector = escaped_value
         if object_id and not by == By.XPATH:
-            script = Scripts.RELATIVE_QUERY_SELECTOR_ALL.replace('{selector}', escaped_value)
+            script = Scripts.RELATIVE_QUERY_SELECTOR_ALL.replace('{selector}', selector)
             command = RuntimeCommands.call_function_on(
                 function_declaration=script,
                 object_id=object_id,

tests/test_find_elements_mixin.py

@@ -168,19 +168,6 @@ def test_xpath_single_slash(self):
         """Test XPath detection with single slash."""
         assert FindElementsMixin._get_expression_type('/html/body') == By.XPATH
 
-    def test_id_selector(self):
-        """Test ID selector detection."""
-        assert FindElementsMixin._get_expression_type('#main-content') == By.ID
-
-    def test_class_selector(self):
-        """Test class selector detection."""
-        assert FindElementsMixin._get_expression_type('.btn-primary') == By.CLASS_NAME
-
-    def test_class_selector_not_xpath(self):
-        """Test that class selector doesn't conflict with XPath dot slash."""
-        assert FindElementsMixin._get_expression_type('.button') == By.CLASS_NAME
-        assert FindElementsMixin._get_expression_type('./button') == By.XPATH
-
     def test_css_selector_default(self):
         """Test CSS selector as default."""
         assert FindElementsMixin._get_expression_type('div.content > p') == By.CSS_SELECTOR
@@ -192,6 +179,11 @@ def test_css_selector_attribute(self):
     def test_css_selector_pseudo_class(self):
         """Test CSS selector with pseudo-classes."""
         assert FindElementsMixin._get_expression_type('button:hover') == By.CSS_SELECTOR
+    
+    def test_css_selector_not_xpath(self):
+        """Test that css selector doesn't conflict with XPath dot slash."""
+        assert FindElementsMixin._get_expression_type('.button') == By.CSS_SELECTOR
+        assert FindElementsMixin._get_expression_type('./button') == By.XPATH
 
     def test_complex_xpath_expressions(self):
         """Test complex XPath expressions are detected correctly."""
@@ -208,12 +200,6 @@ def test_edge_case_expressions(self):
         """Test edge case expressions."""
         # Empty string should default to CSS
         assert FindElementsMixin._get_expression_type('') == By.CSS_SELECTOR
-        
-        # Just a dot should be class selector
-        assert FindElementsMixin._get_expression_type('.') == By.CLASS_NAME
-        
-        # Just a hash should be ID selector
-        assert FindElementsMixin._get_expression_type('#') == By.ID
 
 
 class TestEnsureRelativeXPath: