Add latest changes from gitlab-org/security/gitlab@15-5-stable-ee

1 files changed, 28 insertions, 9 deletions

diff --git a/spec/controllers/projects/artifacts_controller_spec.rb b/spec/controllers/projects/artifacts_controller_spec.rb
index 808e67eff3d..f79a2c6a6d0 100644
--- a/spec/controllers/projects/artifacts_controller_spec.rb
+++ b/spec/controllers/projects/artifacts_controller_spec.rb
@@ -262,6 +262,31 @@ RSpec.describe Projects::ArtifactsController do
     end
   end
 
+  describe 'GET external_file' do
+    before do
+      allow(Gitlab.config.pages).to receive(:enabled).and_return(true)
+      allow(Gitlab.config.pages).to receive(:artifacts_server).and_return(true)
+    end
+
+    context 'when the file exists' do
+      it 'renders the file view' do
+        path = 'ci_artifacts.txt'
+
+        get :external_file, params: { namespace_id: project.namespace, project_id: project, job_id: job, path: path }
+
+        expect(response).to have_gitlab_http_status(:ok)
+      end
+    end
+
+    context 'when the file does not exist' do
+      it 'responds Not Found' do
+        get :external_file, params: { namespace_id: project.namespace, project_id: project, job_id: job, path: 'unknown' }
+
+        expect(response).to have_gitlab_http_status(:not_found)
+      end
+    end
+  end
+
   describe 'GET file' do
     before do
       allow(Gitlab.config.pages).to receive(:enabled).and_return(true)
@@ -274,17 +299,11 @@ RSpec.describe Projects::ArtifactsController do
 
       context 'when the file exists' do
         it 'renders the file view' do
-          get :file, params: { namespace_id: project.namespace, project_id: project, job_id: job, path: 'ci_artifacts.txt' }
+          path = 'ci_artifacts.txt'
 
-          expect(response).to have_gitlab_http_status(:found)
-        end
-      end
-
-      context 'when the file does not exist' do
-        it 'responds Not Found' do
-          get :file, params: { namespace_id: project.namespace, project_id: project, job_id: job, path: 'unknown' }
+          get :file, params: { namespace_id: project.namespace, project_id: project, job_id: job, path: path }
 
-          expect(response).to be_not_found
+          expect(response).to redirect_to(external_file_project_job_artifacts_path(project, job, path: path))
         end
       end
     end