From 89675b1cfc638a61e510d9e7c0dceaecb67a01e3 Mon Sep 17 00:00:00 2001
From: Garrett Honeycutt <code@garretthoneycutt.com>
Date: Mon, 4 Dec 2017 23:52:00 -0500
Subject: [PATCH 1/2] (MODULES-6216) Add acceptance tests for type3x() function

---
 spec/acceptance/type3x_spec.rb | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100755 spec/acceptance/type3x_spec.rb

diff --git a/spec/acceptance/type3x_spec.rb b/spec/acceptance/type3x_spec.rb
new file mode 100755
index 000000000..e96ef83be
--- /dev/null
+++ b/spec/acceptance/type3x_spec.rb
@@ -0,0 +1,28 @@
+#! /usr/bin/env ruby -S rspec
+require 'spec_helper_acceptance'
+
+describe 'type3x function' do
+  describe 'success' do
+    {
+      %{type3x({ 'a' => 'hash' })} => 'Hash',
+      %{type3x(['array'])}         => 'Array',
+      %{type3x(false)}             => 'Boolean',
+      %{type3x('asdf')}            => 'String',
+      %{type3x(242)}               => 'Integer',
+      %{type3x(3.14)}              => 'Float',
+    }.each do |pp, type|
+      it "with type #{type}" do
+        apply_manifest(pp, :catch_failures => true)
+      end
+    end
+  end
+
+  describe 'failure' do
+    pp_fail = <<-EOS
+      type3x('one','two')
+    EOS
+    it 'handles improper number of arguments' do
+      expect(apply_manifest(pp_fail, :expect_failures => true).stderr).to match(%r{Wrong number of arguments})
+    end
+  end
+end

From 1d551535038afc2334c66c5000e5061b86a20342 Mon Sep 17 00:00:00 2001
From: Paula McMaw <paula@puppet.com>
Date: Tue, 5 Dec 2017 12:31:09 +0000
Subject: [PATCH 2/2] fix type3x

---
 lib/puppet/parser/functions/type.rb   | 2 +-
 lib/puppet/parser/functions/type3x.rb | 4 ++--
 spec/acceptance/type3x_spec.rb        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/puppet/parser/functions/type.rb b/lib/puppet/parser/functions/type.rb
index bda2efbcc..d9d841ba8 100644
--- a/lib/puppet/parser/functions/type.rb
+++ b/lib/puppet/parser/functions/type.rb
@@ -11,7 +11,7 @@ module Puppet::Parser::Functions
     unless Puppet::Parser::Functions.autoloader.loaded?(:type3x)
       Puppet::Parser::Functions.autoloader.load(:type3x)
     end
-    function_type3x(args + [false])
+    function_type3x(args)
   end
 end
 
diff --git a/lib/puppet/parser/functions/type3x.rb b/lib/puppet/parser/functions/type3x.rb
index 35d62b58c..f5b46aa1f 100644
--- a/lib/puppet/parser/functions/type3x.rb
+++ b/lib/puppet/parser/functions/type3x.rb
@@ -15,13 +15,13 @@ module Puppet::Parser::Functions
     * boolean
   DOC
              ) do |args|
-    raise(Puppet::ParseError, "type3x(): Wrong number of arguments given (#{args.size} for 1)") if args.empty?
+    raise(Puppet::ParseError, "type3x(): Wrong number of arguments given (#{args.size} for 1)") unless args.size == 1
 
     value = args[0]
 
     klass = value.class
 
-    unless [TrueClass, FalseClass, Array, Integer, Integer, Float, Hash, String].include?(klass)
+    unless [TrueClass, FalseClass, Array, Bignum, Fixnum, Float, Hash, String].include?(klass) # rubocop:disable Lint/UnifiedInteger
       raise(Puppet::ParseError, 'type3x(): Unknown type')
     end
 
diff --git a/spec/acceptance/type3x_spec.rb b/spec/acceptance/type3x_spec.rb
index e96ef83be..09005da93 100755
--- a/spec/acceptance/type3x_spec.rb
+++ b/spec/acceptance/type3x_spec.rb
@@ -18,9 +18,9 @@
   end
 
   describe 'failure' do
-    pp_fail = <<-EOS
+    pp_fail = <<-MANIFEST
       type3x('one','two')
-    EOS
+    MANIFEST
     it 'handles improper number of arguments' do
       expect(apply_manifest(pp_fail, :expect_failures => true).stderr).to match(%r{Wrong number of arguments})
     end