Merge branch 'feature/rule-based-segment' into feature/prerequisites

Author: chillaq

splitio/models/grammar/matchers/rule_based_segment.py

@@ -63,7 +63,7 @@ def _match_dep_rb_segments(self, excluded_rb_segments, key, attributes, context)
             else:
                 excluded_segment = context['ec'].rbs_segments.get(excluded_rb_segment.name)
                 if key in excluded_segment.excluded.get_excluded_keys():
-                    return True
+                    return False
 
                 if self._match_dep_rb_segments(excluded_segment.excluded.get_excluded_segments(), key, attributes, context):
                     return True

tests/engine/test_evaluator.py

@@ -325,7 +325,7 @@ def test_using_rbs_in_excluded(self):
         ctx = evaluation_facctory.context_for('bilal', ['some'])
         assert e.eval_with_context('bilal', 'bilal', 'some', {'email': 'bilal'}, ctx)['treatment'] == "on"
         ctx = evaluation_facctory.context_for('bilal2@split.io', ['some'])
-        assert e.eval_with_context('bilal2@split.io', 'bilal2@split.io', 'some', {'email': 'bilal2@split.io'}, ctx)['treatment'] == "off"
+        assert e.eval_with_context('bilal2@split.io', 'bilal2@split.io', 'some', {'email': 'bilal2@split.io'}, ctx)['treatment'] == "on"
 
     def test_prerequisites(self):
         splits_load = os.path.join(os.path.dirname(__file__), '../models/grammar/files', 'splits_prereq.json')
@@ -442,7 +442,7 @@ async def test_using_rbs_in_excluded_async(self):
         ctx = await evaluation_facctory.context_for('bilal', ['some'])
         assert e.eval_with_context('bilal', 'bilal', 'some', {'email': 'bilal'}, ctx)['treatment'] == "on"
         ctx = await evaluation_facctory.context_for('bilal2@split.io', ['some'])
-        assert e.eval_with_context('bilal2@split.io', 'bilal2@split.io', 'some', {'email': 'bilal2@split.io'}, ctx)['treatment'] == "off"
+        assert e.eval_with_context('bilal2@split.io', 'bilal2@split.io', 'some', {'email': 'bilal2@split.io'}, ctx)['treatment'] == "on"
 
     @pytest.mark.asyncio
     async def test_prerequisites(self):