Merge pull request #7564 from RasaHQ/fix-form-rejection

ignore SlotSets for requested slots

changelog/7557.bugfix.md

@@ -0,0 +1,2 @@
+Fixed a problem where a [form](forms.mdx) wouldn't reject when the 
+`FormValidationAction` re-implemented `required_slots`.

rasa/core/actions/forms.py

@@ -455,7 +455,11 @@ async def validate(
         )
 
         some_slots_were_validated = any(
-            isinstance(event, SlotSet) for event in validation_events
+            isinstance(event, SlotSet)
+            for event in validation_events
+            # Ignore `SlotSet`s  for `REQUESTED_SLOT` as that's not a slot which needs
+            # to be filled by the user.
+            if isinstance(event, SlotSet) and not event.key == REQUESTED_SLOT
         )
         user_rejected_manually = any(
             isinstance(event, ActionExecutionRejected) for event in validation_events

tests/core/actions/test_forms.py

@@ -352,7 +352,18 @@ async def test_validate_slots(
         assert events == expected_events
 
 
-async def test_no_slots_extracted_with_custom_slot_mappings():
+@pytest.mark.parametrize(
+    "custom_events",
+    [
+        # Custom action returned no events
+        [],
+        # Custom action returned events but no `SlotSet` events
+        [BotUttered("some text").as_dict()],
+        # Custom action returned only `SlotSet` event for `required_slot`
+        [SlotSet(REQUESTED_SLOT, "some value").as_dict()],
+    ],
+)
+async def test_no_slots_extracted_with_custom_slot_mappings(custom_events: List[Event]):
     form_name = "my form"
     events = [
         ActiveLoop(form_name),
@@ -378,7 +389,7 @@ async def test_no_slots_extracted_with_custom_slot_mappings():
     action_server_url = "http:/my-action-server:5055/webhook"
 
     with aioresponses() as mocked:
-        mocked.post(action_server_url, payload={"events": []})
+        mocked.post(action_server_url, payload={"events": custom_events})
 
         action_server = EndpointConfig(action_server_url)
         action = FormAction(form_name, action_server)