Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 21 deletions

diff --git a/spec/services/notes/create_service_spec.rb b/spec/services/notes/create_service_spec.rb
index c5e2fe8de12..7ba069d1e39 100644
--- a/spec/services/notes/create_service_spec.rb
+++ b/spec/services/notes/create_service_spec.rb
@@ -87,28 +87,10 @@ describe Notes::CreateService do
           .to receive(:unfolded_diff?) { true }
       end
 
-      context 'using Gitlab::Diff::DeprecatedHighlightCache' do
-        before do
-          stub_feature_flags(hset_redis_diff_caching: false)
-        end
-
-        it 'clears noteable diff cache when it was unfolded for the note position' do
-          expect_any_instance_of(Gitlab::Diff::DeprecatedHighlightCache).to receive(:clear)
-
-          described_class.new(project_with_repo, user, new_opts).execute
-        end
-      end
+      it 'clears noteable diff cache when it was unfolded for the note position' do
+        expect_any_instance_of(Gitlab::Diff::HighlightCache).to receive(:clear)
 
-      context 'using Gitlab::Diff::HighlightCache' do
-        before do
-          stub_feature_flags(hset_redis_diff_caching: true)
-        end
-
-        it 'clears noteable diff cache when it was unfolded for the note position' do
-          expect_any_instance_of(Gitlab::Diff::HighlightCache).to receive(:clear)
-
-          described_class.new(project_with_repo, user, new_opts).execute
-        end
+        described_class.new(project_with_repo, user, new_opts).execute
       end
 
       it 'does not clear cache when note is not the first of the discussion' do