fix tests

Author: oliverb123

posthog/scopes.py

@@ -1,7 +1,6 @@
 import contextvars
 from contextlib import contextmanager
 from typing import Any, Callable, Dict, TypeVar, cast
-from posthog import capture_exception
 
 _context_stack: contextvars.ContextVar[list] = contextvars.ContextVar("posthog_context_stack", default=[{}])
 
@@ -26,13 +25,16 @@ def new_context():
             raise ValueError("Something went wrong")
 
     """
+    import posthog
+
     current_stack = _context_stack.get()
     new_stack = current_stack + [{}]
     token = _context_stack.set(new_stack)
+
     try:
         yield
     except Exception as e:
-        capture_exception(e)
+        posthog.capture_exception(e)
         raise
     finally:
         _context_stack.reset(token)
@@ -95,5 +97,4 @@ def wrapper(*args, **kwargs):
         with new_context():
             return func(*args, **kwargs)
 
-
     return cast(F, wrapper)

posthog/test/test_scopes.py

@@ -84,6 +84,13 @@ def successful_function(x, y):
     def test_scoped_decorator_exception(self, mock_capture):
         test_exception = ValueError("Test exception")
 
+        def check_context_on_capture(exception, **kwargs):
+            # Assert tags are available when capture_exception is called
+            current_tags = get_tags()
+            self.assertEqual(current_tags.get("important_context"), "value")
+
+        mock_capture.side_effect = check_context_on_capture
+
         @scoped
         def failing_function():
             tag("important_context", "value")
@@ -93,15 +100,8 @@ def failing_function():
         with self.assertRaises(ValueError):
             failing_function()
 
-        # Exception should be captured with context
-        mock_capture.assert_called_once()
-        args, kwargs = mock_capture.call_args
-
-        # Check that the exception was passed
-        self.assertEqual(args[0], test_exception)
-
-        # Check that the context was included in properties
-        self.assertEqual(kwargs.get("properties", {}).get("important_context"), "value")
+        # Verify capture_exception was called
+        mock_capture.assert_called_once_with(test_exception)
 
         # Context should be cleared after function execution
         self.assertEqual(get_tags(), {})
@@ -110,6 +110,13 @@ def failing_function():
     def test_new_context_exception_handling(self, mock_capture):
         test_exception = RuntimeError("Context exception")
 
+        def check_context_on_capture(exception, **kwargs):
+            # Assert inner context tags are available when capture_exception is called
+            current_tags = get_tags()
+            self.assertEqual(current_tags.get("inner_context"), "inner_value")
+
+        mock_capture.side_effect = check_context_on_capture
+
         # Set up outer context
         tag("outer_context", "outer_value")
 
@@ -120,15 +127,8 @@ def test_new_context_exception_handling(self, mock_capture):
         except RuntimeError:
             pass  # Expected exception
 
-        # Exception should be captured with inner context
-        mock_capture.assert_called_once()
-        args, kwargs = mock_capture.call_args
-
-        # Check that the exception was passed
-        self.assertEqual(args[0], test_exception)
-
-        # Check that the inner context was included in properties
-        self.assertEqual(kwargs.get("properties", {}).get("inner_context"), "inner_value")
+        # Verify capture_exception was called
+        mock_capture.assert_called_once_with(test_exception)
 
         # Outer context should still be intact
-        self.assertEqual(get_tags()["outer_context"], "outer_value")
+        self.assertEqual(get_tags()["outer_context"], "outer_value")