diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2019-07-24 14:46:37 +1200 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-07-29 19:20:27 -0300 |
| commit | 46ef495488d46932b18353739342d503288e0eea (patch) | |
| tree | 7938f09bbce9a5d603739b952bfffe20da7995d6 /spec/services | |
| parent | 18e3dcc65e399642918e9a7a90fcafd391a1038d (diff) | |
| download | gitlab-ce-46ef495488d46932b18353739342d503288e0eea.tar.gz | |
Write out sham_rack gem
This means we have one less Net::HTTP monkeypatch.
sham_rack cannot handle IPv6 addresses which means it breaks Net::HTTP
connections because it monkey-patches Net::HTTP
Diffstat (limited to 'spec/services')
| -rw-r--r-- | spec/services/projects/download_service_spec.rb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/spec/services/projects/download_service_spec.rb b/spec/services/projects/download_service_spec.rb index f25233ceeb1..06efc2ff825 100644 --- a/spec/services/projects/download_service_spec.rb +++ b/spec/services/projects/download_service_spec.rb @@ -20,13 +20,8 @@ describe Projects::DownloadService do context 'for URLs that are on the whitelist' do before do - sham_rack_app = ShamRack.at('mycompany.fogbugz.com').stub - sham_rack_app.register_resource('/rails_sample.jpg', File.read(Rails.root + 'spec/fixtures/rails_sample.jpg'), 'image/jpg') - sham_rack_app.register_resource('/doc_sample.txt', File.read(Rails.root + 'spec/fixtures/doc_sample.txt'), 'text/plain') - end - - after do - ShamRack.unmount_all + stub_request(:get, 'http://mycompany.fogbugz.com/rails_sample.jpg').to_return(body: File.read(Rails.root + 'spec/fixtures/rails_sample.jpg')) + stub_request(:get, 'http://mycompany.fogbugz.com/doc_sample.txt').to_return(body: File.read(Rails.root + 'spec/fixtures/doc_sample.txt')) end context 'an image file' do |