Skip to content
Snippets Groups Projects
Commit b08a1cd2 authored by Micael Bergeron's avatar Micael Bergeron
Browse files

fix the failing specs

parent 764b5fdd
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -8,7 +8,8 @@ module SendFileUpload
if file_upload.file_storage?
send_file file_upload.path, send_params
elsif file_upload.class.proxy_download_enabled?
Gitlab::Workhorse.send_url(file_upload.url(**redirect_params))
headers.store(*Gitlab::Workhorse.send_url(file_upload.url(**redirect_params)))
head :ok
else
redirect_to file_upload.url(**redirect_params)
end
Loading
Loading
Loading
Loading
@@ -109,7 +109,7 @@ For source installations the following settings are nested under `artifacts:` an
| `enabled` | Enable/disable object storage | `false` |
| `remote_directory` | The bucket name where Artfacts will be stored| |
| `background_upload` | Set to false to disable automatic upload. Option may be removed once upload is direct to S3 | `true` |
| `proxy_download` | Set to false to disable proxying all files served. Option allows to reduce egress traffic as this allows clients to download directly from remote storage instead of proxying all data | `false` |
| `proxy_download` | Set to true to enable proxying all files served. Option allows to reduce egress traffic as this allows clients to download directly from remote storage instead of proxying all data | `false` |
| `connection` | Various connection options described below | |
 
#### S3 compatible connection settings
Loading
Loading
Loading
Loading
@@ -66,7 +66,7 @@ For source installations the following settings are nested under `uploads:` and
| `enabled` | Enable/disable object storage | `false` |
| `remote_directory` | The bucket name where Uploads will be stored| |
| `background_upload` | Set to false to disable automatic upload. Option may be removed once upload is direct to S3 | `true` |
| `proxy_download` | Set to false to disable proxying all files served. Option allows to reduce egress traffic as this allows clients to download directly from remote storage instead of proxying all data | `false` |
| `proxy_download` | Set to true to enable proxying all files served. Option allows to reduce egress traffic as this allows clients to download directly from remote storage instead of proxying all data | `false` |
| `connection` | Various connection options described below | |
 
#### S3 compatible connection settings
Loading
Loading
Loading
Loading
@@ -64,7 +64,7 @@ For source installations the following settings are nested under `lfs:` and then
| `enabled` | Enable/disable object storage | `false` |
| `remote_directory` | The bucket name where LFS objects will be stored| |
| `background_upload` | Set to false to disable automatic upload. Option may be removed once upload is direct to S3 | `true` |
| `proxy_download` | Set to false to disable proxying all files served. Option allows to reduce egress traffic as this allows clients to download directly from remote storage instead of proxying all data | `false` |
| `proxy_download` | Set to true to enable proxying all files served. Option allows to reduce egress traffic as this allows clients to download directly from remote storage instead of proxying all data | `false` |
| `connection` | Various connection options described below | |
 
#### S3 compatible connection settings
Loading
Loading
Loading
Loading
@@ -21,7 +21,6 @@ describe API::Jobs do
let(:guest) { create(:project_member, :guest, project: project).user }
 
before do
stub_licensed_features(cross_project_pipelines: true)
project.add_developer(user)
end
 
Loading
Loading
module StubConfiguration
def stub_object_storage_uploader(config:, uploader:, remote_directory:, enabled: true, background_upload: false)
def stub_object_storage_uploader(config:, uploader:, remote_directory:,
enabled: true,
proxy_download: false,
background_upload: false)
Fog.mock!
 
allow(config).to receive(:enabled) { enabled }
allow(config).to receive(:proxy_download) { proxy_download }
allow(config).to receive(:background_upload) { background_upload }
 
return unless enabled
Loading
Loading
Loading
Loading
@@ -2,7 +2,7 @@ require 'rake_helper'
 
describe 'gitlab:artifacts namespace rake task' do
before(:context) do
Rake.application.rake_require 'tasks/gitlab/artifacts'
Rake.application.rake_require 'tasks/gitlab/artifacts/migrate'
end
 
let(:object_storage_enabled) { false }
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment