4 files changed, 27 insertions, 3 deletions
diff --git a/spec/acceptance/deprecation_spec.rb b/spec/acceptance/deprecation_spec.rb
index ea13700..7a0b34c 100644
--- a/spec/acceptance/deprecation_spec.rb
+++ b/spec/acceptance/deprecation_spec.rb
@@ -82,4 +82,21 @@ describe 'deprecation function' do
       it { is_expected.to be_file }
     end
   end
+
+  context 'puppet 3 test', if: get_puppet_version =~ /^3/ do
+    before :all do
+      @result = on(default, puppet('apply', '--parser=future', '-e', add_file_manifest), acceptable_exit_codes: (0...256))
+    end
+    after :all do
+      apply_manifest(remove_file_manifest)
+    end
+
+    it "should return a deprecation error" do
+      expect(@result.stderr).to match(/Warning: message/)
+    end
+    it "should pass without error" do
+      expect(@result.exit_code).to eq(0)
+    end
+  end
+
 end
diff --git a/spec/functions/deprecation_spec.rb b/spec/functions/deprecation_spec.rb
index 9859833..cee4f1c 100644
--- a/spec/functions/deprecation_spec.rb
+++ b/spec/functions/deprecation_spec.rb
@@ -41,11 +41,14 @@ if Puppet.version.to_f >= 4.0
     }
   end
 else
+  # Puppet version < 4 will use these tests.
   describe 'deprecation' do
     after(:all) do
       ENV.delete('STDLIB_LOG_DEPRECATIONS')
     end
-    ENV['STDLIB_LOG_DEPRECATIONS'] = "true"
+    before(:all) do
+      ENV['STDLIB_LOG_DEPRECATIONS'] = "true"
+    end
     it { is_expected.not_to eq(nil) }
     it { is_expected.to run.with_params().and_raise_error(Puppet::ParseError, /wrong number of arguments/i) }
 
diff --git a/spec/functions/join_keys_to_values_spec.rb b/spec/functions/join_keys_to_values_spec.rb
index 6c109d1..c2bae5b 100755
--- a/spec/functions/join_keys_to_values_spec.rb
+++ b/spec/functions/join_keys_to_values_spec.rb
@@ -16,4 +16,8 @@ describe 'join_keys_to_values' do
     result = subject.call([{ 'key1' => 'value1', 'key2' => 'value2' }, ':'])
     expect(result.sort).to eq(['key1:value1', 'key2:value2'].sort)
   end
+  it 'should run join_keys_to_values(<hash with array value>, " ") and return the proper array' do
+    result = subject.call([{ 'key1' => 'value1', 'key2' => ['value2', 'value3'] }, ' '])
+    expect(result.sort).to eq(['key1 value1', 'key2 value2', 'key2 value3'].sort)
+  end
 end
diff --git a/spec/functions/validate_legacy_spec.rb b/spec/functions/validate_legacy_spec.rb
index 45089ef..50cb317 100644
--- a/spec/functions/validate_legacy_spec.rb
+++ b/spec/functions/validate_legacy_spec.rb
@@ -28,7 +28,7 @@ if Puppet.version.to_f >= 4.0
     describe 'when failing the type assertion and passing the previous validation' do
       before do
         scope.expects(:function_validate_foo).with(['5']).once
-        subject.func.expects(:call_function).with('deprecation', 'validate_legacy', includes('expected an Integer value')).once
+        subject.func.expects(:call_function).with('deprecation', 'validate_legacy', includes('Integer')).once
       end
       it 'passes with a deprecation message' do
         is_expected.to run.with_params('Integer', 'validate_foo', '5')
@@ -38,7 +38,7 @@ if Puppet.version.to_f >= 4.0
     describe 'when failing the type assertion and failing the previous validation' do
       before do
         scope.expects(:function_validate_foo).with(['5']).raises(Puppet::ParseError, 'foo').once
-        subject.func.expects(:call_function).with('fail', includes('expected an Integer value')).once
+        subject.func.expects(:call_function).with('fail', includes('Integer')).once
       end
       it 'fails with a helpful message' do
         is_expected.to run.with_params('Integer', 'validate_foo', '5')