1 files changed, 14 insertions, 12 deletions

diff --git a/spec/requests/api/internal/lfs_spec.rb b/spec/requests/api/internal/lfs_spec.rb
index 4739ec62992..9eb48db5bd5 100644
--- a/spec/requests/api/internal/lfs_spec.rb
+++ b/spec/requests/api/internal/lfs_spec.rb
@@ -3,6 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe API::Internal::Lfs do
+  include GitlabShellHelpers
   include APIInternalBaseHelpers
 
   let_it_be(:project) { create(:project) }
@@ -11,25 +12,23 @@ RSpec.describe API::Internal::Lfs do
   let_it_be(:gl_repository) { "project-#{project.id}" }
   let_it_be(:filename) { lfs_object.file.path }
 
-  let(:secret_token) { Gitlab::Shell.secret_token }
-
   describe 'GET /internal/lfs' do
     let(:valid_params) do
-      { oid: lfs_object.oid, gl_repository: gl_repository, secret_token: secret_token }
+      { oid: lfs_object.oid, gl_repository: gl_repository }
     end
 
     context 'with invalid auth' do
-      let(:invalid_params) { valid_params.merge!(secret_token: 'invalid_tokne') }
-
       it 'returns 401' do
-        get api("/internal/lfs"), params: invalid_params
+        get api("/internal/lfs"),
+          params: valid_params,
+          headers: gitlab_shell_internal_api_request_header(issuer: 'gitlab-workhorse')
       end
     end
 
     context 'with valid auth' do
       context 'LFS in local storage' do
         it 'sends the file' do
-          get api("/internal/lfs"), params: valid_params
+          get api("/internal/lfs"), params: valid_params, headers: gitlab_shell_internal_api_request_header
 
           expect(response).to have_gitlab_http_status(:ok)
           expect(response.headers['Content-Type']).to eq('application/octet-stream')
@@ -39,7 +38,10 @@ RSpec.describe API::Internal::Lfs do
 
         # https://www.rubydoc.info/github/rack/rack/master/Rack/Sendfile
         it 'delegates sending to Web server' do
-          get api("/internal/lfs"), params: valid_params, env: { 'HTTP_X_SENDFILE_TYPE' => 'X-Sendfile' }
+          get api("/internal/lfs"),
+            params: valid_params,
+            env: { 'HTTP_X_SENDFILE_TYPE' => 'X-Sendfile' },
+            headers: gitlab_shell_internal_api_request_header
 
           expect(response).to have_gitlab_http_status(:ok)
           expect(response.headers['Content-Type']).to eq('application/octet-stream')
@@ -51,7 +53,7 @@ RSpec.describe API::Internal::Lfs do
         it 'retuns 404 for unknown file' do
           params = valid_params.merge(oid: SecureRandom.hex)
 
-          get api("/internal/lfs"), params: params
+          get api("/internal/lfs"), params: params, headers: gitlab_shell_internal_api_request_header
 
           expect(response).to have_gitlab_http_status(:not_found)
         end
@@ -60,7 +62,7 @@ RSpec.describe API::Internal::Lfs do
           other_lfs = create(:lfs_object, :with_file)
           params = valid_params.merge(oid: other_lfs.oid)
 
-          get api("/internal/lfs"), params: params
+          get api("/internal/lfs"), params: params, headers: gitlab_shell_internal_api_request_header
 
           expect(response).to have_gitlab_http_status(:not_found)
         end
@@ -70,7 +72,7 @@ RSpec.describe API::Internal::Lfs do
         let!(:lfs_object2) { create(:lfs_object, :with_file) }
         let!(:lfs_objects_project2) { create(:lfs_objects_project, project: project, lfs_object: lfs_object2) }
         let(:valid_params) do
-          { oid: lfs_object2.oid, gl_repository: gl_repository, secret_token: secret_token }
+          { oid: lfs_object2.oid, gl_repository: gl_repository }
         end
 
         before do
@@ -79,7 +81,7 @@ RSpec.describe API::Internal::Lfs do
         end
 
         it 'notifies Workhorse to send the file' do
-          get api("/internal/lfs"), params: valid_params
+          get api("/internal/lfs"), params: valid_params, headers: gitlab_shell_internal_api_request_header
 
           expect(response).to have_gitlab_http_status(:ok)
           expect(response.headers[Gitlab::Workhorse::SEND_DATA_HEADER]).to start_with("send-url:")