diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:22:29 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:22:29 +0300 |
commit | 61d81025139e2e6b3706c05eee4e60ff13417323 (patch) | |
tree | 517dc8ebc4a9f8d74fd77eb7bd6d5466d5184d94 /spec/uploaders | |
parent | 25fc1060affe576fd7c2f8aad586c5109c51cf7e (diff) |
Add latest changes from gitlab-org/gitlab@14-0-stable-ee
Diffstat (limited to 'spec/uploaders')
-rw-r--r-- | spec/uploaders/object_storage_spec.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/spec/uploaders/object_storage_spec.rb b/spec/uploaders/object_storage_spec.rb index a1d8695a8c9..13f70e3f85b 100644 --- a/spec/uploaders/object_storage_spec.rb +++ b/spec/uploaders/object_storage_spec.rb @@ -222,7 +222,11 @@ RSpec.describe ObjectStorage do before do stub_artifacts_object_storage - stub_request(:get, %r{s3.amazonaws.com/#{uploader.path}}).to_return(status: 200, body: '') + + # We need to check the Host header not including the port because AWS does not accept + stub_request(:get, %r{s3.amazonaws.com/#{uploader.path}}) + .with { |request| !request.headers['Host'].to_s.include?(':443') } + .to_return(status: 200, body: '') end it "returns the file" do |