Merge remote-tracking branch 'origin/master' into leap_masterHEADmaster

1 files changed, 27 insertions, 10 deletions

diff --git a/spec/functions/loadjson_spec.rb b/spec/functions/loadjson_spec.rb
index a00dff9..dbef805 100644
--- a/spec/functions/loadjson_spec.rb
+++ b/spec/functions/loadjson_spec.rb
@@ -6,26 +6,37 @@ describe 'loadjson' do
 
   describe "when calling with valid arguments" do
     before :each do
-      if RSpec.configuration.puppet_future
-        allow(File).to receive(:read).with(/\/stdlib\/metadata.json/, {:encoding=>"utf-8"}).and_return('{"name": "puppetlabs-stdlib"}')
-      else
-        allow(File).to receive(:read).with(/\/stdlib\/metadata.json/).and_return('{"name": "puppetlabs-stdlib"}')
-      end
+      allow(File).to receive(:read).with(/\/(stdlib|test)\/metadata.json/, {:encoding=>"utf-8"}).and_return('{"name": "puppetlabs-stdlib"}')
+      allow(File).to receive(:read).with(/\/(stdlib|test)\/metadata.json/).and_return('{"name": "puppetlabs-stdlib"}')
     end
 
     context 'when a non-existing file is specified' do
-      let(:filename) { '/tmp/doesnotexist' }
+      let(:filename) {
+        if Puppet::Util::Platform.windows?
+          'C:/tmp/doesnotexist'
+        else
+          '/tmp/doesnotexist'
+        end
+      }
       before {
         allow(File).to receive(:exists?).with(filename).and_return(false).once
         allow(PSON).to receive(:load).never
       }
       it { is_expected.to run.with_params(filename, {'default' => 'value'}).and_return({'default' => 'value'}) }
+      it { is_expected.to run.with_params(filename, {'đẽƒằưļŧ' => '٧ẵłựέ'}).and_return({'đẽƒằưļŧ' => '٧ẵłựέ'}) }
+      it { is_expected.to run.with_params(filename, {'デフォルト' => '値'}).and_return({'デフォルト' => '値'}) }
     end
 
     context 'when an existing file is specified' do
-      let(:filename) { '/tmp/doesexist' }
-      let(:data) { { 'key' => 'value' } }
-      let(:json) { '{"key":"value"}' }
+      let(:filename) {
+        if Puppet::Util::Platform.windows?
+          'C:/tmp/doesexist'
+        else
+          '/tmp/doesexist'
+        end
+      }
+      let(:data) { { 'key' => 'value', 'ķęŷ' => 'νậŀųề', 'キー' => '値'} }
+      let(:json) { '{"key":"value", {"ķęŷ":"νậŀųề" }, {"キー":"値" }' }
       before {
         allow(File).to receive(:exists?).with(filename).and_return(true).once
         allow(File).to receive(:read).with(filename).and_return(json).once
@@ -36,7 +47,13 @@ describe 'loadjson' do
     end
 
     context 'when the file could not be parsed' do
-      let(:filename) { '/tmp/doesexist' }
+      let(:filename) {
+        if Puppet::Util::Platform.windows?
+          'C:/tmp/doesexist'
+        else
+          '/tmp/doesexist'
+        end
+      }
       let(:json) { '{"key":"value"}' }
       before {
         allow(File).to receive(:exists?).with(filename).and_return(true).once