1 files changed, 26 insertions, 5 deletions
diff --git a/spec/controllers/projects/raw_controller_spec.rb b/spec/controllers/projects/raw_controller_spec.rb
index b3921164c81..43cf1a16051 100644
--- a/spec/controllers/projects/raw_controller_spec.rb
+++ b/spec/controllers/projects/raw_controller_spec.rb
@@ -33,11 +33,6 @@ RSpec.describe Projects::RawController do
 
       it_behaves_like 'project cache control headers'
       it_behaves_like 'content disposition headers'
-      it_behaves_like 'uncached response' do
-        before do
-          subject
-        end
-      end
     end
 
     context 'image header' do
@@ -225,6 +220,32 @@ RSpec.describe Projects::RawController do
         end
       end
     end
+
+    describe 'caching' do
+      def request_file
+        get(:show, params: { namespace_id: project.namespace, project_id: project, id: 'master/README.md' })
+      end
+
+      it 'sets appropriate caching headers' do
+        sign_in create(:user)
+        request_file
+
+        expect(response.cache_control[:public]).to eq(true)
+        expect(response.cache_control[:max_age]).to eq(60)
+        expect(response.cache_control[:no_store]).to be_nil
+      end
+
+      context 'when If-None-Match header is set' do
+        it 'returns a 304 status' do
+          request_file
+
+          request.headers['If-None-Match'] = response.headers['ETag']
+          request_file
+
+          expect(response).to have_gitlab_http_status(:not_modified)
+        end
+      end
+    end
   end
 
   def execute_raw_requests(requests:, project:, file_path:, **params)