Fix unit test failures

Author: esrakartalOpt

lib/optimizely/config/datafile_project_config.rb

@@ -644,12 +644,16 @@ def get_holdouts_for_flag(flag_id)
 
       return [] if @holdouts.nil? || @holdouts.empty?
 
+      # Check cache first (before validation, so we cache the validation result too)
+      return @flag_holdouts_map[flag_id] if @flag_holdouts_map.key?(flag_id)
+
       # Validate that the flag exists in the datafile
       flag_exists = @feature_flags.any? { |flag| flag['id'] == flag_id }
-      return [] unless flag_exists
-
-      # Check cache and return persistent holdouts
-      return @flag_holdouts_map[flag_id] if @flag_holdouts_map.key?(flag_id)
+      unless flag_exists
+        # Cache the empty result for non-existent flags
+        @flag_holdouts_map[flag_id] = []
+        return []
+      end
 
       # Prioritize global holdouts first
       excluded = @excluded_holdouts[flag_id] || []

spec/config/datafile_project_config_spec.rb

@@ -1281,7 +1281,7 @@
     end
 
     it 'should return only global holdouts for flags not specifically targeted' do
-      string_feature_id = '594060'
+      string_feature_id = '155557'
       holdouts = config_with_holdouts.get_holdouts_for_flag(string_feature_id)
 
       # Should only include global holdout (not excluded and no specific targeting)
@@ -1366,8 +1366,8 @@
       # Use the correct feature flag IDs from the debug output
       boolean_feature_id = '155554'
       multi_variate_feature_id = '155559'
-      empty_feature_id = '594032'
-      string_feature_id = '594060'
+      empty_feature_id = '155564'
+      string_feature_id = '155557'
 
       config_body_with_holdouts['holdouts'] = [
         {
@@ -1403,8 +1403,8 @@
       # Use the correct feature flag IDs
       boolean_feature_id = '155554'
       multi_variate_feature_id = '155559'
-      empty_feature_id = '594032'
-      string_feature_id = '594060'
+      empty_feature_id = '155564'
+      string_feature_id = '155557'
 
       expect(config_with_complex_holdouts.included_holdouts[multi_variate_feature_id]).not_to be_nil
       expect(config_with_complex_holdouts.included_holdouts[multi_variate_feature_id]).not_to be_empty
@@ -1474,7 +1474,7 @@
         feature_flag = config_with_holdouts.feature_flag_key_map['boolean_feature']
         expect(feature_flag).not_to be_nil
 
-        holdouts_for_flag = config_with_holdouts.get_holdouts_for_flag('boolean_feature')
+        holdouts_for_flag = config_with_holdouts.get_holdouts_for_flag(feature_flag['id'])
         expect(holdouts_for_flag).to be_an(Array)
       end
     end
@@ -1485,7 +1485,7 @@
         feature_flag = config_with_holdouts.feature_flag_key_map['boolean_feature']
 
         if feature_flag
-          holdouts_for_flag = config_with_holdouts.get_holdouts_for_flag('boolean_feature')
+          holdouts_for_flag = config_with_holdouts.get_holdouts_for_flag(feature_flag['id'])
 
           # Should not include holdouts that exclude this flag
           excluded_holdout = holdouts_for_flag.find { |h| h['key'] == 'excluded_holdout' }
@@ -1497,7 +1497,7 @@
         feature_flag = config_with_holdouts.feature_flag_key_map['boolean_feature']
         expect(feature_flag).not_to be_nil
 
-        holdouts_for_flag = config_with_holdouts.get_holdouts_for_flag('boolean_feature')
+        holdouts_for_flag = config_with_holdouts.get_holdouts_for_flag(feature_flag['id'])
         expect(holdouts_for_flag).to be_an(Array)
       end
     end
@@ -1523,8 +1523,9 @@
       end
 
       it 'should properly cache holdout lookups' do
-        holdouts_1 = config_with_holdouts.get_holdouts_for_flag('boolean_feature')
-        holdouts_2 = config_with_holdouts.get_holdouts_for_flag('boolean_feature')
+        feature_flag = config_with_holdouts.feature_flag_key_map['boolean_feature']
+        holdouts_1 = config_with_holdouts.get_holdouts_for_flag(feature_flag['id'])
+        holdouts_2 = config_with_holdouts.get_holdouts_for_flag(feature_flag['id'])
 
         expect(holdouts_1).to equal(holdouts_2)
       end
@@ -1703,7 +1704,7 @@
         feature_flag = config_with_holdouts.feature_flag_key_map['boolean_feature']
         expect(feature_flag).not_to be_nil
 
-        holdouts_for_flag = config_with_holdouts.get_holdouts_for_flag('boolean_feature')
+        holdouts_for_flag = config_with_holdouts.get_holdouts_for_flag(feature_flag['id'])
 
         holdouts_for_flag.each do |holdout|
           # Each holdout should have necessary info for decision reasoning
@@ -1758,7 +1759,8 @@
         error_handler
       )
 
-      holdouts_for_flag = config_without_holdouts.get_holdouts_for_flag('boolean_feature')
+      feature_flag = config_without_holdouts.feature_flag_key_map['boolean_feature']
+      holdouts_for_flag = config_without_holdouts.get_holdouts_for_flag(feature_flag['id'])
       expect(holdouts_for_flag).to eq([])
     end