From d2c1e07e8088fb2372d258cfdd27ee4aab10cef1 Mon Sep 17 00:00:00 2001 From: Stephen Date: Tue, 14 Aug 2012 13:38:08 +0100 Subject: Fixed regex to match sections and settings with non alphanumeric characters. Fixed writing to file without any sections at all. Fixed exists checking for variable type by always casting to string and added all the tests for the above items. --- spec/unit/puppet/provider/ini_setting/ruby_spec.rb | 62 +++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) (limited to 'spec') diff --git a/spec/unit/puppet/provider/ini_setting/ruby_spec.rb b/spec/unit/puppet/provider/ini_setting/ruby_spec.rb index 91d3050..72a5da0 100644 --- a/spec/unit/puppet/provider/ini_setting/ruby_spec.rb +++ b/spec/unit/puppet/provider/ini_setting/ruby_spec.rb @@ -6,6 +6,7 @@ describe provider_class do include PuppetlabsSpec::Files let(:tmpfile) { tmpfilename("ini_setting_test") } + let(:emptyfile) { tmpfilename("ini_setting_test_empty") } let(:orig_content) { <<-EOS # This is a comment @@ -14,16 +15,18 @@ describe provider_class do foo=foovalue bar = barvalue +master = true [section2] foo= foovalue2 baz=bazvalue +url = http://192.168.1.1:8080 #another comment ; yet another comment EOS } - def validate_file(expected_content) + def validate_file(expected_content,tmpfile = tmpfile) File.read(tmpfile).should == expected_content end @@ -32,6 +35,9 @@ baz=bazvalue File.open(tmpfile, 'w') do |fh| fh.write(orig_content) end + File.open(emptyfile, 'w') do |fh| + fh.write("") + end end context "when ensuring that a setting is present" do @@ -54,10 +60,12 @@ baz=bazvalue foo=foovalue bar = barvalue +master = true [section2] foo= foovalue2 baz=bazvalue +url = http://192.168.1.1:8080 #another comment ; yet another comment yahoo = yippee @@ -78,16 +86,44 @@ yahoo = yippee foo=foovalue bar = barvalue +master = true [section2] foo= foovalue2 baz = bazvalue2 +url = http://192.168.1.1:8080 #another comment ; yet another comment EOS ) end + it "should be able to handle settings with non alphanumbering settings " do + resource = Puppet::Type::Ini_setting.new(common_params.merge( + :setting => 'url', :value => 'http://192.168.0.1:8080')) + provider = described_class.new(resource) + provider.exists?.should == false + provider.create + + validate_file( <<-EOS +# This is a comment +[section1] +; This is also a comment +foo=foovalue + +bar = barvalue +master = true +[section2] + +foo= foovalue2 +baz=bazvalue +url = http://192.168.0.1:8080 + #another comment + ; yet another comment + EOS + ) + end + it "should recognize an existing setting with the specified value" do resource = Puppet::Type::Ini_setting.new(common_params.merge( :setting => 'baz', :value => 'bazvalue')) @@ -108,10 +144,12 @@ baz = bazvalue2 foo=foovalue bar = barvalue +master = true [section2] foo= foovalue2 baz=bazvalue +url = http://192.168.1.1:8080 #another comment ; yet another comment @@ -120,5 +158,27 @@ huzzah = shazaam EOS ) end + + it "should add a new section if no sections exists" do + resource = Puppet::Type::Ini_setting.new(common_params.merge( + :section => "section1", :setting => 'setting1', :value => 'hellowworld', :path => emptyfile)) + provider = described_class.new(resource) + provider.exists?.should == false + provider.create + validate_file(" +[section1] +setting1 = hellowworld +", emptyfile) + end + + it "should be able to handle variables of any type" do + resource = Puppet::Type::Ini_setting.new(common_params.merge( + :section => "section1", :setting => 'master', :value => true)) + provider = described_class.new(resource) + provider.exists?.should == true + provider.create + end + + end end -- cgit v1.2.3