update tests

Author: chillaq

lib/splitclient-rb/cache/fetchers/split_fetcher.rb

@@ -26,7 +26,7 @@ def fetch_splits(fetch_options = { cache_control_headers: false, till: nil })
           @semaphore.synchronize do
             data = splits_since(@splits_repository.get_change_number, @rule_based_segments_repository.get_change_number, fetch_options)
             SplitIoClient::Helpers::RepositoryHelper.update_feature_flag_repository(@splits_repository, data[:ff][:d], data[:ff][:t], @config, @splits_api.clear_storage)
-            SplitIoClient::Helpers::RepositoryHelper.update_rule_based_segment_repository(@rule_based_segments_repository, data[:rbs][:d], data[:rbs][:t], @config, @splits_api.clear_storage)
+            SplitIoClient::Helpers::RepositoryHelper.update_rule_based_segment_repository(@rule_based_segments_repository, data[:rbs][:d], data[:rbs][:t], @config)
             @splits_repository.set_segment_names(data[:segment_names])
             @rule_based_segments_repository.set_segment_names(data[:segment_names])
             @config.logger.debug("segments seen(#{data[:segment_names].length}): #{data[:segment_names].to_a}") if @config.debug_enabled

lib/splitclient-rb/cache/repositories/splits_repository.rb

@@ -127,6 +127,10 @@ def clear
           @tt_cache.clear
 
           @adapter.clear(namespace_key)
+          unless @config.mode.equal?(:consumer)
+            @adapter.set_string(namespace_key('.splits.till'), '-1')
+            @adapter.initialize_map(namespace_key('.segments.registered'))
+          end
         end
 
         def kill(change_number, split_name, default_treatment)

lib/splitclient-rb/engine/api/splits.rb

@@ -22,7 +22,6 @@ def since(since, since_rbs, fetch_options = { cache_control_headers: false, till
         start = Time.now
 
         if check_last_proxy_check_timestamp
-            puts "switching to new spec"
             @spec_version = SplitIoClient::Spec::FeatureFlags::SPEC_VERSION
             @config.logger.debug("Switching to new Feature flag spec #{@spec_version} and fetching.")
             since = -1

lib/splitclient-rb/helpers/repository_helper.rb

@@ -27,7 +27,7 @@ def self.update_feature_flag_repository(feature_flag_repository, feature_flags,
         feature_flag_repository.update(to_add, to_delete, change_number)
       end
 
-      def self.update_rule_based_segment_repository(rule_based_segment_repository, rule_based_segments, change_number, config, clear_storage)
+      def self.update_rule_based_segment_repository(rule_based_segment_repository, rule_based_segments, change_number, config)
         to_add = []
         to_delete = []
         rule_based_segments.each do |rule_based_segment|
@@ -40,7 +40,6 @@ def self.update_rule_based_segment_repository(rule_based_segment_repository, rul
           config.logger.debug("storing rule based segment (#{rule_based_segment[:name]})") if config.debug_enabled
           to_add.push(rule_based_segment)
         end
-        rule_based_segment_repository.clear if clear_storage
 
         rule_based_segment_repository.update(to_add, to_delete, change_number)
       end

lib/splitclient-rb/sse/workers/splits_worker.rb

@@ -93,7 +93,7 @@ def update_rule_based_segment(notification)
           new_rb_segment = return_object_from_json(notification)
           SplitIoClient::Helpers::RepositoryHelper.update_rule_based_segment_repository(@rule_based_segment_repository,
                                                                                   [new_rb_segment],
-                                                                                  notification.data['changeNumber'], @config, false)
+                                                                                  notification.data['changeNumber'], @config)
           fetch_segments_if_not_exists(Helpers::Util.segment_names_by_object(new_rb_segment, "IN_SEGMENT"), @rule_based_segment_repository)
 
 # TODO: enable when telemetry spec is added

spec/integrations/in_memory_client_spec.rb

@@ -1381,6 +1381,44 @@
       expect(client_rbs.get_treatment('mauro@split.io', 'rbs_feature_flag', {:email => 'mauro@split.io'})).to eq('off')
     end
   end
+
+  context 'old spec tests' do
+    let(:old_spec_splits) { File.read(File.expand_path(File.join(File.dirname(__FILE__), '../test_data/rule_based_segments/split_old_spec.json'))) }
+
+    it 'check new spec after last proxy timestamp expires' do
+      splits_rbs = File.read(File.join(SplitIoClient.root, 'spec/test_data/rule_based_segments/rule_base_segments.json'))
+
+      stub_request(:get, 'https://proxy-server/api/splitChanges?s=1.3&since=-1&rbSince=-1')
+        .to_return({status: 400, body: ''}, {status: 200, body: splits_rbs})
+      stub_request(:get, "https://sdk.split.io/api/splitChanges?rbSince=1506703262916&s=1.3&since=1506703262916")
+        .to_return(status: 200, body: '')
+        stub_request(:get, 'https://proxy-server/api/splitChanges?s=1.1&since=-1')
+        .to_return(status: 200, body: old_spec_splits)
+      stub_request(:get, "https://proxy-server/api/splitChanges?s=1.1&since=1457726098069")
+        .to_return(status: 200, body: '')
+      stub_request(:post, "https://telemetry.split.io/api/v1/metrics/config")
+        .to_return(status: 200, body: '')
+
+      factory_old_spec =
+        SplitIoClient::SplitFactory.new('test_api_key',
+          {impressions_mode: :none,
+          features_refresh_rate: 2,
+          base_uri: "https://proxy-server/api",
+          streaming_enabled: false})
+
+      SplitIoClient::Api::Splits::PROXY_CHECK_INTERVAL_SECONDS = 1
+      client_old_spec = factory_old_spec.client
+      client_old_spec.block_until_ready
+      expect(client_old_spec.get_treatment('whitelisted_user', 'whitelist_feature')).to eq('on')
+
+      sleep 1
+      split_fetcher = factory_old_spec.instance_variable_get(:@split_fetcher)
+      split_fetcher.fetch_splits
+      sleep 1
+      expect(client_old_spec.get_treatment('bilal@split.io', 'rbs_feature_flag', {:email => 'bilal@split.io'})).to eq('on')
+      expect(client_old_spec.get_treatment('whitelisted_user', 'whitelist_feature')).to eq('control')
+    end
+  end
 end
 
 private