Merge pull request #600 from dmitryilyin/master

Add the default value to the "loadyaml" function

2 files changed, 51 insertions, 3 deletions

diff --git a/spec/functions/loadjson_spec.rb b/spec/functions/loadjson_spec.rb
new file mode 100644
index 0000000..12a9b82
--- /dev/null
+++ b/spec/functions/loadjson_spec.rb
@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe 'loadjson' do
+  it { is_expected.not_to eq(nil) }
+  it { is_expected.to run.with_params().and_raise_error(ArgumentError, /wrong number of arguments/i) }
+
+  context 'when a non-existing file is specified' do
+    let(:filename) { '/tmp/doesnotexist' }
+    before {
+      File.expects(:exists?).with(filename).returns(false).once
+      PSON.expects(:load).never
+    }
+    it { is_expected.to run.with_params(filename, {'default' => 'value'}).and_return({'default' => 'value'}) }
+  end
+
+  context 'when an existing file is specified' do
+    let(:filename) { '/tmp/doesexist' }
+    let(:data) { { 'key' => 'value' } }
+    let(:json) { '{"key":"value"}' }
+    before {
+      File.expects(:exists?).with(filename).returns(true).once
+      File.expects(:read).with(filename).returns(json).once
+      PSON.expects(:load).with(json).returns(data).once
+    }
+    it { is_expected.to run.with_params(filename).and_return(data) }
+  end
+
+  context 'when the file could not be parsed' do
+    let(:filename) { '/tmp/doesexist' }
+    let(:json) { '{"key":"value"}' }
+    before {
+      File.expects(:exists?).with(filename).returns(true).once
+      File.expects(:read).with(filename).returns(json).once
+      PSON.stubs(:load).with(json).once.raises StandardError, 'Something terrible have happened!'
+    }
+    it { is_expected.to run.with_params(filename, {'default' => 'value'}).and_return({'default' => 'value'}) }
+  end
+end
diff --git a/spec/functions/loadyaml_spec.rb b/spec/functions/loadyaml_spec.rb
index ffc714d..9f16a1a 100755
--- a/spec/functions/loadyaml_spec.rb
+++ b/spec/functions/loadyaml_spec.rb
@@ -2,16 +2,17 @@ require 'spec_helper'
 
 describe 'loadyaml' do
   it { is_expected.not_to eq(nil) }
-  it { is_expected.to run.with_params().and_raise_error(Puppet::ParseError, /wrong number of arguments/i) }
-  it { is_expected.to run.with_params('', '').and_raise_error(Puppet::ParseError, /wrong number of arguments/i) }
+  it { is_expected.to run.with_params().and_raise_error(ArgumentError, /wrong number of arguments/i) }
+
   context 'when a non-existing file is specified' do
     let(:filename) { '/tmp/doesnotexist' }
     before {
       File.expects(:exists?).with(filename).returns(false).once
       YAML.expects(:load_file).never
     }
-    it { is_expected.to run.with_params(filename).and_return(nil) }
+    it { is_expected.to run.with_params(filename, {'default' => 'value'}).and_return({'default' => 'value'}) }
   end
+
   context 'when an existing file is specified' do
     let(:filename) { '/tmp/doesexist' }
     let(:data) { { 'key' => 'value' } }
@@ -21,4 +22,13 @@ describe 'loadyaml' do
     }
     it { is_expected.to run.with_params(filename).and_return(data) }
   end
+
+  context 'when the file could not be parsed' do
+    let(:filename) { '/tmp/doesexist' }
+    before {
+      File.expects(:exists?).with(filename).returns(true).once
+      YAML.stubs(:load_file).with(filename).once.raises StandardError, 'Something terrible have happened!'
+    }
+    it { is_expected.to run.with_params(filename, {'default' => 'value'}).and_return({'default' => 'value'}) }
+  end
 end