diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-30 06:07:30 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-30 06:07:30 +0300 |
commit | dbb27a91536f29550f7714356ab499d318e9d7e2 (patch) | |
tree | ab0aa16d03a04aec036d18cce0992f81d594026e /spec/uploaders | |
parent | e222250937b497b4cf6e9b8e5ddde0097f0e0954 (diff) |
Add latest changes from gitlab-org/gitlab@master
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 |