Fixed acceptance tests

Author: VitjanZ

render_machine/render_context.py

@@ -468,8 +468,12 @@ def _handle_current_frid_testing(self):
         """Handle incremental testing of the current FRID being implemented."""
         ctx = self.conformance_tests_running_context
 
-        # Initialize acceptance test phase on first run (before checking if tests exist)
-        # This prevents duplicate test runs by ensuring the phase is set immediately
+        # Wait for tests to be rendered
+        if not ctx.current_conformance_tests_exist():
+            return
+
+        # Initialize acceptance test phase AFTER tests exist and pass
+        # This ensures full conformance tests run first before acceptance tests
         if ctx.acceptance_test_phase == AcceptanceTestPhase.NOT_STARTED:
             acceptance_tests = self.frid_context.specifications.get(plain_spec.ACCEPTANCE_TESTS)
             if not acceptance_tests:
@@ -480,10 +484,6 @@ def _handle_current_frid_testing(self):
             else:
                 ctx.acceptance_test_phase = AcceptanceTestPhase.IN_PROGRESS
 
-        # Wait for tests to be rendered
-        if not ctx.current_conformance_tests_exist():
-            return
-
         # Handle case: No acceptance tests
         if ctx.acceptance_test_phase == AcceptanceTestPhase.NOT_APPLICABLE:
             if ctx.acceptance_tests_completed == 1:
@@ -507,7 +507,7 @@ def _handle_current_frid_testing(self):
                 acceptance_tests = self.frid_context.specifications[plain_spec.ACCEPTANCE_TESTS][
                     : ctx.acceptance_tests_completed
                 ]
-                ctx.get_conformance_tests_json(ctx.current_testing_module_name)[self.frid_context.frid][
+                ctx.get_conformance_tests_json(ctx.current_testing_module_name)[ctx.current_testing_frid][
                     plain_spec.ACCEPTANCE_TESTS
                 ] = acceptance_tests
                 return

tui/state_handlers.py

@@ -20,15 +20,17 @@
 )
 
 
-def format_acceptance_test_text(raw_text: str) -> str:
+def format_acceptance_test_text(raw_text: str | None) -> str:
     """Format acceptance test text for display by removing list prefix if present.
 
     Args:
-        raw_text: The raw acceptance test text from specifications
+        raw_text: The raw acceptance test text from specifications (can be None during state transitions)
 
     Returns:
-        Formatted text with "- " prefix removed if present
+        Formatted text with "- " prefix removed if present, or empty string if None
     """
+    if raw_text is None:
+        return ""
     if raw_text.startswith("- "):
         return raw_text[2:]
     return raw_text