Improve tests after merge from main

Author: WilliamBergamin

tests/scenario_tests/test_events_assistant.py

@@ -1,4 +1,6 @@
 import time
+from time import sleep
+from typing import Callable
 
 from slack_sdk.web import WebClient
 
@@ -187,23 +189,15 @@ def handle_bot_message():
         assert response.status == 404
         assert called["value"] is False
 
-    def test_assistant_threads_with_custom_listener_middleware(self):
+    def test_assistant_with_custom_listener_middleware(self):
         app = App(client=self.web_client)
         assistant = Assistant()
-
-        state = {"called": False, "middleware_called": False}
-
-        def assert_target_called():
-            count = 0
-            while state["called"] is False and count < 20:
-                sleep(0.1)
-                count += 1
-            assert state["called"] is True
-            state["called"] = False
+        handler_called = {"value": False}
+        middleware_called = {"value": False}
 
         class TestMiddleware(Middleware):
             def process(self, *, req: BoltRequestType, resp: BoltResponse, next: Callable[[], BoltResponse]):
-                state["middleware_called"] = True
+                middleware_called["value"] = True
                 # Verify assistant utilities are available
                 assert req.context.get("set_status") is not None
                 assert req.context.get("set_title") is not None
@@ -213,139 +207,53 @@ def process(self, *, req: BoltRequestType, resp: BoltResponse, next: Callable[[]
                 return next()
 
         @assistant.thread_started(middleware=[TestMiddleware()])
-        def start_thread(say: Say, set_suggested_prompts: SetSuggestedPrompts, context: BoltContext):
-            assert context.channel_id == "D111"
-            assert context.thread_ts == "1726133698.626339"
-            assert say.thread_ts == context.thread_ts
-            say("Hi, how can I help you today?")
-            set_suggested_prompts(prompts=[{"title": "What does SLACK stand for?", "message": "What does SLACK stand for?"}])
-            state["called"] = True
+        def start_thread():
+            handler_called["value"] = True
 
         @assistant.user_message(middleware=[TestMiddleware()])
-        def handle_user_message(say: Say, set_status: SetStatus, context: BoltContext):
-            assert context.channel_id == "D111"
-            assert context.thread_ts == "1726133698.626339"
-            assert say.thread_ts == context.thread_ts
-            set_status("is typing...")
-            say("Here you are!")
-            state["called"] = True
+        def handle_user_message():
+            handler_called["value"] = True
 
         app.assistant(assistant)
 
         request = BoltRequest(body=thread_started_event_body, mode="socket_mode")
         response = app.dispatch(request)
         assert response.status == 200
-        assert_target_called()
-        assert state["middleware_called"] is True
-        state["middleware_called"] = False
-
-        request = BoltRequest(body=user_message_event_body, mode="socket_mode")
-        response = app.dispatch(request)
-        assert response.status == 200
-        assert_target_called()
-        assert state["middleware_called"] is True
+        assert_target_called(handler_called)
+        assert_target_called(middleware_called)
 
-    def test_assistant_events_without_assistant_middleware(self):
-        app = App(client=self.web_client)
-
-        state = {"called": False}
-
-        def assert_target_called():
-            count = 0
-            while state["called"] is False and count < 20:
-                sleep(0.1)
-                count += 1
-            assert state["called"] is True
-            state["called"] = False
-
-        @app.event("assistant_thread_started")
-        def start_thread(say: Say, set_suggested_prompts: SetSuggestedPrompts, set_status: SetStatus, context: BoltContext):
-            assert context.channel_id == "D111"
-            assert context.thread_ts == "1726133698.626339"
-            assert say.thread_ts == context.thread_ts
-            assert set_status is not None
-            assert set_suggested_prompts is not None
-            assert context.get("set_title") is not None
-            assert context.get("get_thread_context") is not None
-            assert context.get("save_thread_context") is not None
-            say("Hi, how can I help you today?")
-            state["called"] = True
-
-        @app.message()
-        def handle_user_message(say: Say, set_status: SetStatus, context: BoltContext):
-            assert context.channel_id == "D111"
-            assert context.thread_ts == "1726133698.626339"
-            assert say.thread_ts == context.thread_ts
-            try:
-                set_status("is typing...")
-                say("Here you are!")
-                state["called"] = True
-            except Exception as e:
-                say(f"Oops, something went wrong (error: {e}")
-
-        request = BoltRequest(body=thread_started_event_body, mode="socket_mode")
-        response = app.dispatch(request)
-        assert response.status == 200
-        assert_target_called()
+        handler_called = {"value": False}
+        middleware_called = {"value": False}
 
         request = BoltRequest(body=user_message_event_body, mode="socket_mode")
         response = app.dispatch(request)
         assert response.status == 200
-        assert_target_called()
+        assert_target_called(handler_called)
+        assert_target_called(middleware_called)
 
-        # Non-assistant events should not get kwargs injected
-        request = BoltRequest(body=channel_user_message_event_body, mode="socket_mode")
-        response = app.dispatch(request)
-        assert response.status == 200
-
-    def test_assistant_events_kwargs_disabled(self):
-        app = App(client=self.web_client, attaching_agent_kwargs_enabled=False)
-
-        state = {"called": False}
-
-        def assert_target_called():
-            count = 0
-            while state["called"] is False and count < 20:
-                sleep(0.1)
-                count += 1
-            assert state["called"] is True
-            state["called"] = False
-
-        @app.event("assistant_thread_started")
-        def start_thread(context: BoltContext):
-            assert context.get("set_status") is None
-            assert context.get("set_title") is None
-            assert context.get("set_suggested_prompts") is None
-            assert context.get("get_thread_context") is None
-            assert context.get("save_thread_context") is None
-            state["called"] = True
-
-        request = BoltRequest(body=thread_started_event_body, mode="socket_mode")
-        response = app.dispatch(request)
-        assert response.status == 200
-        assert_target_called()
-
-    def test_assistant_threads_custom_middleware_can_short_circuit(self):
+    def test_assistant_custom_middleware_can_short_circuit(self):
         app = App(client=self.web_client)
         assistant = Assistant()
-
-        state = {"handler_called": False}
+        handler_called = {"value": False}
+        middleware_called = {"value": False}
 
         class BlockingMiddleware(Middleware):
             def process(self, *, req: BoltRequestType, resp: BoltResponse, next: Callable[[], BoltResponse]):
+                middleware_called["value"] = True
                 # Intentionally not calling next() to short-circuit
                 return BoltResponse(status=200)
 
         @assistant.thread_started(middleware=[BlockingMiddleware()])
         def start_thread(say: Say, context: BoltContext):
-            state["handler_called"] = True
+            handler_called["value"] = True
 
         app.assistant(assistant)
 
         request = BoltRequest(body=thread_started_event_body, mode="socket_mode")
         response = app.dispatch(request)
         assert response.status == 200
-        assert state["handler_called"] is False
+        assert_target_called(middleware_called)
+        assert handler_called["value"] is False
 
 
 def build_payload(event: dict) -> dict:

tests/scenario_tests/test_events_assistant_without_middleware.py

@@ -178,8 +178,8 @@ def handle_message_event(
             save_thread_context: SaveThreadContext,
             context: BoltContext,
         ):
-            assert context.thread_ts is None
-            assert say.thread_ts == context.thread_ts
+            assert context.thread_ts == "1726133698.626339"
+            assert say.thread_ts == None
             assert set_status is None
             assert set_title is None
             assert set_suggested_prompts is None
@@ -206,8 +206,8 @@ def handle_message_event(
             save_thread_context: SaveThreadContext,
             context: BoltContext,
         ):
-            assert context.thread_ts is None
-            assert say.thread_ts == context.thread_ts
+            assert context.thread_ts == "1726133698.626339"
+            assert say.thread_ts == None
             assert set_status is None
             assert set_title is None
             assert set_suggested_prompts is None
@@ -234,8 +234,8 @@ def handle_message_event(
             save_thread_context: SaveThreadContext,
             context: BoltContext,
         ):
-            assert context.thread_ts is None
-            assert say.thread_ts == context.thread_ts
+            assert context.thread_ts == "1726133698.626339"
+            assert say.thread_ts == None
             assert set_status is None
             assert set_title is None
             assert set_suggested_prompts is None
@@ -247,3 +247,22 @@ def handle_message_event(
         response = app.dispatch(request)
         assert response.status == 200
         assert_target_called(called)
+
+    def test_assistant_events_agent_kwargs_disabled(self):
+        app = App(client=self.web_client, attaching_agent_kwargs_enabled=False)
+
+        called = {"value": False}
+
+        @app.event("assistant_thread_started")
+        def start_thread(context: BoltContext):
+            assert context.get("set_status") is None
+            assert context.get("set_title") is None
+            assert context.get("set_suggested_prompts") is None
+            assert context.get("get_thread_context") is None
+            assert context.get("save_thread_context") is None
+            called["value"] = True
+
+        request = BoltRequest(body=thread_started_event_body, mode="socket_mode")
+        response = app.dispatch(request)
+        assert response.status == 200
+        assert_target_called(called)

tests/scenario_tests_async/test_events_assistant.py

@@ -1,5 +1,6 @@
 import asyncio
 import time
+from typing import Awaitable, Callable, Optional
 
 import pytest
 from slack_sdk.web.async_client import AsyncWebClient
@@ -212,59 +213,6 @@ async def handle_bot_message():
         assert response.status == 404
         assert called["value"] is False
 
-    @pytest.mark.asyncio
-    async def test_assistant_events_without_assistant_middleware(self):
-        app = AsyncApp(client=self.web_client)
-
-        state = {"called": False}
-
-        async def assert_target_called():
-            count = 0
-            while state["called"] is False and count < 20:
-                await asyncio.sleep(0.1)
-                count += 1
-            assert state["called"] is True
-            state["called"] = False
-
-        @app.event("assistant_thread_started")
-        async def start_thread(
-            say: AsyncSay,
-            set_suggested_prompts: AsyncSetSuggestedPrompts,
-            set_status: AsyncSetStatus,
-            context: AsyncBoltContext,
-        ):
-            assert context.channel_id == "D111"
-            assert context.thread_ts == "1726133698.626339"
-            assert say.thread_ts == context.thread_ts
-            assert set_status is not None
-            assert set_suggested_prompts is not None
-            assert context.get("set_title") is not None
-            assert context.get("get_thread_context") is not None
-            assert context.get("save_thread_context") is not None
-            await say("Hi, how can I help you today?")
-            state["called"] = True
-
-        @app.message()
-        async def handle_message(say: AsyncSay, context: AsyncBoltContext):
-            if context.get("set_status") is not None:
-                assert say.thread_ts == context.thread_ts
-                state["called"] = True
-
-        request = AsyncBoltRequest(body=thread_started_event_body, mode="socket_mode")
-        response = await app.async_dispatch(request)
-        assert response.status == 200
-        await assert_target_called()
-
-        request = AsyncBoltRequest(body=user_message_event_body, mode="socket_mode")
-        response = await app.async_dispatch(request)
-        assert response.status == 200
-        await assert_target_called()
-
-        # Non-assistant events should not get kwargs injected
-        request = AsyncBoltRequest(body=channel_user_message_event_body, mode="socket_mode")
-        response = await app.async_dispatch(request)
-        assert response.status == 200
-
     @pytest.mark.asyncio
     async def test_assistant_events_kwargs_disabled(self):
         app = AsyncApp(client=self.web_client, attaching_agent_kwargs_enabled=False)