chef 12.0.3-x86-mingw32 → 12.1.0.rc.0-x86-mingw32

data/spec/unit/util/backup_spec.rb

@@ -28,33 +28,33 @@ describe Chef::Util::Backup do
 
   before(:each) do
     @new_resource = double("new_resource")
-    @new_resource.should_receive(:path).at_least(:once).and_return(tempfile.path)
+    expect(@new_resource).to receive(:path).at_least(:once).and_return(tempfile.path)
     @backup = Chef::Util::Backup.new(@new_resource)
   end
 
   it "should store the resource passed to new as new_resource" do
-    @backup.new_resource.should eql(@new_resource)
+    expect(@backup.new_resource).to eql(@new_resource)
   end
 
   describe "for cases when we don't want to back anything up" do
 
     before(:each) do
-      @backup.should_not_receive(:do_backup)
+      expect(@backup).not_to receive(:do_backup)
     end
 
     it "should not attempt to backup a file if :backup is false" do
-      @new_resource.should_receive(:backup).at_least(:once).and_return(false)
+      expect(@new_resource).to receive(:backup).at_least(:once).and_return(false)
       @backup.backup!
     end
 
     it "should not attempt to backup a file if :backup == 0" do
-      @new_resource.should_receive(:backup).at_least(:once).and_return(0)
+      expect(@new_resource).to receive(:backup).at_least(:once).and_return(0)
       @backup.backup!
     end
 
     it "should not attempt to backup a file if it does not exist" do
-      @new_resource.should_receive(:backup).at_least(:once).and_return(1)
-      File.should_receive(:exist?).with(tempfile.path).at_least(:once).and_return(false)
+      expect(@new_resource).to receive(:backup).at_least(:once).and_return(1)
+      expect(File).to receive(:exist?).with(tempfile.path).at_least(:once).and_return(false)
       @backup.backup!
     end
 
@@ -62,43 +62,43 @@ describe Chef::Util::Backup do
 
   describe "for cases when we want to back things up" do
     before(:each) do
-      @backup.should_receive(:do_backup)
+      expect(@backup).to receive(:do_backup)
     end
 
     describe "when the number of backups is specified as 1" do
       before(:each) do
-        @new_resource.should_receive(:backup).at_least(:once).and_return(1)
+        expect(@new_resource).to receive(:backup).at_least(:once).and_return(1)
       end
 
       it "should not delete anything if this is the only backup" do
-        @backup.should_receive(:sorted_backup_files).and_return(['a'])
-        @backup.should_not_receive(:delete_backup)
+        expect(@backup).to receive(:sorted_backup_files).and_return(['a'])
+        expect(@backup).not_to receive(:delete_backup)
         @backup.backup!
       end
 
       it "should keep only 1 backup copy" do
-        @backup.should_receive(:sorted_backup_files).and_return(['a', 'b', 'c'])
-        @backup.should_receive(:delete_backup).with('b')
-        @backup.should_receive(:delete_backup).with('c')
+        expect(@backup).to receive(:sorted_backup_files).and_return(['a', 'b', 'c'])
+        expect(@backup).to receive(:delete_backup).with('b')
+        expect(@backup).to receive(:delete_backup).with('c')
         @backup.backup!
       end
     end
 
     describe "when the number of backups is specified as 2" do
       before(:each) do
-        @new_resource.should_receive(:backup).at_least(:once).and_return(2)
+        expect(@new_resource).to receive(:backup).at_least(:once).and_return(2)
       end
 
       it "should not delete anything if we only have one other backup" do
-        @backup.should_receive(:sorted_backup_files).and_return(['a', 'b'])
-        @backup.should_not_receive(:delete_backup)
+        expect(@backup).to receive(:sorted_backup_files).and_return(['a', 'b'])
+        expect(@backup).not_to receive(:delete_backup)
         @backup.backup!
       end
 
       it "should keep only 2 backup copies" do
-        @backup.should_receive(:sorted_backup_files).and_return(['a', 'b', 'c', 'd'])
-        @backup.should_receive(:delete_backup).with('c')
-        @backup.should_receive(:delete_backup).with('d')
+        expect(@backup).to receive(:sorted_backup_files).and_return(['a', 'b', 'c', 'd'])
+        expect(@backup).to receive(:delete_backup).with('c')
+        expect(@backup).to receive(:delete_backup).with('d')
         @backup.backup!
       end
     end
@@ -106,36 +106,36 @@ describe Chef::Util::Backup do
 
   describe "backup_filename" do
     it "should return a timestamped path" do
-      @backup.should_receive(:path).and_return('/a/b/c.txt')
-      @backup.send(:backup_filename).should =~ %r|^/a/b/c.txt.chef-\d{14}.\d{6}$|
+      expect(@backup).to receive(:path).and_return('/a/b/c.txt')
+      expect(@backup.send(:backup_filename)).to match(%r|^/a/b/c.txt.chef-\d{14}.\d{6}$|)
     end
     it "should strip the drive letter off for windows" do
-      @backup.should_receive(:path).and_return('c:\a\b\c.txt')
-      @backup.send(:backup_filename).should =~ %r|^\\a\\b\\c.txt.chef-\d{14}.\d{6}$|
+      expect(@backup).to receive(:path).and_return('c:\a\b\c.txt')
+      expect(@backup.send(:backup_filename)).to match(%r|^\\a\\b\\c.txt.chef-\d{14}.\d{6}$|)
     end
     it "should strip the drive letter off for windows (with forwardslashes)" do
-      @backup.should_receive(:path).and_return('c:/a/b/c.txt')
-      @backup.send(:backup_filename).should =~ %r|^/a/b/c.txt.chef-\d{14}.\d{6}$|
+      expect(@backup).to receive(:path).and_return('c:/a/b/c.txt')
+      expect(@backup.send(:backup_filename)).to match(%r|^/a/b/c.txt.chef-\d{14}.\d{6}$|)
     end
   end
 
   describe "backup_path" do
     it "uses the file's directory when Chef::Config[:file_backup_path] is nil" do
-      @backup.should_receive(:path).and_return('/a/b/c.txt')
+      expect(@backup).to receive(:path).and_return('/a/b/c.txt')
       Chef::Config[:file_backup_path] = nil
-      @backup.send(:backup_path).should =~ %r|^/a/b/c.txt.chef-\d{14}.\d{6}$|
+      expect(@backup.send(:backup_path)).to match(%r|^/a/b/c.txt.chef-\d{14}.\d{6}$|)
     end
 
     it "uses the configured Chef::Config[:file_backup_path]" do
-      @backup.should_receive(:path).and_return('/a/b/c.txt')
+      expect(@backup).to receive(:path).and_return('/a/b/c.txt')
       Chef::Config[:file_backup_path] = '/backupdir'
-      @backup.send(:backup_path).should =~ %r|^/backupdir[\\/]+a/b/c.txt.chef-\d{14}.\d{6}$|
+      expect(@backup.send(:backup_path)).to match(%r|^/backupdir[\\/]+a/b/c.txt.chef-\d{14}.\d{6}$|)
     end
 
     it "uses the configured Chef::Config[:file_backup_path] and strips the drive on windows" do
-      @backup.should_receive(:path).and_return('c:\\a\\b\\c.txt')
+      expect(@backup).to receive(:path).and_return('c:\\a\\b\\c.txt')
       Chef::Config[:file_backup_path] = 'c:\backupdir'
-      @backup.send(:backup_path).should =~ %r|^c:\\backupdir[\\/]+a\\b\\c.txt.chef-\d{14}.\d{6}$|
+      expect(@backup.send(:backup_path)).to match(%r|^c:\\backupdir[\\/]+a\\b\\c.txt.chef-\d{14}.\d{6}$|)
     end
   end
 

data/spec/unit/util/diff_spec.rb

@@ -105,7 +105,7 @@ shared_examples_for "a diff util" do
     end
   end
 
-  describe "when the default external encoding is UTF-8", :ruby_gte_19_only  do
+  describe "when the default external encoding is UTF-8" do
 
     before do
       @saved_default_external = Encoding.default_external
@@ -122,7 +122,7 @@ shared_examples_for "a diff util" do
         new_tempfile.close
       end
       it "calling for_output should return a valid diff" do
-        differ.for_output.join("\\n").should match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
+        expect(differ.for_output.join("\\n")).to match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
       end
       it "calling for_reporting should return a utf-8 string" do
         expect(differ.for_reporting.encoding).to equal(Encoding::UTF_8)
@@ -135,7 +135,7 @@ shared_examples_for "a diff util" do
         new_tempfile.close
       end
       it "calling for_output should return a valid diff" do
-        differ.for_output.join("\\n").should match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
+        expect(differ.for_output.join("\\n")).to match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
       end
       it "calling for_reporting should return a utf-8 string" do
         expect(differ.for_reporting.encoding).to equal(Encoding::UTF_8)
@@ -170,7 +170,7 @@ shared_examples_for "a diff util" do
 
   end
 
-  describe "when the default external encoding is Latin-1", :ruby_gte_19_only  do
+  describe "when the default external encoding is Latin-1" do
 
     before do
       @saved_default_external = Encoding.default_external
@@ -187,7 +187,7 @@ shared_examples_for "a diff util" do
         new_tempfile.close
       end
       it "calling for_output should return a valid diff" do
-        differ.for_output.join("\\n").should match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
+        expect(differ.for_output.join("\\n")).to match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
       end
       it "calling for_reporting should return a utf-8 string" do
         expect(differ.for_reporting.encoding).to equal(Encoding::UTF_8)
@@ -213,7 +213,7 @@ shared_examples_for "a diff util" do
         new_tempfile.close
       end
       it "calling for_output should return a valid diff" do
-        differ.for_output.join("\\n").should match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
+        expect(differ.for_output.join("\\n")).to match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
       end
       it "calling for_reporting should return a utf-8 string" do
         expect(differ.for_reporting.encoding).to equal(Encoding::UTF_8)
@@ -234,7 +234,7 @@ shared_examples_for "a diff util" do
     end
 
   end
-  describe "when the default external encoding is Shift_JIS", :ruby_gte_19_only  do
+  describe "when the default external encoding is Shift_JIS" do
 
     before do
       @saved_default_external = Encoding.default_external
@@ -251,7 +251,7 @@ shared_examples_for "a diff util" do
         new_tempfile.close
       end
       it "calling for_output should return a valid diff" do
-        differ.for_output.join("\\n").should match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
+        expect(differ.for_output.join("\\n")).to match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
       end
       it "calling for_reporting should return a utf-8 string" do
         expect(differ.for_reporting.encoding).to equal(Encoding::UTF_8)
@@ -290,7 +290,7 @@ shared_examples_for "a diff util" do
         new_tempfile.close
       end
       it "calling for_output should return a valid diff" do
-        differ.for_output.join("\\n").should match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
+        expect(differ.for_output.join("\\n")).to match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
       end
       it "calling for_reporting should return a utf-8 string" do
         expect(differ.for_reporting.encoding).to equal(Encoding::UTF_8)
@@ -349,12 +349,12 @@ shared_examples_for "a diff util" do
     end
 
     it "calling for_output should return a unified diff" do
-      differ.for_output.size.should eql(5)
-      differ.for_output.join("\\n").should match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
+      expect(differ.for_output.size).to eql(5)
+      expect(differ.for_output.join("\\n")).to match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
     end
 
     it "calling for_reporting should return a unified diff" do
-      differ.for_reporting.should match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
+      expect(differ.for_reporting).to match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
     end
 
     describe "when the diff output is too long" do
@@ -383,7 +383,7 @@ shared_examples_for "a diff util" do
     it "should identify zero-length files as text" do
       Tempfile.open("chef-util-diff-spec") do |file|
         file.close
-        differ.send(:is_binary?, file.path).should be_false
+        expect(differ.send(:is_binary?, file.path)).to be_falsey
       end
     end
 
@@ -391,7 +391,7 @@ shared_examples_for "a diff util" do
       Tempfile.open("chef-util-diff-spec") do |file|
         file.write(plain_ascii)
         file.close
-        differ.send(:is_binary?, file.path).should be_false
+        expect(differ.send(:is_binary?, file.path)).to be_falsey
       end
     end
 
@@ -399,7 +399,7 @@ shared_examples_for "a diff util" do
       Tempfile.open("chef-util-diff-spec") do |file|
         file.write("This is a binary file.\0")
         file.close
-        differ.send(:is_binary?, file.path).should be_true
+        expect(differ.send(:is_binary?, file.path)).to be_truthy
       end
     end
 
@@ -407,11 +407,11 @@ shared_examples_for "a diff util" do
       Tempfile.open("chef-util-diff-spec") do |file|
         file.write("This is a binary file.\nNo Really\nit is\0")
         file.close
-        differ.send(:is_binary?, file.path).should be_true
+        expect(differ.send(:is_binary?, file.path)).to be_truthy
       end
     end
 
-    describe "when the default external encoding is UTF-8", :ruby_gte_19_only  do
+    describe "when the default external encoding is UTF-8" do
 
       before do
         @saved_default_external = Encoding.default_external
@@ -426,7 +426,7 @@ shared_examples_for "a diff util" do
         Tempfile.open("chef-util-diff-spec") do |file|
           file.write(plain_ascii)
           file.close
-          differ.send(:is_binary?, file.path).should be_false
+          expect(differ.send(:is_binary?, file.path)).to be_falsey
         end
       end
 
@@ -434,7 +434,7 @@ shared_examples_for "a diff util" do
         Tempfile.open("chef-util-diff-spec") do |file|
           file.write(utf_8)
           file.close
-          differ.send(:is_binary?, file.path).should be_false
+          expect(differ.send(:is_binary?, file.path)).to be_falsey
         end
       end
 
@@ -442,7 +442,7 @@ shared_examples_for "a diff util" do
         Tempfile.open("chef-util-diff-spec") do |file|
           file.write(latin_1)
           file.close
-          differ.send(:is_binary?, file.path).should be_true
+          expect(differ.send(:is_binary?, file.path)).to be_truthy
         end
       end
 
@@ -450,13 +450,13 @@ shared_examples_for "a diff util" do
         Tempfile.open("chef-util-diff-spec") do |file|
           file.write(shift_jis)
           file.close
-          differ.send(:is_binary?, file.path).should be_true
+          expect(differ.send(:is_binary?, file.path)).to be_truthy
         end
       end
 
     end
 
-    describe "when the default external encoding is Latin-1", :ruby_gte_19_only do
+    describe "when the default external encoding is Latin-1" do
 
       before do
         @saved_default_external = Encoding.default_external
@@ -471,7 +471,7 @@ shared_examples_for "a diff util" do
         Tempfile.open("chef-util-diff-spec") do |file|
           file.write(plain_ascii)
           file.close
-          differ.send(:is_binary?, file.path).should be_false
+          expect(differ.send(:is_binary?, file.path)).to be_falsey
         end
       end
 
@@ -479,7 +479,7 @@ shared_examples_for "a diff util" do
         Tempfile.open("chef-util-diff-spec") do |file|
           file.write(utf_8)
           file.close
-          differ.send(:is_binary?, file.path).should be_true
+          expect(differ.send(:is_binary?, file.path)).to be_truthy
         end
       end
 
@@ -487,7 +487,7 @@ shared_examples_for "a diff util" do
         Tempfile.open("chef-util-diff-spec") do |file|
           file.write(latin_1)
           file.close
-          differ.send(:is_binary?, file.path).should be_false
+          expect(differ.send(:is_binary?, file.path)).to be_falsey
         end
       end
 
@@ -495,12 +495,12 @@ shared_examples_for "a diff util" do
         Tempfile.open("chef-util-diff-spec") do |file|
           file.write(shift_jis)
           file.close
-          differ.send(:is_binary?, file.path).should be_true
+          expect(differ.send(:is_binary?, file.path)).to be_truthy
         end
       end
     end
 
-    describe "when the default external encoding is Shift-JIS", :ruby_gte_19_only do
+    describe "when the default external encoding is Shift-JIS" do
 
       before do
         @saved_default_external = Encoding.default_external
@@ -515,14 +515,14 @@ shared_examples_for "a diff util" do
         Tempfile.open("chef-util-diff-spec") do |file|
           file.write(plain_ascii)
           file.close
-          differ.send(:is_binary?, file.path).should be_false
+          expect(differ.send(:is_binary?, file.path)).to be_falsey
         end
       end
       it "should identify UTF-8 that is invalid Shift-JIS as binary" do
         Tempfile.open("chef-util-diff-spec") do |file|
           file.write(utf_8)
           file.close
-          differ.send(:is_binary?, file.path).should be_true
+          expect(differ.send(:is_binary?, file.path)).to be_truthy
         end
       end
 
@@ -530,7 +530,7 @@ shared_examples_for "a diff util" do
         Tempfile.open("chef-util-diff-spec") do |file|
           file.write(latin_1)
           file.close
-          differ.send(:is_binary?, file.path).should be_true
+          expect(differ.send(:is_binary?, file.path)).to be_truthy
         end
       end
 
@@ -538,7 +538,7 @@ shared_examples_for "a diff util" do
         Tempfile.open("chef-util-diff-spec") do |file|
           file.write(shift_jis)
           file.close
-          differ.send(:is_binary?, file.path).should be_false
+          expect(differ.send(:is_binary?, file.path)).to be_falsey
         end
       end
 

data/spec/unit/util/dsc/configuration_generator_spec.rb

@@ -51,9 +51,9 @@ describe Chef::Util::DSC::ConfigurationGenerator do
     context 'when strings are used as switches' do
       it 'should merge the hash if there are no restricted switches' do
         merged = conf_man.send(:get_merged_configuration_flags!, {'flag' => 'a'}, 'hello')
-        merged.should include(:flag)
-        merged[:flag].should eql('a')
-        merged.should include(:outputpath)
+        expect(merged).to include(:flag)
+        expect(merged[:flag]).to eql('a')
+        expect(merged).to include(:outputpath)
       end
 
       it 'should raise an ArgumentError if you try to override outputpath' do
@@ -70,16 +70,16 @@ describe Chef::Util::DSC::ConfigurationGenerator do
 
       it 'should be case insensitive to switches that are allowed' do
         merged = conf_man.send(:get_merged_configuration_flags!, {'FLAG' => 'a'}, 'hello')
-        merged.should include(:flag)
+        expect(merged).to include(:flag)
       end
     end
 
     context 'when symbols are used as switches' do
       it 'should merge the hash if there are no restricted switches' do
         merged = conf_man.send(:get_merged_configuration_flags!, {:flag => 'a'}, 'hello')
-        merged.should include(:flag)
-        merged[:flag].should eql('a')
-        merged.should include(:outputpath)
+        expect(merged).to include(:flag)
+        expect(merged[:flag]).to eql('a')
+        expect(merged).to include(:outputpath)
       end
 
       it 'should raise an ArgumentError if you try to override outputpath' do
@@ -96,21 +96,21 @@ describe Chef::Util::DSC::ConfigurationGenerator do
 
       it 'should be case insensitive to switches that are allowed' do
         merged = conf_man.send(:get_merged_configuration_flags!, {:FLAG => 'a'}, 'hello')
-        merged.should include(:flag)
+        expect(merged).to include(:flag)
       end
     end
 
     context 'when there are no flags' do
       it 'should supply an output path if configuration_flags is an empty hash' do
         merged = conf_man.send(:get_merged_configuration_flags!, {}, 'hello')
-        merged.should include(:outputpath)
-        merged.length.should eql(1)
+        expect(merged).to include(:outputpath)
+        expect(merged.length).to eql(1)
       end
 
       it 'should supply an output path if configuration_flags is an empty hash' do
         merged = conf_man.send(:get_merged_configuration_flags!, nil, 'hello')
-        merged.should include(:outputpath)
-        merged.length.should eql(1)
+        expect(merged).to include(:outputpath)
+        expect(merged.length).to eql(1)
       end
     end
 
@@ -130,14 +130,14 @@ describe Chef::Util::DSC::ConfigurationGenerator do
         [a,b].join("++")
       end
       allow(file_like_object).to receive(:write)
-      conf_man.send(:write_document_generation_script, 'file', 'hello')
+      conf_man.send(:write_document_generation_script, 'file', 'hello', {})
       expect(file_like_object).to have_received(:write)
     end
   end
 
   describe "#find_configuration_document" do
     it "should find the mof file" do
-      # These tests seem way too implementation specific. Unfortunatly, File and Dir
+      # These tests seem way too implementation specific. Unfortunately, File and Dir
       # need to be mocked because they are OS specific
       allow(File).to receive(:join) do |a, b|
         [a,b].join("++")
@@ -158,14 +158,36 @@ describe Chef::Util::DSC::ConfigurationGenerator do
 
   describe "#configuration_code" do
     it "should build dsc" do
-      dsc = conf_man.send(:configuration_code, 'archive{}', 'hello')
+      dsc = conf_man.send(:configuration_code, 'archive{}', 'hello', {})
       found_configuration = false
       dsc.split(';').each do |command|
         if command.downcase =~ /\s*configuration\s+'hello'\s*\{\s*node\s+'localhost'\s*\{\s*archive\s*\{\s*\}\s*\}\s*\}\s*/
           found_configuration = true
         end
       end
-      expect(found_configuration).to be_true
+      expect(found_configuration).to be_truthy
+    end
+    context "with imports" do
+      it "should import all resources when a module has an empty list" do
+        dsc = conf_man.send(:configuration_code, 'archive{}', 'hello', {'FooModule' => []})
+        expect(dsc).to match(/Import-DscResource -ModuleName FooModule\s*\n/)
+      end
+
+      it "should import all resources when a module has a list with *" do
+        dsc = conf_man.send(:configuration_code, 'archive{}', 'hello', {'FooModule' => ['FooResource', '*', 'BarResource']})
+        expect(dsc).to match(/Import-DscResource -ModuleName FooModule\s*\n/)
+      end
+
+      it "should import specific resources when a module has list without * that is not empty" do
+        dsc = conf_man.send(:configuration_code, 'archive{}', 'hello', {'FooModule' => ['FooResource', 'BarResource']})
+        expect(dsc).to match(/Import-DscResource -ModuleName FooModule -Name FooResource,BarResource/)
+      end
+
+      it "should import multiple modules with multiple import statements" do
+        dsc = conf_man.send(:configuration_code, 'archive{}', 'hello', {'FooModule' => ['FooResource', 'BarResource'], 'BazModule' => []})
+        expect(dsc).to match(/Import-DscResource -ModuleName FooModule -Name FooResource,BarResource/)
+        expect(dsc).to match(/Import-DscResource -ModuleName BazModule\s*\n/)
+      end 
     end
   end
 end