puppet 6.29.0 → 7.0.0

data/spec/unit/functions/lookup_spec.rb

@@ -870,46 +870,6 @@ describe "The lookup function" do
       end
     end
 
-    context 'with lookup_options' do
-      let(:environment_files) do
-        {
-          env_name => {
-            'hiera.yaml' => <<-YAML.unindent,
-              ---
-              version: 5
-              YAML
-            'data' => {
-              'common.yaml' => common_yaml
-            }
-          }
-        }
-      end
-
-      context 'that are empty' do
-        let(:common_yaml) { <<-YAML.unindent }
-          lookup_options:
-          a: b
-          YAML
-
-        it 'ignores empty options' do
-          expect(lookup('a')).to eq("b")
-        end
-      end
-
-      context 'that contains a legal yaml hash with unexpected types' do
-        let(:common_yaml) { <<-YAML.unindent }
-          lookup_options:
-            :invalid_symbol
-          YAML
-
-        it 'fails lookup and reports a type mismatch' do
-          expect {
-            lookup('a')
-          }.to raise_error(Puppet::DataBinding::LookupError, /has wrong type, expects Puppet::LookupValue, got Runtime\[ruby, 'Symbol'\]/)
-        end
-      end
-    end
-
     context 'with lookup_options configured using patterns' do
       let(:mod_common) {
         <<-YAML.unindent
@@ -1059,30 +1019,6 @@ describe "The lookup function" do
         })
       end
 
-      context 'and lookup_options is empty' do
-        let(:mod_common) { <<-YAML.unindent }
-          lookup_options:
-          mod::a: b
-          YAML
-
-        it 'ignores empty options' do
-          expect(lookup('mod::a')).to eq("b")
-        end
-      end
-
-      context 'and lookup_options contains a legal hash with unexpected types' do
-        let(:mod_common) { <<-YAML.unindent }
-          lookup_options:
-            :invalid_symbol
-          YAML
-
-        it 'fails lookup and reports a type mismatch' do
-          expect {
-            lookup('mod::a')
-          }.to raise_error(Puppet::DataBinding::LookupError, /has wrong type, expects Puppet::LookupValue, got Runtime\[ruby, 'Symbol'\]/)
-        end
-      end
-
       context 'and patterns in module are not limited to module keys' do
         let(:mod_common) {
           <<-YAML.unindent

data/spec/unit/functions/unwrap_spec.rb

@@ -15,14 +15,6 @@ describe 'the unwrap function' do
     expect(eval_and_collect_notices(code)).to eq(['unwrapped value is 12345'])
   end
 
-  it 'just returns a non-sensitive value' do
-    code = <<-CODE
-      $non_sensitive = "12345"
-      notice("value is still ${non_sensitive.unwrap}")
-    CODE
-    expect(eval_and_collect_notices(code)).to eq(['value is still 12345'])
-  end
-
   it 'unwraps a sensitive value when given a code block' do
     code = <<-CODE
       $sensitive = Sensitive.new("12345")

data/spec/unit/functions/upcase_spec.rb

@@ -15,7 +15,7 @@ describe 'the upcase function' do
     expect(compile_to_catalog("notify { String(42.upcase == 42): }")).to have_resource('Notify[true]')
   end
 
-  it 'performs capitalize of international UTF-8 characters', :if => RUBY_VERSION >= "2.4" do
+  it 'performs upcase of international UTF-8 characters' do
     expect(compile_to_catalog("notify { 'åäö'.upcase: }")).to have_resource('Notify[ÅÄÖ]')
   end
 

data/spec/unit/functions/versioncmp_spec.rb

@@ -19,52 +19,16 @@ describe "the versioncmp function" do
   let(:type_parser) { Puppet::Pops::Types::TypeParser.singleton }
 
   it 'should raise an Error if there is less than 2 arguments' do
-    expect { versioncmp('a,b') }.to raise_error(/expects between 2 and 3 arguments, got 1/)
+    expect { versioncmp('a,b') }.to raise_error(/expects 2 arguments, got 1/)
   end
 
-  it 'should raise an Error if there is more than 3 arguments' do
-    expect { versioncmp('a,b','foo', false, 'bar') }.to raise_error(/expects between 2 and 3 arguments, got 4/)
+  it 'should raise an Error if there is more than 2 arguments' do
+    expect { versioncmp('a,b','foo', 'bar') }.to raise_error(/expects 2 arguments, got 3/)
   end
 
   it "should call Puppet::Util::Package.versioncmp (included in scope)" do
-    expect(Puppet::Util::Package).to receive(:versioncmp).with('1.2', '1.3', false).and_return(-1)
+    expect(Puppet::Util::Package).to receive(:versioncmp).with('1.2', '1.3').and_return(-1)
 
     expect(versioncmp('1.2', '1.3')).to eq(-1)
   end
-
-  context "when ignore_trailing_zeroes is true" do
-    it "should equate versions with 2 elements and dots but with unnecessary zero" do
-      expect(versioncmp("10.1.0", "10.1", true)).to eq(0)
-    end
-
-    it "should equate versions with 1 element and dot but with unnecessary zero" do
-      expect(versioncmp("11.0", "11", true)).to eq(0)
-    end
-
-    it "should equate versions with 1 element and dot but with unnecessary zeros" do
-      expect(versioncmp("11.00", "11", true)).to eq(0)
-    end
-
-    it "should equate versions with dots and iregular zeroes" do
-      expect(versioncmp("11.0.00", "11", true)).to eq(0)
-    end
-
-    it "should equate versions with dashes" do
-      expect(versioncmp("10.1-0", "10.1.0-0", true)).to eq(0)
-    end
-
-    it "should compare versions with dashes after normalization" do
-      expect(versioncmp("10.1-1", "10.1.0-0", true)).to eq(1)
-    end
-
-    it "should not normalize versions if zeros are not trailing" do
-      expect(versioncmp("1.1", "1.0.1", true)).to eq(1)
-    end
-  end
-
-  context "when ignore_trailing_zeroes is false" do
-    it "should not equate versions if zeros are not trailing" do
-      expect(versioncmp("1.1", "1.0.1")).to eq(1)
-    end
-  end
 end

data/spec/unit/functions4_spec.rb

@@ -160,7 +160,7 @@ describe 'the 4x function api' do
       expect(func.is_a?(Puppet::Functions::Function)).to be_truthy
       expect do
         func.call({}, 3, 10, 3, "4")
-      end.to raise_error(ArgumentError, "The function 'min' was called with arguments it does not accept. It expects one of:
+      end.to raise_error(ArgumentError, "'min' expects one of:
   (Numeric x, Numeric y, Numeric a?, Numeric b?, Numeric c*)
     rejected: parameter 'b' expects a Numeric value, got String
   (String x, String y, String a+)
@@ -231,7 +231,7 @@ describe 'the 4x function api' do
       expect(func.is_a?(Puppet::Functions::Function)).to be_truthy
       expect do
         func.call({}, 10, '20')
-      end.to raise_error(ArgumentError, "The function 'min' was called with arguments it does not accept. It expects one of:
+      end.to raise_error(ArgumentError, "'min' expects one of:
   (Numeric a, Numeric b)
     rejected: parameter 'b' expects a Numeric value, got String
   (String s1, String s2)

data/spec/unit/gettext/config_spec.rb

@@ -27,18 +27,6 @@ describe Puppet::GettextConfig do
     Puppet::GettextConfig.delete_all_text_domains
   end
 
-  # These tests assume gettext is enabled, but it will be disabled when the
-  # first time the `Puppet[:disable_i18n]` setting is resolved
-  around(:each) do |example|
-    disabled = Puppet::GettextConfig.instance_variable_get(:@gettext_disabled)
-    Puppet::GettextConfig.instance_variable_set(:@gettext_disabled, false)
-    begin
-      example.run
-    ensure
-      Puppet::GettextConfig.instance_variable_set(:@gettext_disabled, disabled)
-    end
-  end
-
   describe 'setting and getting the locale' do
     it 'should return "en" when gettext is unavailable' do
       allow(Puppet::GettextConfig).to receive(:gettext_loaded?).and_return(false)

data/spec/unit/http/client_spec.rb

@@ -120,24 +120,6 @@ describe Puppet::HTTP::Client do
 
       client.close
     end
-
-    it 'reloads the default ssl context' do
-      expect(client.pool).to receive(:with_connection) do |_, verifier|
-        expect(verifier.ssl_context).to_not equal(puppet_context)
-      end
-
-      client.close
-      client.connect(uri)
-    end
-
-    it 'reloads the default system ssl context' do
-      expect(client.pool).to receive(:with_connection) do |_, verifier|
-        expect(verifier.ssl_context).to_not equal(system_context)
-      end
-
-      client.close
-      client.connect(uri, options: {include_system_store: true})
-    end
   end
 
   context "for GET requests" do
@@ -172,7 +154,7 @@ describe Puppet::HTTP::Client do
       stub_request(:get, uri)
 
       response = client.get(uri)
-      expect(response).to be_an_instance_of(Puppet::HTTP::Response)
+      expect(response).to be_a(Puppet::HTTP::Response)
       expect(response).to be_success
       expect(response.code).to eq(200)
     end
@@ -242,7 +224,7 @@ describe Puppet::HTTP::Client do
       stub_request(:head, uri)
 
       response = client.head(uri)
-      expect(response).to be_an_instance_of(Puppet::HTTP::Response)
+      expect(response).to be_a(Puppet::HTTP::Response)
       expect(response).to be_success
       expect(response.code).to eq(200)
     end
@@ -302,7 +284,7 @@ describe Puppet::HTTP::Client do
       stub_request(:put, uri)
 
       response = client.put(uri, "", headers: {'Content-Type' => 'text/plain'})
-      expect(response).to be_an_instance_of(Puppet::HTTP::Response)
+      expect(response).to be_a(Puppet::HTTP::Response)
       expect(response).to be_success
       expect(response.code).to eq(200)
     end
@@ -371,7 +353,7 @@ describe Puppet::HTTP::Client do
       stub_request(:post, uri)
 
       response = client.post(uri, "", headers: {'Content-Type' => 'text/plain'})
-      expect(response).to be_an_instance_of(Puppet::HTTP::Response)
+      expect(response).to be_a(Puppet::HTTP::Response)
       expect(response).to be_success
       expect(response.code).to eq(200)
     end
@@ -453,7 +435,7 @@ describe Puppet::HTTP::Client do
       stub_request(:delete, uri)
 
       response = client.delete(uri)
-      expect(response).to be_an_instance_of(Puppet::HTTP::Response)
+      expect(response).to be_a(Puppet::HTTP::Response)
       expect(response).to be_success
       expect(response.code).to eq(200)
     end
@@ -615,68 +597,11 @@ describe Puppet::HTTP::Client do
       expect(response).to be_success
     end
 
-    it "does not preserve basic authorization when redirecting to different hosts" do
-      stub_request(:get, start_url).with(basic_auth: credentials).to_return(redirect_to(url: other_host))
-      stub_request(:get, other_host).to_return(status: 200)
-
-      client.get(start_url, options: {basic_auth: {user: 'user', password: 'pass'}})
-      expect(a_request(:get, other_host).
-      with{ |req| !req.headers.key?('Authorization')}).to have_been_made
-    end
-
-    it "does preserve basic authorization when redirecting to the same hosts" do
-      stub_request(:get, start_url).with(basic_auth: credentials).to_return(redirect_to(url: bar_url))
-      stub_request(:get, bar_url).with(basic_auth: credentials).to_return(status: 200)
-
-      client.get(start_url, options: {basic_auth: {user: 'user', password: 'pass'}})
-      expect(a_request(:get, bar_url).
-      with{ |req| req.headers.key?('Authorization')}).to have_been_made
-    end
-
-    it "does not preserve cookie header when redirecting to different hosts" do
-      headers = { 'Cookie' => 'TEST_COOKIE'}
-
-      stub_request(:get, start_url).with(headers: headers).to_return(redirect_to(url: other_host))
-      stub_request(:get, other_host).to_return(status: 200)
-
-      client.get(start_url, headers: headers)
-      expect(a_request(:get, other_host).
-      with{ |req| !req.headers.key?('Cookie')}).to have_been_made
-    end
-
-    it "does preserve cookie header when redirecting to the same hosts" do
-      headers = { 'Cookie' => 'TEST_COOKIE'}
-
-      stub_request(:get, start_url).with(headers: headers).to_return(redirect_to(url: bar_url))
-      stub_request(:get, bar_url).with(headers: headers).to_return(status: 200)
-
-      client.get(start_url, headers: headers)
-      expect(a_request(:get, bar_url).
-      with{ |req| req.headers.key?('Cookie')}).to have_been_made
-    end
-
-    it "does preserves cookie header and basic authentication when Puppet[:location_trusted] is true redirecting to different hosts" do
-      headers = { 'cookie' => 'TEST_COOKIE'}
-      Puppet[:location_trusted] = true
-
-      stub_request(:get, start_url).with(headers: headers, basic_auth: credentials).to_return(redirect_to(url: other_host))
-      stub_request(:get, other_host).with(headers: headers, basic_auth: credentials).to_return(status: 200)
-
-      client.get(start_url, headers: headers, options: {basic_auth: {user: 'user', password: 'pass'}})
-      expect(a_request(:get, other_host).
-      with{ |req| req.headers.key?('Authorization') && req.headers.key?('Cookie')}).to have_been_made
-    end
-
-    it "treats hosts as case-insensitive" do
-      start_url = URI("https://www.EXAmple.com:8140/Start")
-      bar_url = "https://www.example.com:8140/bar"
-
+    it "preserves basic authorization" do
       stub_request(:get, start_url).with(basic_auth: credentials).to_return(redirect_to(url: bar_url))
       stub_request(:get, bar_url).with(basic_auth: credentials).to_return(status: 200)
 
       client.get(start_url, options: {basic_auth: {user: 'user', password: 'pass'}})
-      expect(a_request(:get, bar_url).
-      with{ |req| req.headers.key?('Authorization')}).to have_been_made
     end
 
     it "redirects given a relative location" do
@@ -846,7 +771,7 @@ describe Puppet::HTTP::Client do
     it "should close the connection before sleeping" do
       retry_after('42')
 
-      site = Puppet::Network::HTTP::Site.from_uri(uri)
+      site = Puppet::HTTP::Site.from_uri(uri)
 
       http1 = Net::HTTP.new(site.host, site.port)
       http1.use_ssl = true
@@ -856,8 +781,7 @@ describe Puppet::HTTP::Client do
       http2.use_ssl = true
       allow(http2).to receive(:started?).and_return(true)
 
-
-      pool = Puppet::Network::HTTP::Pool.new(15)
+      pool = Puppet::HTTP::Pool.new(15)
       client = Puppet::HTTP::Client.new(pool: pool)
 
       # The "with_connection" method is required to yield started connections

data/spec/unit/{network/resolver_spec.rb → http/dns_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
-require 'puppet/network/resolver'
+require 'puppet/http'
 
-describe Puppet::Network::Resolver do
+describe Puppet::HTTP::DNS do
   before do
     @dns_mock_object = double('dns')
     allow(Resolv::DNS).to receive(:new).and_return(@dns_mock_object)
@@ -26,7 +26,7 @@ describe Puppet::Network::Resolver do
     end
   end
 
-  let(:resolver) { Puppet::Network::Resolver.new }
+  let(:resolver) { described_class.new }
 
   describe 'when the domain is not known' do
     before :each do

data/spec/unit/http/external_client_spec.rb

@@ -9,7 +9,7 @@ class Puppet::HTTP::TestExternal
     @host = host
     @port = port
     @options = options
-    @factory = Puppet::Network::HTTP::Factory.new
+    @factory = Puppet::HTTP::Factory.new
   end
 
   def get(path, headers = {}, options = {})
@@ -27,7 +27,7 @@ class Puppet::HTTP::TestExternal
       request.basic_auth(options[:basic_auth][:user], options[:basic_auth][:password])
     end
 
-    site = Puppet::Network::HTTP::Site.new(@options[:use_ssl] ? 'https' : 'http', @host, @port)
+    site = Puppet::HTTP::Site.new(@options[:use_ssl] ? 'https' : 'http', @host, @port)
     http = @factory.create_connection(site)
     http.start
     begin
@@ -61,7 +61,7 @@ describe Puppet::HTTP::ExternalClient do
       stub_request(:get, uri)
 
       response = client.get(uri)
-      expect(response).to be_an_instance_of(Puppet::HTTP::Response)
+      expect(response).to be_a(Puppet::HTTP::Response)
       expect(response).to be_success
       expect(response.code).to eq(200)
     end
@@ -113,7 +113,7 @@ describe Puppet::HTTP::ExternalClient do
       stub_request(:post, uri)
 
       response = client.post(uri, "", headers: {'Content-Type' => 'text/plain'})
-      expect(response).to be_an_instance_of(Puppet::HTTP::Response)
+      expect(response).to be_a(Puppet::HTTP::Response)
       expect(response).to be_success
       expect(response.code).to eq(200)
     end

data/spec/unit/{network/http → http}/factory_spec.rb

@@ -1,22 +1,16 @@
 require 'spec_helper'
-require 'puppet/network/http'
-require 'puppet/util/http_proxy'
+require 'puppet/http'
 
-describe Puppet::Network::HTTP::Factory do
+describe Puppet::HTTP::Factory do
   before(:all) do
     ENV['http_proxy'] = nil
     ENV['HTTP_PROXY'] = nil
   end
-  before :each do
-    Puppet::SSL::Key.indirection.terminus_class = :memory
-    Puppet::SSL::CertificateRequest.indirection.terminus_class = :memory
-  end
 
-  let(:site) { Puppet::Network::HTTP::Site.new('https', 'www.example.com', 443) }
+  let(:site) { Puppet::HTTP::Site.new('https', 'www.example.com', 443) }
 
   def create_connection(site)
-    factory = Puppet::Network::HTTP::Factory.new
-
+    factory = described_class.new
     factory.create_connection(site)
   end
 
@@ -124,7 +118,7 @@ describe Puppet::Network::HTTP::Factory do
     expect(conn.keep_alive_timeout).to eq(2147483647)
   end
 
-  it "disables ruby's max retry on 2.5 and up", if: RUBY_VERSION.to_f >= 2.5 do
+  it "disables ruby's max retry" do
     conn = create_connection(site)
 
     expect(conn.max_retries).to eq(0)
@@ -144,23 +138,4 @@ describe Puppet::Network::HTTP::Factory do
       expect(conn.local_host).to eq('127.0.0.1')
     end
   end
-
-  context 'tls' do
-    it "sets the minimum version to TLS 1.0", if: RUBY_VERSION.to_f >= 2.5 do
-      conn = create_connection(site)
-      expect(conn.min_version).to eq(OpenSSL::SSL::TLS1_VERSION)
-    end
-
-    it "defaults to ciphersuites providing 128 bits of security or greater" do
-      conn = create_connection(site)
-      expect(conn.ciphers).to eq("ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA256:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256")
-    end
-
-    it "can be restricted to TLSv1.3 ciphers" do
-      tls13_ciphers = "TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256"
-      Puppet[:ciphers] = tls13_ciphers
-      conn = create_connection(site)
-      expect(conn.ciphers).to eq(tls13_ciphers)
-    end
-  end
 end

data/spec/unit/{network/http/session_spec.rb → http/pool_entry_spec.rb}

@@ -1,15 +1,15 @@
 require 'spec_helper'
 
-require 'puppet/network/http'
+require 'puppet/http'
 
-describe Puppet::Network::HTTP::Session do
+describe Puppet::HTTP::PoolEntry do
   let(:connection) { double('connection') }
   let(:verifier) { double('verifier') }
 
   def create_session(connection, expiration_time = nil)
     expiration_time ||= Time.now + 60 * 60
 
-    Puppet::Network::HTTP::Session.new(connection, verifier, expiration_time)
+    described_class.new(connection, verifier, expiration_time)
   end
 
   it 'provides access to its connection' do

data/spec/unit/{network/http → http}/pool_spec.rb

@@ -4,18 +4,13 @@ require 'openssl'
 require 'puppet/network/http'
 require 'puppet/network/http_pool'
 
-describe Puppet::Network::HTTP::Pool do
-  before :each do
-    Puppet::SSL::Key.indirection.terminus_class = :memory
-    Puppet::SSL::CertificateRequest.indirection.terminus_class = :memory
-  end
-
+describe Puppet::HTTP::Pool do
   let(:site) do
-    Puppet::Network::HTTP::Site.new('https', 'rubygems.org', 443)
+    Puppet::HTTP::Site.new('https', 'rubygems.org', 443)
   end
 
   let(:different_site) do
-    Puppet::Network::HTTP::Site.new('https', 'github.com', 443)
+    Puppet::HTTP::Site.new('https', 'github.com', 443)
   end
 
   let(:ssl_context) { Puppet::SSL::SSLContext.new }
@@ -26,11 +21,11 @@ describe Puppet::Network::HTTP::Pool do
   end
 
   def create_pool
-    Puppet::Network::HTTP::Pool.new(15)
+    Puppet::HTTP::Pool.new(15)
   end
 
   def create_pool_with_connections(site, *connections)
-    pool = Puppet::Network::HTTP::Pool.new(15)
+    pool = Puppet::HTTP::Pool.new(15)
     connections.each do |conn|
       pool.release(site, verifier, conn)
     end
@@ -38,7 +33,7 @@ describe Puppet::Network::HTTP::Pool do
   end
 
   def create_pool_with_http_connections(site, *connections)
-    pool = Puppet::Network::HTTP::Pool.new(15)
+    pool = Puppet::HTTP::Pool.new(15)
     connections.each do |conn|
       pool.release(site, nil, conn)
     end
@@ -48,7 +43,7 @@ describe Puppet::Network::HTTP::Pool do
   def create_pool_with_expired_connections(site, *connections)
     # setting keepalive timeout to -1 ensures any newly added
     # connections have already expired
-    pool = Puppet::Network::HTTP::Pool.new(-1)
+    pool = Puppet::HTTP::Pool.new(-1)
     connections.each do |conn|
       pool.release(site, verifier, conn)
     end
@@ -230,11 +225,11 @@ describe Puppet::Network::HTTP::Pool do
     end
 
     it 'returns a new HTTP connection if the cached connection is HTTPS' do
-      https_site = Puppet::Network::HTTP::Site.new('https', 'www.example.com', 443)
+      https_site = Puppet::HTTP::Site.new('https', 'www.example.com', 443)
       old_conn = create_connection(https_site)
       pool = create_pool_with_connections(https_site, old_conn)
 
-      http_site = Puppet::Network::HTTP::Site.new('http', 'www.example.com', 443)
+      http_site = Puppet::HTTP::Site.new('http', 'www.example.com', 443)
       new_conn = create_http_connection(http_site)
       allow(pool.factory).to receive(:create_connection).with(http_site).and_return(new_conn)
 
@@ -242,11 +237,11 @@ describe Puppet::Network::HTTP::Pool do
     end
 
     it 'returns a new HTTPS connection if the cached connection is HTTP' do
-      http_site = Puppet::Network::HTTP::Site.new('http', 'www.example.com', 443)
+      http_site = Puppet::HTTP::Site.new('http', 'www.example.com', 443)
       old_conn = create_http_connection(http_site)
       pool = create_pool_with_http_connections(http_site, old_conn)
 
-      https_site = Puppet::Network::HTTP::Site.new('https', 'www.example.com', 443)
+      https_site = Puppet::HTTP::Site.new('https', 'www.example.com', 443)
       new_conn = create_connection(https_site)
       allow(pool.factory).to receive(:create_connection).with(https_site).and_return(new_conn)
 
@@ -279,7 +274,7 @@ describe Puppet::Network::HTTP::Pool do
     end
 
     it 'returns a cached connection if both connections are http' do
-      http_site = Puppet::Network::HTTP::Site.new('http', 'www.example.com', 80)
+      http_site = Puppet::HTTP::Site.new('http', 'www.example.com', 80)
       old_conn = create_http_connection(http_site)
       pool = create_pool_with_http_connections(http_site, old_conn)
 

data/spec/unit/{util/http_proxy_spec.rb → http/proxy_spec.rb}

@@ -1,10 +1,8 @@
 require 'uri'
 require 'spec_helper'
-require 'puppet/util/http_proxy'
-
-describe Puppet::Util::HttpProxy do
-  include Puppet::Network::HTTP::Compression.module
+require 'puppet/http'
 
+describe Puppet::HTTP::Proxy do
   before(:all) do
     ENV['http_proxy'] = nil
     ENV['HTTP_PROXY'] = nil
@@ -346,69 +344,4 @@ describe Puppet::Util::HttpProxy do
       end
     end
   end
-
-  describe '.request_with_redirects' do
-    let(:dest) { URI.parse('http://mydomain.com/some/path') }
-
-    it 'generates accept and accept-encoding headers' do
-      stub_request(:head, dest)
-
-      headers = {
-        'Accept' => '*/*',
-        'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
-        'User-Agent' => /Puppet/
-      }
-      stub_request(:get, dest).with(headers: headers)
-
-      subject.request_with_redirects(dest, :get, 0)
-    end
-
-    it 'can return a compressed response body' do
-      stub_request(:head, dest)
-
-      compressed_body = [
-        0x1f, 0x8b, 0x08, 0x08, 0xe9, 0x08, 0x7a, 0x5a, 0x00, 0x03,
-        0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x00, 0xcb, 0xc8, 0xe4, 0x02,
-        0x00, 0x7a, 0x7a, 0x6f, 0xed, 0x03, 0x00, 0x00, 0x00
-      ].pack('C*')
-
-      stub_request(:get, dest).to_return(status: 200, body: compressed_body, headers: { 'Content-Encoding' => 'gzip' })
-
-      expect(
-        uncompress_body(subject.request_with_redirects(dest, :get, 0))
-      ).to eq("hi\n")
-    end
-
-    it 'generates accept and accept-encoding headers when a block is provided' do
-      stub_request(:head, dest)
-
-      headers = {
-        'Accept' => '*/*',
-        'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
-        'User-Agent' => /Puppet/
-      }
-      stub_request(:get, dest).with(headers: headers)
-
-      subject.request_with_redirects(dest, :get, 0) do
-        # unused
-      end
-    end
-
-    it 'only makes a single HEAD request' do
-      stub_request(:head, dest)
-
-      subject.request_with_redirects(dest, :head, 0)
-    end
-
-    it 'preserves query parameters' do
-      url = URI.parse('http://mydomain.com/some/path?foo=bar')
-
-      stub_request(:head, url)
-      stub_request(:get, url)
-
-      subject.request_with_redirects(url, :get, 0) do
-        # unused
-      end
-    end
-  end
 end