Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 18 deletions

diff --git a/spec/requests/projects/merge_requests_discussions_spec.rb b/spec/requests/projects/merge_requests_discussions_spec.rb
index 439d3d8c64e..9503dafcf2a 100644
--- a/spec/requests/projects/merge_requests_discussions_spec.rb
+++ b/spec/requests/projects/merge_requests_discussions_spec.rb
@@ -264,15 +264,6 @@ RSpec.describe 'merge requests discussions' do
         end
       end
 
-      context 'when mr_discussions_http_cache is disabled' do
-        before do
-          stub_feature_flags(mr_discussions_http_cache: false)
-          send_request
-        end
-
-        it_behaves_like 'cache hit'
-      end
-
       context 'when disabled_mr_discussions_redis_cache is disabled' do
         before do
           stub_feature_flags(disabled_mr_discussions_redis_cache: false)
@@ -281,15 +272,6 @@ RSpec.describe 'merge requests discussions' do
 
         it_behaves_like 'cache hit'
       end
-
-      context 'when mr_discussions_http_cache and disabled_mr_discussions_redis_cache are disabled' do
-        before do
-          stub_feature_flags(mr_discussions_http_cache: false, disabled_mr_discussions_redis_cache: false)
-          send_request
-        end
-
-        it_behaves_like 'cache hit'
-      end
     end
   end
 end