diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-03-01 10:22:39 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-03-01 10:22:39 +0000 |
| commit | b708cfc9f8f7d1a3f50f851a48869644c6ab5bf2 (patch) | |
| tree | 00290b7af068524d9fd2c8070d645efb31e96a54 /spec/controllers | |
| parent | dc5fc28382246fbbe2bb6f61fe8dac136b5f3189 (diff) | |
| parent | 3fc6d4da19a49fbd63520b709c86bbe385e95ca6 (diff) | |
| download | gitlab-ce-b708cfc9f8f7d1a3f50f851a48869644c6ab5bf2.tar.gz | |
Merge branch 'sh-bump-fog-gem' into 'master'
Bump fog-aws to 3.3.0 and associated dependencies
See merge request gitlab-org/gitlab-ce!21788
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/concerns/send_file_upload_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/concerns/send_file_upload_spec.rb b/spec/controllers/concerns/send_file_upload_spec.rb index cf3b24f50a3..aa71a247956 100644 --- a/spec/controllers/concerns/send_file_upload_spec.rb +++ b/spec/controllers/concerns/send_file_upload_spec.rb @@ -112,7 +112,7 @@ describe SendFileUpload do it 'sends a file with a custom type' do headers = double - expected_headers = %r(response-content-disposition=attachment%3B%20filename%3D%22test.js%22%3B%20filename%2A%3DUTF-8%27%27test.js&response-content-type=application/ecmascript) + expected_headers = /response-content-disposition=attachment%3B%20filename%3D%22test.js%22%3B%20filename%2A%3DUTF-8%27%27test.js&response-content-type=application%2Fecmascript/ expect(Gitlab::Workhorse).to receive(:send_url).with(expected_headers).and_call_original expect(headers).to receive(:store).with(Gitlab::Workhorse::SEND_DATA_HEADER, /^send-url:/) |