fix tests

data/test_config/max_hist_config.yml

@@ -1,5 +1,6 @@
 policies:
   - name: MemoizationPolicy
     max_history: 5
+  - name: RulePolicy
   - name: TEDPolicy
     max_history: 5

data/test_config/no_max_hist_config.yml

@@ -1,3 +1,4 @@
 policies:
   - name: MemoizationPolicy
+  - name: RulePolicy
   - name: TEDPolicy

data/test_config/ted_random_seed.yaml

@@ -3,3 +3,4 @@ policies:
   random_seed: 42
   validation_split: 0
   max_history: 5
+- name: RulePolicy

data/test_stories/stories_defaultdomain.md

@@ -15,3 +15,7 @@
     - utter_default
 * goodbye
     - utter_goodbye
+
+## goodbye
+* goodbye
+    - utter_goodbye

data/test_trackers/tracker_moodbot.json

@@ -30,7 +30,7 @@
   "paused": false,
   "latest_event_time": 1517821726.211042,
   "followup_action": null,
-  "slots": {"name": null},
+  "slots": {"name": null, "requested_slot": null},
   "latest_input_channel": null,
   "events": [
     {

rasa/core/policies/ensemble.py

@@ -752,9 +752,9 @@ def _check_policy_for_forms_available(
     if domain.form_names and not has_policy_for_forms:
         raise InvalidDomain(
             "You have defined a form action, but have neither added the "
-            f"'{RulePolicy.__name__}' nor '{FormPolicy.__name__}' (deprecated) to your "
-            f"policy ensemble. Either remove all forms from your domain or add the "
-            "missing policy to your policy configuration."
+            f"'{RulePolicy.__name__}' nor the '{FormPolicy.__name__}' (deprecated) to "
+            f"your policy ensemble. Either remove all forms from your domain or add "
+            f"the missing policy to your policy configuration."
         )
 
 

tests/core/test_actions.py

@@ -48,6 +48,7 @@
     RULE_SNIPPET_ACTION_NAME,
     ACTIVE_LOOP,
     FOLLOWUP_ACTION,
+    REQUESTED_SLOT,
 )
 from rasa.shared.core.trackers import DialogueStateTracker
 from rasa.utils.endpoints import ClientResponseError, EndpointConfig
@@ -164,7 +165,7 @@ async def test_remote_action_runs(
                 "paused": False,
                 "latest_event_time": None,
                 FOLLOWUP_ACTION: "action_listen",
-                "slots": {"name": None},
+                "slots": {"name": None, REQUESTED_SLOT: None},
                 "events": [],
                 "latest_input_channel": None,
             },
@@ -219,7 +220,7 @@ async def test_remote_action_logs_events(
                 "paused": False,
                 FOLLOWUP_ACTION: ACTION_LISTEN_NAME,
                 "latest_event_time": None,
-                "slots": {"name": None},
+                "slots": {"name": None, REQUESTED_SLOT: None},
                 "events": [],
                 "latest_input_channel": None,
             },

tests/core/test_agent.py

@@ -238,7 +238,7 @@ def test_form_without_form_policy(policy_config: Dict[Text, List[Text]]):
             domain=Domain.from_dict({"forms": ["restaurant_form"]}),
             policies=PolicyEnsemble.from_dict(policy_config),
         )
-    assert "haven't added the FormPolicy" in str(execinfo.value)
+    assert "neither added the 'RulePolicy' nor the 'FormPolicy'" in str(execinfo.value)
 
 
 @pytest.mark.parametrize(

tests/core/test_processor.py

@@ -191,14 +191,13 @@ async def test_reminder_scheduled(
     # retrieve the updated tracker
     t = default_processor.tracker_store.retrieve(sender_id)
 
-    assert t.events[-5] == UserUttered("test")
-    assert t.events[-4] == ActionExecuted("action_schedule_reminder")
-    assert isinstance(t.events[-3], ReminderScheduled)
-    assert t.events[-2] == UserUttered(
+    assert t.events[1] == UserUttered("test")
+    assert t.events[2] == ActionExecuted("action_schedule_reminder")
+    assert isinstance(t.events[3], ReminderScheduled)
+    assert t.events[4] == UserUttered(
         f"{EXTERNAL_MESSAGE_PREFIX}remind",
         intent={INTENT_NAME_KEY: "remind", IS_EXTERNAL: True},
     )
-    assert t.events[-1] == ActionExecuted("action_listen")
 
 
 async def test_trigger_external_latest_input_channel(

tests/core/test_training.py

@@ -6,6 +6,7 @@
 from _pytest.monkeypatch import MonkeyPatch
 
 from rasa.core.policies.memoization import MemoizationPolicy, OLD_DEFAULT_MAX_HISTORY
+from rasa.core.policies.rule_policy import RulePolicy
 from rasa.shared.core.domain import Domain
 from rasa.core.interpreter import RasaNLUInterpreter
 from rasa.shared.nlu.interpreter import RegexInterpreter
@@ -113,12 +114,12 @@ async def test_training_script_with_max_history_set(tmp_path: Path):
         additional_arguments={},
     )
     agent = Agent.load(tmpdir)
+
+    expected_max_history = {FormPolicy: 2, RulePolicy: None}
     for policy in agent.policy_ensemble.policies:
         if hasattr(policy.featurizer, "max_history"):
-            if type(policy) == FormPolicy:
-                assert policy.featurizer.max_history == 2
-            else:
-                assert policy.featurizer.max_history == 5
+            expected_history = expected_max_history.get(type(policy), 5)
+            assert policy.featurizer.max_history == expected_history
 
 
 @pytest.mark.parametrize(
@@ -181,7 +182,9 @@ async def test_trained_interpreter_passed_to_policies(
 ):
     from rasa.core.policies.ted_policy import TEDPolicy
 
-    policies_config = {"policies": [{"name": TEDPolicy.__name__}]}
+    policies_config = {
+        "policies": [{"name": TEDPolicy.__name__}, {"name": RulePolicy.__name__}]
+    }
 
     policy_train = Mock()
     monkeypatch.setattr(TEDPolicy, "train", policy_train)

tests/shared/core/test_trackers.py

@@ -645,6 +645,7 @@ async def test_tracker_dump_e2e_story(default_agent: Agent):
         "* greet: /greet",
         "    - utter_greet",
         "* goodbye: /goodbye",
+        "    - utter_goodbye",
     ]
 
 

tests/test_server.py

@@ -38,7 +38,11 @@
     CallbackInput,
 )
 from rasa.core.channels.slack import SlackBot
-from rasa.shared.core.constants import ACTION_SESSION_START_NAME, ACTION_LISTEN_NAME
+from rasa.shared.core.constants import (
+    ACTION_SESSION_START_NAME,
+    ACTION_LISTEN_NAME,
+    REQUESTED_SLOT,
+)
 from rasa.shared.core.domain import Domain, SessionConfig
 from rasa.shared.core.events import (
     Event,
@@ -854,7 +858,7 @@ async def test_requesting_non_existent_tracker(rasa_app: SanicASGITestClient):
     content = response.json()
     assert response.status == 200
     assert content["paused"] is False
-    assert content["slots"] == {"name": None}
+    assert content["slots"] == {"name": None, REQUESTED_SLOT: None}
     assert content["sender_id"] == "madeupid"
     assert content["events"] == [
         {