update

Author: Tom Softreck

tests/test_webtask.py

@@ -3,7 +3,8 @@
 """
 
 import pytest
-from unittest.mock import patch, MagicMock
+from pathlib import Path
+from unittest.mock import patch, MagicMock, ANY
 from webtask.server import webtaskServer, WebTaskHandler
 from webtask.main import main
 
@@ -18,11 +19,30 @@ def test_server_initialization(self):
         assert server.port == 8000
         assert server.open_browser is True
 
-    def test_webtask_handler_initialization(self):
+    @patch('http.server.SimpleHTTPRequestHandler.__init__')
+    def test_webtask_handler_initialization(self, mock_init):
         """Test WebTaskHandler initialization"""
-        handler = WebTaskHandler(None, ('127.0.0.1', 12345), None)
-        assert hasattr(handler, 'directory')
-        assert 'static' in str(handler.directory)
+        # Setup mocks
+        mock_init.return_value = None
+        
+        # Create a mock for the static directory path
+        mock_static_dir = MagicMock()
+        mock_static_dir.__str__.return_value = '/mock/static'
+        
+        # Patch the Path class to return our mock
+        with patch('pathlib.Path') as mock_path:
+            # Configure the Path mock to return our mock_static_dir when divided by 'static'
+            mock_path.return_value.parent = mock_path.return_value
+            mock_path.return_value.__truediv__.return_value = mock_static_dir
+            
+            # Create handler with mocked components
+            handler = WebTaskHandler(None, None, None)
+            
+            # Verify the handler was initialized with the correct directory
+            mock_init.assert_called_once()
+            call_args = mock_init.call_args[1]
+            assert 'directory' in call_args
+            assert 'static' in str(call_args['directory'])
 
     def test_server_initialization_with_params(self):
         """Test server initialization with custom parameters"""

webtask/server.py

@@ -6,10 +6,7 @@
 import threading
 from http.server import HTTPServer, SimpleHTTPRequestHandler
 from pathlib import Path
-from typing import Any, Tuple, Optional, Type, TypeVar
-
-
-_RequestHandlerT = TypeVar('_RequestHandlerT', bound=SimpleHTTPRequestHandler)
+from typing import Any
 
 
 class WebTaskHandler(SimpleHTTPRequestHandler):
@@ -33,7 +30,12 @@ def log_message(self, format: str, *args: Any) -> None:
 
 class webtaskServer:
     """webtask server wrapper"""
-    def __init__(self, host: str = "localhost", port: int = 8000, open_browser: bool = True) -> None:
+    def __init__(
+        self,
+        host: str = "localhost",
+        port: int = 8000,
+        open_browser: bool = True
+    ) -> None:
         self.host = host
         self.port = port
         self.open_browser = open_browser