Merge pull request #47 from dannysigalovich/fix/windows-chrome-paths

fix: support multiple default Chrome paths on each OS

Author: thalissonvs

pydoll/browser/chrome.py

@@ -46,20 +46,25 @@ def _get_default_binary_location():
                 the browser executable is not found at the default location.
         """
         os_name = platform.system()
+
         browser_paths = {
-            'Windows':
+            'Windows': [
                 r'C:\Program Files\Google\Chrome\Application\chrome.exe',
-            'Linux':
+                r'C:\Program Files (x86)\Google\Chrome\Application\chrome.exe',
+            ],
+            'Linux': [
                 '/usr/bin/google-chrome',
-            'Darwin':
-                '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome'
+            ],
+            'Darwin': [
+                '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
+            ]
         }
 
         browser_path = browser_paths.get(os_name)
 
         if not browser_path:
             raise ValueError('Unsupported OS')
 
-        return BrowserOptionsManager.validate_browser_path(
+        return BrowserOptionsManager.validate_browser_paths(
             browser_path
         )

pydoll/browser/managers.py

@@ -275,22 +275,24 @@ def add_default_arguments(options: Options):
         options.arguments.append('--no-default-browser-check')
 
     @staticmethod
-    def validate_browser_path(path: str) -> str:
+    def validate_browser_paths(paths: list[str]) -> str:
         """
         Validates the provided browser executable path.
 
         This method checks if the browser executable file exists at
         the specified path.
 
         Args:
-            path (str): The path to the browser executable.
+            paths (list[str]): Lista de caminhos possíveis do navegador.
+
 
         Returns:
             str: The validated browser path if it exists.
 
         Raises:
             ValueError: If the browser executable is not found at the path.
         """
-        if not os.path.exists(path):
-            raise ValueError(f'Browser not found: {path}')
-        return path
+        for path in paths:
+            if os.path.exists(path) and os.access(path, os.X_OK):
+                return path
+        raise ValueError(f"No valid browser path found in: {paths}")

tests/test_browser_managers.py

@@ -138,13 +138,34 @@ def test_add_default_arguments():
     assert '--no-default-browser-check' in options.arguments
 
 
-def test_validate_browser_path_valid():
-    with patch('os.path.exists', return_value=True):
-        result = BrowserOptionsManager.validate_browser_path('/fake/path')
+def test_validate_browser_paths_valid():
+    with patch('os.path.exists', return_value=True), patch('os.access', return_value=True):
+        result = BrowserOptionsManager.validate_browser_paths(['/fake/path'])
         assert result == '/fake/path'
 
 
-def test_validate_browser_path_invalid():
+def test_validate_browser_paths_invalid():
     with patch('os.path.exists', return_value=False):
         with pytest.raises(ValueError):
-            BrowserOptionsManager.validate_browser_path('/fake/path')
+            BrowserOptionsManager.validate_browser_paths(['/fake/path'])
+
+
+def test_validate_browser_paths_multiple():
+    def fake_exists(path):
+        match path:
+            case "/first/fake/path":
+                return False
+            case "/second/fake/path":
+                return True
+            case _:
+                return False
+
+    def fake_access(path, mode):
+        return path == '/second/fake/path'
+
+    with patch('os.path.exists', side_effect=fake_exists), patch('os.access', side_effect=fake_access):
+        result = BrowserOptionsManager.validate_browser_paths([
+            '/first/fake/path',
+            '/second/fake/path'
+        ])
+        assert result == '/second/fake/path'

tests/test_chrome.py

@@ -360,21 +360,52 @@ async def test__get_valid_page_key_error(mock_browser):
         TargetCommands.create_target(''), timeout=60
     )
 
-@pytest.mark.parametrize('os_name, expected_browser_path', [
-    ('Windows', r'C:\Program Files\Google\Chrome\Application\chrome.exe'),
-    ('Linux', '/usr/bin/google-chrome'),
-    ('Darwin', '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome')
-])
+
+@pytest.mark.parametrize(
+    'os_name, expected_browser_paths, mock_return_value',
+    [
+        (
+                'Windows',
+                [
+                    r'C:\Program Files\Google\Chrome\Application\chrome.exe',
+                    r'C:\Program Files (x86)\Google\Chrome\Application\chrome.exe'
+                ],
+                r'C:\Program Files\Google\Chrome\Application\chrome.exe'
+        ),
+        (
+                'Linux',
+                ['/usr/bin/google-chrome'],
+                '/usr/bin/google-chrome'
+        ),
+        (
+                'Darwin',
+                ['/Applications/Google Chrome.app/Contents/MacOS/Google Chrome'],
+                '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome'
+        ),
+    ]
+)
 @patch('platform.system')
-@patch.object(BrowserOptionsManager, 'validate_browser_path')
-def test__get_default_binary_location(mock_validate_browser_path, mock_platform_system, os_name, expected_browser_path):
+@patch.object(BrowserOptionsManager, 'validate_browser_paths')
+def test__get_default_binary_location(
+        mock_validate_browser_paths,
+        mock_platform_system,
+        os_name,
+        expected_browser_paths,
+        mock_return_value
+):
     mock_platform_system.return_value = os_name
-    mock_validate_browser_path.return_value = expected_browser_path
-
+    mock_validate_browser_paths.return_value = mock_return_value
     path = Chrome._get_default_binary_location()
-    mock_validate_browser_path.assert_called_once_with(expected_browser_path)
+    mock_validate_browser_paths.assert_called_once_with(expected_browser_paths)
+
+    assert path == mock_return_value
+
+
+def test__get_default_binary_location_unsupported_os():
+    with patch('platform.system', return_value='SomethingElse'):
+        with pytest.raises(ValueError, match='Unsupported OS'):
+            Chrome._get_default_binary_location()
 
-    assert path == expected_browser_path
 
 @patch('platform.system')
 def test__get_default_binary_location_throws_exception_if_os_not_supported(mock_platform_system):