prefab-cloud-ruby 0.23.7 → 0.24.0

data/test/test_criteria_evaluator.rb

@@ -37,12 +37,13 @@ class TestCriteriaEvaluator < Minitest::Test
       ]
     )
 
-    evaluator = Prefab::CriteriaEvaluator.new(config, project_env_id: PROJECT_ENV_ID, resolver: nil, base_client: nil)
+    evaluator = Prefab::CriteriaEvaluator.new(config, project_env_id: PROJECT_ENV_ID, resolver: nil, base_client: nil,
+                                                      namespace: nil)
 
-    assert_equal DESIRED_VALUE, evaluator.evaluate({}).string
+    assert_equal DESIRED_VALUE, evaluator.evaluate(context({})).string
   end
 
-  def test_lookup_key_in
+  def test_nested_props_in
     config = Prefab::Config.new(
       key: KEY,
       rows: [
@@ -53,9 +54,9 @@ class TestCriteriaEvaluator < Minitest::Test
             Prefab::ConditionalValue.new(
               criteria: [
                 Prefab::Criterion.new(
-                  operator: Prefab::Criterion::CriterionOperator::LOOKUP_KEY_IN,
+                  operator: Prefab::Criterion::CriterionOperator::PROP_IS_ONE_OF,
                   value_to_match: string_list(%w[ok fine]),
-                  property_name: Prefab::CriteriaEvaluator::LOOKUP_KEY
+                  property_name: 'user.key'
                 )
               ],
               value: Prefab::ConfigValue.new(string: DESIRED_VALUE)
@@ -65,14 +66,15 @@ class TestCriteriaEvaluator < Minitest::Test
       ]
     )
 
-    evaluator = Prefab::CriteriaEvaluator.new(config, project_env_id: PROJECT_ENV_ID, resolver: nil, base_client: nil)
+    evaluator = Prefab::CriteriaEvaluator.new(config, project_env_id: PROJECT_ENV_ID, resolver: nil, base_client: nil,
+                                                      namespace: nil)
 
-    assert_equal DEFAULT_VALUE, evaluator.evaluate({}).string
-    assert_equal DEFAULT_VALUE, evaluator.evaluate({ Prefab::CriteriaEvaluator::LOOKUP_KEY => 'wrong' }).string
-    assert_equal DESIRED_VALUE, evaluator.evaluate({ Prefab::CriteriaEvaluator::LOOKUP_KEY => 'ok' }).string
+    assert_equal DEFAULT_VALUE, evaluator.evaluate(context({})).string
+    assert_equal DEFAULT_VALUE, evaluator.evaluate(context({ user: { key: 'wrong' } })).string
+    assert_equal DESIRED_VALUE, evaluator.evaluate(context({ user: { key: 'ok' } })).string
   end
 
-  def test_lookup_key_not_in
+  def test_nested_props_not_in
     config = Prefab::Config.new(
       key: KEY,
       rows: [
@@ -83,9 +85,9 @@ class TestCriteriaEvaluator < Minitest::Test
             Prefab::ConditionalValue.new(
               criteria: [
                 Prefab::Criterion.new(
-                  operator: Prefab::Criterion::CriterionOperator::LOOKUP_KEY_NOT_IN,
+                  operator: Prefab::Criterion::CriterionOperator::PROP_IS_NOT_ONE_OF,
                   value_to_match: string_list(%w[wrong bad]),
-                  property_name: Prefab::CriteriaEvaluator::LOOKUP_KEY
+                  property_name: 'user.key'
                 )
               ],
               value: Prefab::ConfigValue.new(string: DESIRED_VALUE)
@@ -95,11 +97,12 @@ class TestCriteriaEvaluator < Minitest::Test
       ]
     )
 
-    evaluator = Prefab::CriteriaEvaluator.new(config, project_env_id: PROJECT_ENV_ID, resolver: nil, base_client: nil)
+    evaluator = Prefab::CriteriaEvaluator.new(config, project_env_id: PROJECT_ENV_ID, resolver: nil, base_client: nil,
+                                                      namespace: nil)
 
-    assert_equal DESIRED_VALUE, evaluator.evaluate({}).string
-    assert_equal DESIRED_VALUE, evaluator.evaluate({ Prefab::CriteriaEvaluator::LOOKUP_KEY => 'ok' }).string
-    assert_equal DEFAULT_VALUE, evaluator.evaluate({ Prefab::CriteriaEvaluator::LOOKUP_KEY => 'wrong' }).string
+    assert_equal DESIRED_VALUE, evaluator.evaluate(context({})).string
+    assert_equal DESIRED_VALUE, evaluator.evaluate(context({ user: { key: 'ok' } })).string
+    assert_equal DEFAULT_VALUE, evaluator.evaluate(context({ user: { key: 'wrong' } })).string
   end
 
   def test_prop_is_one_of
@@ -115,7 +118,7 @@ class TestCriteriaEvaluator < Minitest::Test
                 Prefab::Criterion.new(
                   operator: Prefab::Criterion::CriterionOperator::PROP_IS_ONE_OF,
                   value_to_match: string_list(['hotmail.com', 'gmail.com']),
-                  property_name: 'email_suffix'
+                  property_name: 'user.email_suffix'
                 )
               ],
               value: Prefab::ConfigValue.new(string: DESIRED_VALUE)
@@ -125,11 +128,12 @@ class TestCriteriaEvaluator < Minitest::Test
       ]
     )
 
-    evaluator = Prefab::CriteriaEvaluator.new(config, project_env_id: PROJECT_ENV_ID, resolver: nil, base_client: nil)
+    evaluator = Prefab::CriteriaEvaluator.new(config, project_env_id: PROJECT_ENV_ID, resolver: nil, base_client: nil,
+                                                      namespace: nil)
 
-    assert_equal DEFAULT_VALUE, evaluator.evaluate({}).string
-    assert_equal DEFAULT_VALUE, evaluator.evaluate({ email_suffix: 'prefab.cloud' }).string
-    assert_equal DESIRED_VALUE, evaluator.evaluate({ email_suffix: 'hotmail.com' }).string
+    assert_equal DEFAULT_VALUE, evaluator.evaluate(context({})).string
+    assert_equal DEFAULT_VALUE, evaluator.evaluate(context(user: { email_suffix: 'prefab.cloud' })).string
+    assert_equal DESIRED_VALUE, evaluator.evaluate(context(user: { email_suffix: 'hotmail.com' })).string
   end
 
   def test_prop_is_not_one_of
@@ -145,7 +149,7 @@ class TestCriteriaEvaluator < Minitest::Test
                 Prefab::Criterion.new(
                   operator: Prefab::Criterion::CriterionOperator::PROP_IS_NOT_ONE_OF,
                   value_to_match: string_list(['hotmail.com', 'gmail.com']),
-                  property_name: 'email_suffix'
+                  property_name: 'user.email_suffix'
                 )
               ],
               value: Prefab::ConfigValue.new(string: DESIRED_VALUE)
@@ -155,11 +159,12 @@ class TestCriteriaEvaluator < Minitest::Test
       ]
     )
 
-    evaluator = Prefab::CriteriaEvaluator.new(config, project_env_id: PROJECT_ENV_ID, resolver: nil, base_client: nil)
+    evaluator = Prefab::CriteriaEvaluator.new(config, project_env_id: PROJECT_ENV_ID, resolver: nil, base_client: nil,
+                                                      namespace: nil)
 
-    assert_equal DESIRED_VALUE, evaluator.evaluate({}).string
-    assert_equal DESIRED_VALUE, evaluator.evaluate({ email_suffix: 'prefab.cloud' }).string
-    assert_equal DEFAULT_VALUE, evaluator.evaluate({ email_suffix: 'hotmail.com' }).string
+    assert_equal DESIRED_VALUE, evaluator.evaluate(context({})).string
+    assert_equal DESIRED_VALUE, evaluator.evaluate(context(user: { email_suffix: 'prefab.cloud' })).string
+    assert_equal DEFAULT_VALUE, evaluator.evaluate(context(user: { email_suffix: 'hotmail.com' })).string
   end
 
   def test_prop_ends_with_one_of
@@ -175,7 +180,7 @@ class TestCriteriaEvaluator < Minitest::Test
                 Prefab::Criterion.new(
                   operator: Prefab::Criterion::CriterionOperator::PROP_ENDS_WITH_ONE_OF,
                   value_to_match: string_list(['hotmail.com', 'gmail.com']),
-                  property_name: 'email'
+                  property_name: 'user.email'
                 )
               ],
               value: Prefab::ConfigValue.new(string: DESIRED_VALUE)
@@ -185,11 +190,12 @@ class TestCriteriaEvaluator < Minitest::Test
       ]
     )
 
-    evaluator = Prefab::CriteriaEvaluator.new(config, project_env_id: PROJECT_ENV_ID, resolver: nil, base_client: nil)
+    evaluator = Prefab::CriteriaEvaluator.new(config, project_env_id: PROJECT_ENV_ID, resolver: nil, base_client: nil,
+                                                      namespace: nil)
 
-    assert_equal DEFAULT_VALUE, evaluator.evaluate({}).string
-    assert_equal DEFAULT_VALUE, evaluator.evaluate({ email: 'example@prefab.cloud' }).string
-    assert_equal DESIRED_VALUE, evaluator.evaluate({ email: 'example@hotmail.com' }).string
+    assert_equal DEFAULT_VALUE, evaluator.evaluate(context({})).string
+    assert_equal DEFAULT_VALUE, evaluator.evaluate(context(user: { email: 'example@prefab.cloud' })).string
+    assert_equal DESIRED_VALUE, evaluator.evaluate(context(user: { email: 'example@hotmail.com' })).string
   end
 
   def test_prop_does_not_end_with_one_of
@@ -205,7 +211,7 @@ class TestCriteriaEvaluator < Minitest::Test
                 Prefab::Criterion.new(
                   operator: Prefab::Criterion::CriterionOperator::PROP_DOES_NOT_END_WITH_ONE_OF,
                   value_to_match: string_list(['hotmail.com', 'gmail.com']),
-                  property_name: 'email'
+                  property_name: 'user.email'
                 )
               ],
               value: Prefab::ConfigValue.new(string: DESIRED_VALUE)
@@ -215,11 +221,12 @@ class TestCriteriaEvaluator < Minitest::Test
       ]
     )
 
-    evaluator = Prefab::CriteriaEvaluator.new(config, project_env_id: PROJECT_ENV_ID, resolver: nil, base_client: nil)
+    evaluator = Prefab::CriteriaEvaluator.new(config, project_env_id: PROJECT_ENV_ID, resolver: nil, base_client: nil,
+                                                      namespace: nil)
 
-    assert_equal DESIRED_VALUE, evaluator.evaluate({}).string
-    assert_equal DESIRED_VALUE, evaluator.evaluate({ email: 'example@prefab.cloud' }).string
-    assert_equal DEFAULT_VALUE, evaluator.evaluate({ email: 'example@hotmail.com' }).string
+    assert_equal DESIRED_VALUE, evaluator.evaluate(context({})).string
+    assert_equal DESIRED_VALUE, evaluator.evaluate(context(user: { email: 'example@prefab.cloud' })).string
+    assert_equal DEFAULT_VALUE, evaluator.evaluate(context(user: { email: 'example@hotmail.com' })).string
   end
 
   def test_in_seg
@@ -237,7 +244,7 @@ class TestCriteriaEvaluator < Minitest::Test
                 Prefab::Criterion.new(
                   operator: Prefab::Criterion::CriterionOperator::PROP_ENDS_WITH_ONE_OF,
                   value_to_match: string_list(['hotmail.com', 'gmail.com']),
-                  property_name: 'email'
+                  property_name: 'user.email'
                 )
               ]
             ),
@@ -289,12 +296,12 @@ class TestCriteriaEvaluator < Minitest::Test
     )
 
     evaluator = Prefab::CriteriaEvaluator.new(config, project_env_id: PROJECT_ENV_ID,
-                                                      base_client: nil,
+                                                      base_client: nil, namespace: nil,
                                                       resolver: resolver_fake({ segment_key => segment_config }))
 
-    assert_equal DEFAULT_VALUE, evaluator.evaluate({}).string
-    assert_equal DEFAULT_VALUE, evaluator.evaluate({ email: 'example@prefab.cloud' }).string
-    assert_equal DESIRED_VALUE, evaluator.evaluate({ email: 'example@hotmail.com' }).string
+    assert_equal DEFAULT_VALUE, evaluator.evaluate(context({})).string
+    assert_equal DEFAULT_VALUE, evaluator.evaluate(context(user: { email: 'example@prefab.cloud' })).string
+    assert_equal DESIRED_VALUE, evaluator.evaluate(context(user: { email: 'example@hotmail.com' })).string
   end
 
   def test_not_in_seg
@@ -312,7 +319,7 @@ class TestCriteriaEvaluator < Minitest::Test
                 Prefab::Criterion.new(
                   operator: Prefab::Criterion::CriterionOperator::PROP_ENDS_WITH_ONE_OF,
                   value_to_match: string_list(['hotmail.com', 'gmail.com']),
-                  property_name: 'email'
+                  property_name: 'user.email'
                 )
               ]
             ),
@@ -346,12 +353,12 @@ class TestCriteriaEvaluator < Minitest::Test
     )
 
     evaluator = Prefab::CriteriaEvaluator.new(config, project_env_id: PROJECT_ENV_ID,
-                                                      base_client: nil,
+                                                      base_client: nil, namespace: nil,
                                                       resolver: resolver_fake({ segment_key => segment_config }))
 
-    assert_equal DESIRED_VALUE, evaluator.evaluate({}).string
-    assert_equal DESIRED_VALUE, evaluator.evaluate({ email: 'example@prefab.cloud' }).string
-    assert_equal DEFAULT_VALUE, evaluator.evaluate({ email: 'example@hotmail.com' }).string
+    assert_equal DESIRED_VALUE, evaluator.evaluate(context({})).string
+    assert_equal DESIRED_VALUE, evaluator.evaluate(context(user: { email: 'example@prefab.cloud' })).string
+    assert_equal DEFAULT_VALUE, evaluator.evaluate(context(user: { email: 'example@hotmail.com' })).string
   end
 
   def test_multiple_conditions_in_one_value
@@ -369,13 +376,13 @@ class TestCriteriaEvaluator < Minitest::Test
                 Prefab::Criterion.new(
                   operator: Prefab::Criterion::CriterionOperator::PROP_ENDS_WITH_ONE_OF,
                   value_to_match: string_list(['prefab.cloud', 'gmail.com']),
-                  property_name: 'email'
+                  property_name: 'user.email'
                 ),
 
                 Prefab::Criterion.new(
                   operator: Prefab::Criterion::CriterionOperator::PROP_IS_ONE_OF,
                   value_to_match: Prefab::ConfigValue.new(bool: true),
-                  property_name: 'admin'
+                  property_name: 'user.admin'
                 )
               ]
             ),
@@ -404,7 +411,7 @@ class TestCriteriaEvaluator < Minitest::Test
                 Prefab::Criterion.new(
                   operator: Prefab::Criterion::CriterionOperator::PROP_IS_NOT_ONE_OF,
                   value_to_match: Prefab::ConfigValue.new(bool: true),
-                  property_name: 'deleted'
+                  property_name: 'user.deleted'
                 )
               ],
               value: Prefab::ConfigValue.new(string: DESIRED_VALUE)
@@ -415,16 +422,18 @@ class TestCriteriaEvaluator < Minitest::Test
     )
 
     evaluator = Prefab::CriteriaEvaluator.new(config, project_env_id: PROJECT_ENV_ID,
-                                                      base_client: nil,
+                                                      base_client: nil, namespace: nil,
                                                       resolver: resolver_fake({ segment_key => segment_config }))
 
-    assert_equal DEFAULT_VALUE, evaluator.evaluate({}).string
-    assert_equal DEFAULT_VALUE, evaluator.evaluate({ email: 'example@prefab.cloud' }).string
-    assert_equal DESIRED_VALUE, evaluator.evaluate({ email: 'example@prefab.cloud', admin: true }).string
-    assert_equal DEFAULT_VALUE, evaluator.evaluate({ email: 'example@prefab.cloud', admin: true, deleted: true }).string
-    assert_equal DEFAULT_VALUE, evaluator.evaluate({ email: 'example@gmail.com' }).string
-    assert_equal DESIRED_VALUE, evaluator.evaluate({ email: 'example@gmail.com', admin: true }).string
-    assert_equal DEFAULT_VALUE, evaluator.evaluate({ email: 'example@gmail.com', admin: true, deleted: true }).string
+    assert_equal DEFAULT_VALUE, evaluator.evaluate(context({})).string
+    assert_equal DEFAULT_VALUE, evaluator.evaluate(context(user: { email: 'example@prefab.cloud' })).string
+    assert_equal DESIRED_VALUE, evaluator.evaluate(context(user: { email: 'example@prefab.cloud', admin: true })).string
+    assert_equal DEFAULT_VALUE,
+                 evaluator.evaluate(context(user: { email: 'example@prefab.cloud', admin: true, deleted: true })).string
+    assert_equal DEFAULT_VALUE, evaluator.evaluate(context(user: { email: 'example@gmail.com' })).string
+    assert_equal DESIRED_VALUE, evaluator.evaluate(context(user: { email: 'example@gmail.com', admin: true })).string
+    assert_equal DEFAULT_VALUE,
+                 evaluator.evaluate(context(user: { email: 'example@gmail.com', admin: true, deleted: true })).string
   end
 
   def test_multiple_conditions_in_multiple_values
@@ -442,7 +451,7 @@ class TestCriteriaEvaluator < Minitest::Test
                 Prefab::Criterion.new(
                   operator: Prefab::Criterion::CriterionOperator::PROP_ENDS_WITH_ONE_OF,
                   value_to_match: string_list(['prefab.cloud', 'gmail.com']),
-                  property_name: 'email'
+                  property_name: 'user.email'
                 )
               ]
             ),
@@ -452,7 +461,7 @@ class TestCriteriaEvaluator < Minitest::Test
                 Prefab::Criterion.new(
                   operator: Prefab::Criterion::CriterionOperator::PROP_IS_ONE_OF,
                   value_to_match: Prefab::ConfigValue.new(bool: true),
-                  property_name: 'admin'
+                  property_name: 'user.admin'
                 )
               ]
             ),
@@ -481,7 +490,7 @@ class TestCriteriaEvaluator < Minitest::Test
                 Prefab::Criterion.new(
                   operator: Prefab::Criterion::CriterionOperator::PROP_IS_NOT_ONE_OF,
                   value_to_match: Prefab::ConfigValue.new(bool: true),
-                  property_name: 'deleted'
+                  property_name: 'user.deleted'
                 )
               ],
               value: Prefab::ConfigValue.new(string: DESIRED_VALUE)
@@ -492,17 +501,19 @@ class TestCriteriaEvaluator < Minitest::Test
     )
 
     evaluator = Prefab::CriteriaEvaluator.new(config, project_env_id: PROJECT_ENV_ID,
-                                                      base_client: nil,
+                                                      base_client: nil, namespace: nil,
                                                       resolver: resolver_fake({ segment_key => segment_config }))
 
-    assert_equal DEFAULT_VALUE, evaluator.evaluate({}).string
-    assert_equal DESIRED_VALUE, evaluator.evaluate({ email: 'example@prefab.cloud' }).string
-    assert_equal DESIRED_VALUE, evaluator.evaluate({ admin: true }).string
-    assert_equal DESIRED_VALUE, evaluator.evaluate({ email: 'example@prefab.cloud', admin: true }).string
-    assert_equal DEFAULT_VALUE, evaluator.evaluate({ email: 'example@prefab.cloud', admin: true, deleted: true }).string
-    assert_equal DESIRED_VALUE, evaluator.evaluate({ email: 'example@gmail.com' }).string
-    assert_equal DESIRED_VALUE, evaluator.evaluate({ email: 'example@gmail.com', admin: true }).string
-    assert_equal DEFAULT_VALUE, evaluator.evaluate({ email: 'example@gmail.com', admin: true, deleted: true }).string
+    assert_equal DEFAULT_VALUE, evaluator.evaluate(context({})).string
+    assert_equal DESIRED_VALUE, evaluator.evaluate(context(user: { email: 'example@prefab.cloud' })).string
+    assert_equal DESIRED_VALUE, evaluator.evaluate(context(user: { admin: true })).string
+    assert_equal DESIRED_VALUE, evaluator.evaluate(context(user: { email: 'example@prefab.cloud', admin: true })).string
+    assert_equal DEFAULT_VALUE,
+                 evaluator.evaluate(context(user: { email: 'example@prefab.cloud', admin: true, deleted: true })).string
+    assert_equal DESIRED_VALUE, evaluator.evaluate(context(user: { email: 'example@gmail.com' })).string
+    assert_equal DESIRED_VALUE, evaluator.evaluate(context(user: { email: 'example@gmail.com', admin: true })).string
+    assert_equal DEFAULT_VALUE,
+                 evaluator.evaluate(context(user: { email: 'example@gmail.com', admin: true, deleted: true })).string
   end
 
   def test_stringifying_property_values_and_names
@@ -518,7 +529,7 @@ class TestCriteriaEvaluator < Minitest::Test
                 Prefab::Criterion.new(
                   operator: Prefab::Criterion::CriterionOperator::PROP_IS_ONE_OF,
                   value_to_match: string_list(%w[1 true hello]),
-                  property_name: 'team_name'
+                  property_name: 'team.name'
                 )
               ],
               value: Prefab::ConfigValue.new(string: DESIRED_VALUE)
@@ -529,15 +540,15 @@ class TestCriteriaEvaluator < Minitest::Test
     )
 
     evaluator = Prefab::CriteriaEvaluator.new(config, project_env_id: PROJECT_ENV_ID, resolver: nil,
-                                                      base_client: nil)
+                                                      namespace: nil, base_client: nil)
 
-    assert_equal DEFAULT_VALUE, evaluator.evaluate({}).string
-    assert_equal DEFAULT_VALUE, evaluator.evaluate({ team_name: 'prefab.cloud' }).string
+    assert_equal DEFAULT_VALUE, evaluator.evaluate(context({})).string
+    assert_equal DEFAULT_VALUE, evaluator.evaluate(context(team: { name: 'prefab.cloud' })).string
 
     [1, true, :hello].each do |value|
-      [:team_name, 'team_name'].each do |property_name|
-        assert_equal DESIRED_VALUE, evaluator.evaluate({ property_name => value }).string
-        assert_equal DESIRED_VALUE, evaluator.evaluate({ property_name => value.to_s }).string
+      [:name, 'name'].each do |property_name|
+        assert_equal DESIRED_VALUE, evaluator.evaluate(context(team: { property_name => value })).string
+        assert_equal DESIRED_VALUE, evaluator.evaluate(context(team: { property_name => value.to_s })).string
       end
     end
   end
@@ -557,14 +568,18 @@ class TestCriteriaEvaluator < Minitest::Test
       @config[key]
     end
 
-    def get(key, _lookup_key, properties = {})
+    def get(key, properties = {})
       # This only gets called for segments, so we don't need to pass in a resolver
       Prefab::CriteriaEvaluator.new(@config[key], project_env_id: nil, resolver: nil,
-                                                  base_client: nil).evaluate(properties)
+                                                  namespace: nil, base_client: nil).evaluate(properties)
     end
   end
 
   def resolver_fake(config)
     FakeResolver.new(config)
   end
+
+  def context(properties)
+    Prefab::Context.new(properties)
+  end
 end

data/test/test_feature_flag_client.rb

@@ -17,38 +17,32 @@ class TestFeatureFlagClient < Minitest::Test
   def test_feature_is_on_for
     ff_client = new_client
 
-    assert_equal false, ff_client.feature_is_on_for?('something-that-does-not-exist', 'irrelevant')
-    assert_equal false, ff_client.feature_is_on_for?('in_lookup_key', 'not-included')
-    assert_equal true, ff_client.feature_is_on_for?('in_lookup_key', 'abc123')
-    assert_equal true, ff_client.feature_is_on_for?('in_lookup_key', 'xyz987')
+    assert_equal false, ff_client.feature_is_on_for?('something-that-does-not-exist', {})
+    assert_equal false, ff_client.feature_is_on_for?('user_key_match', {})
+    assert_equal false, ff_client.feature_is_on_for?('user_key_match', { user: { key: 'not-included' } })
+    assert_equal true, ff_client.feature_is_on_for?('user_key_match', { user: { key:  'abc123' } })
+    assert_equal true, ff_client.feature_is_on_for?('user_key_match', { user: { key: 'xyz987' } })
   end
 
   def test_get
     ff_client = new_client
 
     # No default
-    assert_equal false, ff_client.get('something-that-does-not-exist')
-    assert_equal false, ff_client.get('disabled_flag')
-    assert_equal true, ff_client.get('enabled_flag')
-    assert_equal 'all-features', ff_client.get('flag_with_a_value')
+    assert_equal false, ff_client.get('something-that-does-not-exist', {})
+    assert_equal false, ff_client.get('disabled_flag', {})
+    assert_equal true, ff_client.get('enabled_flag', {})
+    assert_equal 'all-features', ff_client.get('flag_with_a_value', {})
 
     # with defaults
-    assert_equal DEFAULT, ff_client.get('something-that-does-not-exist', default: DEFAULT)
-    assert_equal false, ff_client.get('disabled_flag', default: DEFAULT)
-    assert_equal true, ff_client.get('enabled_flag', default: DEFAULT)
-    assert_equal 'all-features', ff_client.get('flag_with_a_value', default: DEFAULT)
+    assert_equal DEFAULT, ff_client.get('something-that-does-not-exist', {}, default: DEFAULT)
+    assert_equal false, ff_client.get('disabled_flag', {}, default: DEFAULT)
+    assert_equal true, ff_client.get('enabled_flag', {}, default: DEFAULT)
+    assert_equal 'all-features', ff_client.get('flag_with_a_value', {}, default: DEFAULT)
   end
 
   private
 
   def new_client(overrides = {})
-    options = Prefab::Options.new(**{
-      prefab_config_override_dir: 'none',
-      prefab_config_classpath_dir: 'test',
-      prefab_envs: ['unit_tests'],
-      prefab_datasources: Prefab::Options::DATASOURCES::LOCAL_ONLY
-    }.merge(overrides))
-
-    Prefab::Client.new(options).feature_flag_client
+    super(overrides).feature_flag_client
   end
 end

data/test/test_helper.rb

@@ -43,7 +43,7 @@ class MockConfigClient
     @config_values = config_values
   end
 
-  def get(key, default = nil, _, _)
+  def get(key, default = nil)
     @config_values.fetch(key, default)
   end
 

data/test/test_integration.rb

@@ -10,24 +10,40 @@ class TestIntegration < Minitest::Test
     tests = YAML.load(File.read(test_file))['tests']
 
     tests.each do |test|
-      define_method(:"test_#{test['name']}") do
-        it = IntegrationTest.new(test)
+      parent_context = test['context']
 
-        case it.test_type
-        when :raise
-          err = assert_raises(it.expected[:error]) do
-            it.test_client.send(it.func, *it.input)
+      test['cases'].each do |test_case|
+        define_method(:"test_#{test_case['name']}") do
+          it = IntegrationTest.new(test_case)
+
+          with_parent_context_maybe(parent_context) do
+            case it.test_type
+            when :raise
+              err = assert_raises(it.expected[:error]) do
+                it.test_client.send(it.func, *it.input)
+              end
+              assert_match(/#{it.expected[:message]}/, err.message)
+            when :nil
+              assert_nil it.test_client.send(it.func, *it.input)
+            when :feature_flag
+              flag, context = *it.input
+              assert_equal it.expected[:value], it.test_client.send(it.func, flag, context)
+            when :simple_equality
+              assert_equal it.expected[:value], it.test_client.send(it.func, *it.input)
+            end
           end
-          assert_match(/#{it.expected[:message]}/, err.message)
-        when :nil
-          assert_nil it.test_client.send(it.func, *it.input)
-        when :feature_flag
-          flag, lookup_key, attributes = *it.input
-          assert_equal it.expected[:value], it.test_client.send(it.func, flag, lookup_key, attributes: attributes)
-        when :simple_equality
-          assert_equal it.expected[:value], it.test_client.send(it.func, *it.input)
         end
       end
     end
   end
+
+  private
+
+  def with_parent_context_maybe(context, &block)
+    if context
+      Prefab::Context.with_context(context, &block)
+    else
+      yield
+    end
+  end
 end

data/test/test_local_config_parser.rb

@@ -34,14 +34,13 @@ class TestLocalConfigParser < Minitest::Test
     assert_equal 1, config.rows[0].values.size
 
     value_row = config.rows[0].values[0]
-    assert_equal Prefab::WeightedValues, value_row.value.weighted_values.class
     assert_equal 'all-features', Prefab::ConfigValueUnwrapper.unwrap(value_row.value, key, {})
   end
 
-  def test_flag_in_lookup_key
-    key = :flag_in_lookup_key
-    value = stringify_keys({ "feature_flag": 'true', value: true,
-                             criterion: { operator: 'LOOKUP_KEY_IN', values: %w[abc123 xyz987] } })
+  def test_flag_in_user_key
+    key = :flag_in_user_key
+    value = stringify_keys({ 'feature_flag': 'true', value: true,
+                             criterion: { operator: 'PROP_IS_ONE_OF', property: 'user.key', values: %w[abc123 xyz987] } })
     parsed = Prefab::LocalConfigParser.parse(key, value, {}, FILE_NAME)[key]
     config = parsed[:config]
 
@@ -54,11 +53,10 @@ class TestLocalConfigParser < Minitest::Test
     assert_equal 1, config.rows[0].values[0].criteria.size
 
     value_row = config.rows[0].values[0]
-    assert_equal Prefab::WeightedValues, value_row.value.weighted_values.class
     assert_equal true, Prefab::ConfigValueUnwrapper.unwrap(value_row.value, key, {})
 
-    assert_equal Prefab::CriteriaEvaluator::LOOKUP_KEY, value_row.criteria[0].property_name
-    assert_equal :LOOKUP_KEY_IN, value_row.criteria[0].operator
+    assert_equal 'user.key', value_row.criteria[0].property_name
+    assert_equal :PROP_IS_ONE_OF, value_row.criteria[0].operator
     assert_equal %w[abc123 xyz987], value_row.criteria[0].value_to_match.string_list.values
   end
 

data/test/test_log_path_collector.rb

@@ -49,13 +49,10 @@ class TestLogPathCollector < Minitest::Test
   private
 
   def new_client(overrides = {})
-    options = Prefab::Options.new(**{
-      prefab_config_override_dir: 'none',
-      prefab_config_classpath_dir: 'test',
-      prefab_envs: ['unit_tests'],
-      api_key: '123-development-yourapikey-SDK'
+    super(**{
+      prefab_datasources: Prefab::Options::DATASOURCES::ALL,
+      api_key: '123-development-yourapikey-SDK',
+      collect_sync_interval: 1000 # we'll trigger sync manually in our test
     }.merge(overrides))
-
-    Prefab::Client.new(options)
   end
 end