diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
| commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
| tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /spec/lib/gitlab/http_spec.rb | |
| parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) | |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'spec/lib/gitlab/http_spec.rb')
| -rw-r--r-- | spec/lib/gitlab/http_spec.rb | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/spec/lib/gitlab/http_spec.rb b/spec/lib/gitlab/http_spec.rb index 5c990eb3248..308f7f46251 100644 --- a/spec/lib/gitlab/http_spec.rb +++ b/spec/lib/gitlab/http_spec.rb @@ -157,17 +157,6 @@ RSpec.describe Gitlab::HTTP do described_class.put('http://example.org', write_timeout: 1) end end - - context 'when default timeouts feature is disabled' do - it 'does not apply any defaults' do - stub_feature_flags(http_default_timeouts: false) - expect(described_class).to receive(:httparty_perform_request).with( - Net::HTTP::Get, 'http://example.org', open_timeout: 1 - ).and_call_original - - described_class.get('http://example.org', open_timeout: 1) - end - end end describe '.try_get' do |