2 files changed, 18 insertions, 18 deletions
diff --git a/app-admin/puppet/files/puppet-fix-tests-5.5.14.patch b/app-admin/puppet/files/puppet-fix-tests-5.5.14.patch
new file mode 100644
index 000000000000..09ffe07da1ae
--- /dev/null
+++ b/app-admin/puppet/files/puppet-fix-tests-5.5.14.patch
@@ -0,0 +1,18 @@
+--- puppet/spec/unit/network/http/api/indirected_routes_spec.rb
++++ puppet/spec/unit/network/http/api/indirected_routes_spec.rb
+@@ -142,15 +142,6 @@
+       handler.uri2indirection("GET", uri_escaped, params)
+     end
+ 
+-    it "should not pass through an environment to check_authorization and fail if the environment is unknown" do
+-      expect(handler).to receive(:check_authorization) do |_, _, arg|
+-        expect(arg).not_to include(:environment)
+-      end
+-      expect(lambda { handler.uri2indirection("GET",
+-                                              "#{master_url_prefix}/node/bar",
+-                                              {:environment => 'bogus'}) }).to raise_error(not_found_error)
+-    end
+-
+     it "should not URI unescape the indirection key as passed through to a call to check_authorization" do
+       expect(handler).to receive(:check_authorization).with(anything, anything, hash_including(environment: be_a(Puppet::Node::Environment).and(have_attributes(name: :env))))
+ 
diff --git a/app-admin/puppet/files/puppet-fix-tests-6.0.0.patch b/app-admin/puppet/files/puppet-fix-tests-6.0.0.patch
deleted file mode 100644
index 3e51218034cc..000000000000
--- a/app-admin/puppet/files/puppet-fix-tests-6.0.0.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- spec/unit/network/http/api/indirected_routes_spec.rb	2018-09-17 19:36:56.000000000 -0500
-+++ spec/unit/network/http/api/indirected_routes_spec.rb	2018-09-19 10:52:35.841614932 -0500
-@@ -143,15 +143,6 @@
-       _, _, _, _ = handler.uri2indirection("GET", uri_escaped, params)
-     end
- 
--    it "when the environment is unknown should remove :environment from params passed to check_authorization and therefore fail" do
--      handler.expects(:check_authorization).with(anything,
--                                                 anything,
--                                                 Not(has_key(:environment)))
--      expect(lambda { handler.uri2indirection("GET",
--                                              "#{master_url_prefix}/node/bar",
--                                              {:environment => 'bogus'}) }).to raise_error(not_found_error)
--    end
--
-     it "should not URI unescape the indirection key as passed through to a call to check_authorization" do
-       handler.expects(:check_authorization).with(anything,
-                                                  anything,