Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43

1 files changed, 0 insertions, 125 deletions

diff --git a/spec/lib/gitlab/http_connection_adapter_spec.rb b/spec/lib/gitlab/http_connection_adapter_spec.rb
index 96e6e485841..7c57d162e9b 100644
--- a/spec/lib/gitlab/http_connection_adapter_spec.rb
+++ b/spec/lib/gitlab/http_connection_adapter_spec.rb
@@ -124,130 +124,5 @@ RSpec.describe Gitlab::HTTPConnectionAdapter do
         expect(connection.port).to eq(443)
       end
     end
-
-    context 'when proxy settings are configured' do
-      let(:options) do
-        {
-          http_proxyaddr: 'https://proxy.org',
-          http_proxyport: 1557,
-          http_proxyuser: 'user',
-          http_proxypass: 'pass'
-        }
-      end
-
-      before do
-        stub_all_dns('https://proxy.org', ip_address: '166.84.12.54')
-      end
-
-      it 'sets up the proxy settings' do
-        expect(connection.proxy_address).to eq('https://166.84.12.54')
-        expect(connection.proxy_port).to eq(1557)
-        expect(connection.proxy_user).to eq('user')
-        expect(connection.proxy_pass).to eq('pass')
-      end
-
-      context 'when the address has path' do
-        before do
-          options[:http_proxyaddr] = 'https://proxy.org/path'
-        end
-
-        it 'sets up the proxy settings' do
-          expect(connection.proxy_address).to eq('https://166.84.12.54/path')
-          expect(connection.proxy_port).to eq(1557)
-        end
-      end
-
-      context 'when the port is in the address and port' do
-        before do
-          options[:http_proxyaddr] = 'https://proxy.org:1422'
-        end
-
-        it 'sets up the proxy settings' do
-          expect(connection.proxy_address).to eq('https://166.84.12.54')
-          expect(connection.proxy_port).to eq(1557)
-        end
-
-        context 'when the port is only in the address' do
-          before do
-            options[:http_proxyport] = nil
-          end
-
-          it 'sets up the proxy settings' do
-            expect(connection.proxy_address).to eq('https://166.84.12.54')
-            expect(connection.proxy_port).to eq(1422)
-          end
-        end
-      end
-
-      context 'when it is a request to local network' do
-        before do
-          options[:http_proxyaddr] = 'http://172.16.0.0/12'
-        end
-
-        it 'raises error' do
-          expect { subject }.to raise_error(
-            Gitlab::HTTP::BlockedUrlError,
-            "URL 'http://172.16.0.0:1557/12' is blocked: Requests to the local network are not allowed"
-          )
-        end
-
-        context 'when local request allowed' do
-          before do
-            options[:allow_local_requests] = true
-          end
-
-          it 'sets up the connection' do
-            expect(connection.proxy_address).to eq('http://172.16.0.0/12')
-            expect(connection.proxy_port).to eq(1557)
-          end
-        end
-      end
-
-      context 'when it is a request to local address' do
-        before do
-          options[:http_proxyaddr] = 'http://127.0.0.1'
-        end
-
-        it 'raises error' do
-          expect { subject }.to raise_error(
-            Gitlab::HTTP::BlockedUrlError,
-            "URL 'http://127.0.0.1:1557' is blocked: Requests to localhost are not allowed"
-          )
-        end
-
-        context 'when local request allowed' do
-          before do
-            options[:allow_local_requests] = true
-          end
-
-          it 'sets up the connection' do
-            expect(connection.proxy_address).to eq('http://127.0.0.1')
-            expect(connection.proxy_port).to eq(1557)
-          end
-        end
-      end
-
-      context 'when http(s) environment variable is set' do
-        before do
-          stub_env('https_proxy' => 'https://my.proxy')
-        end
-
-        it 'sets up the connection' do
-          expect(connection.proxy_address).to eq('https://proxy.org')
-          expect(connection.proxy_port).to eq(1557)
-        end
-      end
-
-      context 'when DNS rebinding protection is disabled' do
-        before do
-          stub_application_setting(dns_rebinding_protection_enabled: false)
-        end
-
-        it 'sets up the connection' do
-          expect(connection.proxy_address).to eq('https://proxy.org')
-          expect(connection.proxy_port).to eq(1557)
-        end
-      end
-    end
   end
 end