jump into another story once unmatch current story loop

botstory · Feb 28, 2017 · 3c3c1df · 3c3c1df
1 parent b8dce52
commit 3c3c1df
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/botstory/ast/loop_test.py b/botstory/ast/loop_test.py
@@ -380,7 +380,6 @@ def action2_after_part(ctx):
 
 
 @pytest.mark.asyncio
-@pytest.mark.skip
 async def test_break_loop_on_unmatched_message_and_jump_to_another_story():
     action1_trigger = SimpleTrigger(0)
     action3_trigger = SimpleTrigger(0)

diff --git a/botstory/ast/processor.py b/botstory/ast/processor.py
@@ -60,9 +60,17 @@ async def match_message(self, message_ctx):
             while True:
                 if ctx.is_empty_stack():
                     # we have reach the bottom of stack
-                    logger.debug('  we have reach the bottom of stack '
-                                 'so no once has receive this message')
-                    return ctx.message
+                    if ctx.does_it_match_any_story():
+                        # but sometimes we could jump on other global matcher
+                        ctx = story_context.reducers.scope_in(ctx)
+                        ctx = await self.process_story(ctx)
+                        ctx = story_context.reducers.scope_out(ctx)
+                        if ctx.is_empty_stack():
+                            return ctx.message
+                    else:
+                        logger.debug('  we have reach the bottom of stack '
+                                     'so no once has receive this message')
+                        return ctx.message
 
                 if ctx.is_scope_level() and \
                         (ctx.has_child_story() or ctx.matched) and \