detailed tests

Author: willmcgugan

src/textual/_animator.py

@@ -458,7 +458,7 @@ def _animate(
 
         if (current_animation := self._animations.get(animation_key)) is not None:
             if (on_complete := current_animation.on_complete) is not None:
-                on_complete()
+                self.app.call_later(on_complete)
 
         self._animations[animation_key] = animation
         self._timer.resume()

tests/test_animation.py

@@ -213,35 +213,89 @@ async def test_cancel_widget_non_animation() -> None:
         assert not pilot.app.animator.is_being_animated(widget, "counter")
 
 
-async def test_double_animation_on_complete() -> None:
-    """Test that animating an attribute a second time, fires its `on_complete` callback."""
+async def test_double_animation_same_value_on_complete() -> None:
+    """Test that animating an attribute a second time to the same value, fires its `on_complete` callback."""
 
-    complete_count = 0
+    completed: list[str] = []
 
     class AnimApp(App):
         x = var(0)
 
-        def on_key(self) -> None:
+        async def animate_a(self) -> None:
 
             def on_complete() -> None:
-                nonlocal complete_count
-                complete_count += 1
+                completed.append("a")
 
             self.animator.animate(
                 self,
                 "x",
-                100 + complete_count,
+                100,
+                duration=0.1,
+                on_complete=on_complete,
+            )
+
+        async def animate_b(self) -> None:
+
+            def on_complete() -> None:
+                completed.append("b")
+
+            self.animator.animate(
+                self,
+                "x",
+                100,
+                duration=0.1,
+                on_complete=on_complete,
+            )
+
+    app = AnimApp()
+    async with app.run_test() as pilot:
+        await app.animate_a()
+        assert app.x != 100
+        await app.animate_b()
+        await pilot.wait_for_animation()
+        assert completed == ["a", "b"]
+        assert app.x == 100
+
+
+async def test_double_animation_different_value_on_complete() -> None:
+    """Test that animating an attribute a second time to a different value, fires its `on_complete` callback."""
+
+    completed: list[str] = []
+
+    class AnimApp(App):
+        x = var(0)
+
+        async def animate_a(self) -> None:
+
+            def on_complete() -> None:
+                completed.append("a")
+
+            self.animator.animate(
+                self,
+                "x",
+                100,
+                duration=0.1,
+                on_complete=on_complete,
+            )
+
+        async def animate_b(self) -> None:
+
+            def on_complete() -> None:
+                completed.append("b")
+
+            self.animator.animate(
+                self,
+                "x",
+                101,
                 duration=0.1,
                 on_complete=on_complete,
             )
 
     app = AnimApp()
     async with app.run_test() as pilot:
-        # Press space twice to initiate 2 animations
-        await pilot.press("space")
-        await pilot.press("space")
-        # Wait for animations to complete
+        await app.animate_a()
+        assert app.x != 101
+        await app.animate_b()  # animate to different value
         await pilot.wait_for_animation()
-        # Check that on_complete callback was invoked twice
-        assert complete_count == 2
+        assert completed == ["a", "b"]
         assert app.x == 101