Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 24 deletions

diff --git a/spec/lib/gitlab/diff/highlight_cache_spec.rb b/spec/lib/gitlab/diff/highlight_cache_spec.rb
index 4a8b338506d..1d1ffc8c275 100644
--- a/spec/lib/gitlab/diff/highlight_cache_spec.rb
+++ b/spec/lib/gitlab/diff/highlight_cache_spec.rb
@@ -127,20 +127,6 @@ RSpec.describe Gitlab::Diff::HighlightCache, :clean_gitlab_redis_cache do
 
       cache.write_if_empty
     end
-
-    context 'when highlight_diffs_optimize_memory_usage is disabled' do
-      before do
-        stub_feature_flags(highlight_diffs_optimize_memory_usage: false)
-      end
-
-      it 'sets the previous expiration period' do
-        Gitlab::Redis::Cache.with do |redis|
-          expect(redis).to receive(:expire).with(cache.key, described_class::PREVIOUS_EXPIRATION_PERIOD)
-        end
-
-        cache.write_if_empty
-      end
-    end
   end
 
   describe '#write_if_empty' do
@@ -304,15 +290,5 @@ RSpec.describe Gitlab::Diff::HighlightCache, :clean_gitlab_redis_cache do
         is_expected.to eq("highlighted-diff-files:#{cache.diffable.cache_key}:2:#{options_hash([cache.diff_options, true, false])}")
       end
     end
-
-    context 'when highlight_diffs_optimize_memory_usage is disabled' do
-      before do
-        stub_feature_flags(highlight_diffs_optimize_memory_usage: false)
-      end
-
-      it 'uses the options hash as a part of the cache key' do
-        is_expected.to eq("highlighted-diff-files:#{cache.diffable.cache_key}:2:#{cache.diff_options}:true:true")
-      end
-    end
   end
 end