diff options
author | Micaël Bergeron <mbergeron@gitlab.com> | 2018-03-09 10:09:00 -0500 |
---|---|---|
committer | Micaël Bergeron <mbergeron@gitlab.com> | 2018-03-22 08:49:04 -0400 |
commit | 44f37504fb229ab78606a5fd11f75316ebc2667b (patch) | |
tree | 084a49e025463f67942c85c3f99edd4a827e1a89 /spec/controllers/concerns | |
parent | e1f076ecb5c0e92e62ee628b6c18bc8869812b2e (diff) | |
download | gitlab-ce-44f37504fb229ab78606a5fd11f75316ebc2667b.tar.gz |
Backport ee-40781-os-to-ce
Diffstat (limited to 'spec/controllers/concerns')
-rw-r--r-- | spec/controllers/concerns/send_file_upload_spec.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/spec/controllers/concerns/send_file_upload_spec.rb b/spec/controllers/concerns/send_file_upload_spec.rb index da4e955f6a3..f4c99ea4064 100644 --- a/spec/controllers/concerns/send_file_upload_spec.rb +++ b/spec/controllers/concerns/send_file_upload_spec.rb @@ -64,10 +64,12 @@ describe SendFileUpload do end it 'sends a file' do - subject + headers = double + expect(headers).to receive(:store).with(Gitlab::Workhorse::SEND_DATA_HEADER, /^send-url:/) + expect(controller).to receive(:headers) { headers } + expect(controller).to receive(:head).with(:ok) - is_expected.to start_with(Gitlab::Workhorse::SEND_DATA_HEADER) - is_expected.to end_with(/^send-url:/) + subject end end |