chef 11.6.0.hotfix.1 → 11.6.0.rc.0

data/spec/unit/cookbook_loader_spec.rb

@@ -68,7 +68,8 @@ describe Chef::CookbookLoader do
         seen[2].should == "borken"
         seen[3].should == "ignorken"
         seen[4].should == "java"
-        seen[5].should == "openldap"
+        seen[5].should == "nginx"
+        seen[6].should == "openldap"
       end
     end
   
@@ -155,6 +156,26 @@ describe Chef::CookbookLoader do
         end
         @cookbook_loader.load_cookbooks
       end
+
+      it "should index cookbooks by name, not pathname" do
+        @cookbook_loader.should_not have_key(:'not-nginx')
+        @cookbook_loader.should_not have_key(:'no-really-not-nginx')
+        @cookbook_loader.should have_key(:nginx)
+      end
+
+      it "should shadow cookbooks by name, not pathname" do
+        @cookbook_loader[:nginx].attribute_filenames.detect { |f|
+          f =~ /cookbooks\/not-nginx\/attributes\/default.rb/
+        }.should_not eql(nil)
+        @cookbook_loader[:nginx].attribute_filenames.detect { |f|
+          f =~ /kitchen\/no-really-not-nginx\/attributes\/default.rb/
+        }.should eql(nil)
+      end
+
+      it "should emit deprecation warning if name is not in metadata" do
+        Chef::Log.should_receive(:warn).at_least(:once).with(/Inferring cookbook name from directory name \([^)]+\) is deprecated, please set a name in the metadata./)
+        @cookbook_loader.load_cookbooks
+      end
     end # load_cookbooks
 
   end # loading all cookbooks

data/spec/unit/provider/package/rubygems_spec.rb

@@ -256,7 +256,7 @@ describe Chef::Provider::Package::Rubygems::AlternateGemEnvironment do
   it "determines the installed versions of gems from the source index (part2: the unmockening)" do
     $stdout.stub!(:write)
     path_to_gem = if windows?
-      `where gem`.split[1]
+      `where gem`.split[-1]
     else
       `which gem`.strip
     end

data/spec/unit/provider/package/yum_spec.rb

@@ -39,6 +39,7 @@ describe Chef::Provider::Package::Yum do
     )
     Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
     @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
+    @stderr = StringIO.new
     @pid = mock("PID")
   end
 
@@ -541,7 +542,7 @@ describe Chef::Provider::Package::Yum do
     it "should call action_upgrade in the parent if the candidate version is nil" do
       @provider.load_current_resource
       @current_resource = Chef::Resource::Package.new('cups')
-      @provider.candidate_version = nil
+      @provider.candidate_version = nil 
       @provider.should_not_receive(:upgrade_package)
       @provider.action_upgrade
     end
@@ -1154,7 +1155,7 @@ describe Chef::Provider::Package::Yum::RPMDbPackage do
 
   describe "repoid" do
     it "should return the source repository repoid" do
-      @rpm_x.repoid.should be == "base"
+      @rpm_x.repoid.should be == "base" 
       @rpm_y.repoid.should be == "extras"
       @rpm_z.repoid.should be == "other"
     end
@@ -1543,10 +1544,7 @@ describe Chef::Provider::Package::Yum::YumCache do
   end
 
   before(:each) do
-    @stdin = mock("STDIN", :nil_object => true)
-    @stdout = mock("STDOUT", :nil_object => true)
-
-    @stdout_good = <<EOF
+    yum_dump_good_output = <<EOF
 [option installonlypkgs] kernel kernel-bigmem kernel-enterprise
 erlang-mochiweb 0 1.4.1 5.el5 x86_64 ['erlang-mochiweb = 1.4.1-5.el5', 'mochiweb = 1.4.1-5.el5'] i installed
 zip 0 2.31 2.el5 x86_64 ['zip = 2.31-2.el5'] r base
@@ -1562,16 +1560,9 @@ znc-extra 0 0.098 1.el5 x86_64 [] a base
 znc-modtcl 0 0.098 1.el5 x86_64 [] a base
 znc-test.beta1 0 0.098 1.el5 x86_64 [] a extras
 znc-test.test.beta1 0 0.098 1.el5 x86_64 [] a base
-EOF
-    @stdout_bad_type = <<EOF
-zip 0 2.31 2.el5 x86_64 ['zip = 2.31-2.el5'] r base
-zlib 0 1.2.3 3 x86_64 ['zlib = 1.2.3-3', 'libz.so.1()(64bit)'] c base
-zlib-devel 0 1.2.3 3 i386 [] a extras
-zlib-devel 0 1.2.3 3 x86_64 ['zlib-devel = 1.2.3-3'] bad installed
-znc-modtcl 0 0.098 1.el5 x86_64 [] a base
 EOF
 
-    @stdout_bad_separators = <<EOF
+    yum_dump_bad_output_separators = <<EOF
 zip 0 2.31 2.el5 x86_64 ['zip = 2.31-2.el5'] r base
 zlib 0 1.2.3 3 x86_64 ['zlib = 1.2.3-3', 'libz.so.1()(64bit)'] i base bad
 zlib-devel 0 1.2.3 3 i386 [] a extras
@@ -1579,13 +1570,41 @@ bad zlib-devel 0 1.2.3 3 x86_64 ['zlib-devel = 1.2.3-3'] i installed
 znc-modtcl 0 0.098 1.el5 x86_64 [] a base bad
 EOF
 
-    @stdout_no_output = ""
+    yum_dump_bad_output_type = <<EOF
+zip 0 2.31 2.el5 x86_64 ['zip = 2.31-2.el5'] r base
+zlib 0 1.2.3 3 x86_64 ['zlib = 1.2.3-3', 'libz.so.1()(64bit)'] c base
+zlib-devel 0 1.2.3 3 i386 [] a extras
+zlib-devel 0 1.2.3 3 x86_64 ['zlib-devel = 1.2.3-3'] bad installed
+znc-modtcl 0 0.098 1.el5 x86_64 [] a base
+EOF
 
-    @stderr = <<EOF
+    yum_dump_error = <<EOF
 yum-dump Config Error: File contains no section headers.
 file: file://///etc/yum.repos.d/CentOS-Base.repo, line: 12
 'qeqwewe\n'
 EOF
+
+    @stdin = mock("STDIN", :nil_object => true)
+    @stdout = mock("STDOUT", :nil_object => true)
+    @stdout_good = mock("STDOUT", :nil_object => true)
+    s = @stdout_good.stub!(:each_line)
+    yum_dump_good_output.split("\n").each do |line|
+      s.and_yield(line)
+    end
+    @stdout_bad_type = mock("STDOUT", :nil_object => true)
+    s = @stdout_bad_type.stub!(:each_line)
+    yum_dump_bad_output_type.split("\n").each do |line|
+      s.and_yield(line)
+    end
+    @stdout_bad_separators = mock("STDOUT", :nil_object => true)
+    s = @stdout_bad_separators.stub!(:each_line)
+    yum_dump_bad_output_separators.split("\n").each do |line|
+      s.and_yield(line)
+    end
+    @stdout_no_output = mock("STDOUT", :nil_object => true)
+    @stdout_no_output.stub!(:each_line).and_return(nil)
+    @stderr = mock("STDERR", :nil_object => true)
+    @stderr.stub!(:readlines).and_return(yum_dump_error.split("\n"))
     @status = mock("Status", :exitstatus => 0, :stdin => @stdin, :stdout => @stdout_good, :stderr => @stderr)
 
     # new singleton each time
@@ -1789,7 +1808,7 @@ EOF
     end
 
     it "should return nil when no match for package-version, no arch" do
-      @yc.package_repository("zisofs-tools", "pretend", nil).should be == nil
+      @yc.package_repository("zisofs-tools", "pretend", nil).should be == nil 
       @yc.package_repository("zisofs-tools", "pretend").should be == nil
       @yc.package_repository("pretend", "1.0.6-3.2.2").should be == nil
     end

data/spec/unit/provider/remote_file/cache_control_data_spec.rb

@@ -19,15 +19,6 @@
 require 'spec_helper'
 require 'uri'
 
-CACHE_FILE_TRUNCATED_FRIENDLY_FILE_NAME_LENGTH = 64
-CACHE_FILE_MD5_HEX_LENGTH = 32
-CACHE_FILE_JSON_FILE_EXTENSION_LENGTH = 5
-CACHE_FILE_PATH_LIMIT =
-  CACHE_FILE_TRUNCATED_FRIENDLY_FILE_NAME_LENGTH +
-  1 +
-  CACHE_FILE_MD5_HEX_LENGTH +
-  CACHE_FILE_JSON_FILE_EXTENSION_LENGTH # {friendly}-{md5hex}.json == 102
-
 describe Chef::Provider::RemoteFile::CacheControlData do
 
   let(:uri) { URI.parse("http://www.google.com/robots.txt") }
@@ -117,15 +108,6 @@ describe Chef::Provider::RemoteFile::CacheControlData do
         cache_control_data.mtime.should == mtime
       end
     end
-
-    context "and the cached checksum data is corrupted" do
-      let(:cache_json_data) { '{"foo",,"bar" []}' }
-
-      it "returns empty cache control data" do
-        cache_control_data.etag.should be_nil
-        cache_control_data.mtime.should be_nil
-      end
-    end
   end
 
   describe "when saving to disk" do
@@ -173,38 +155,6 @@ describe Chef::Provider::RemoteFile::CacheControlData do
         cache_control_data.save
       end
     end
-
-    # Cover the very long remote file path case -- see CHEF-4422 where
-    # local cache file names generated from the long uri exceeded
-    # local file system path limits resulting in exceptions from
-    # file system API's on both Windows and Unix systems.
-    context "and the URI results in a file cache path that exceeds #{CACHE_FILE_PATH_LIMIT} characters in length" do
-      let(:long_remote_path) { "http://www.bing.com/" +  ('0' * (CACHE_FILE_TRUNCATED_FRIENDLY_FILE_NAME_LENGTH * 2 )) }
-      let(:uri) { URI.parse(long_remote_path) }
-      let(:truncated_remote_uri) { URI.parse(long_remote_path[0...CACHE_FILE_TRUNCATED_FRIENDLY_FILE_NAME_LENGTH]) }
-      let(:truncated_file_cache_path) do
-        cache_control_data_truncated = Chef::Provider::RemoteFile::CacheControlData.load_and_validate(truncated_remote_uri, current_file_checksum)
-        cache_control_data_truncated.send('sanitized_cache_file_basename')[0...CACHE_FILE_TRUNCATED_FRIENDLY_FILE_NAME_LENGTH]
-      end
-
-      it "truncates the file cache path to 102 characters" do
-        normalized_cache_path = cache_control_data.send('sanitized_cache_file_basename')
-
-        Chef::FileCache.should_receive(:store).with("remote_file/" + normalized_cache_path, cache_control_data.json_data)              
-
-        cache_control_data.save
-
-        normalized_cache_path.length.should == CACHE_FILE_PATH_LIMIT
-      end
-
-      it "uses a file cache path that starts with the first #{CACHE_FILE_TRUNCATED_FRIENDLY_FILE_NAME_LENGTH} characters of the URI" do
-        normalized_cache_path = cache_control_data.send('sanitized_cache_file_basename')
-
-        truncated_file_cache_path.length.should == CACHE_FILE_TRUNCATED_FRIENDLY_FILE_NAME_LENGTH
-        normalized_cache_path.start_with?(truncated_file_cache_path).should == true
-      end
-    end
-
   end
 
 end

data/spec/unit/resource_reporter_spec.rb

@@ -408,62 +408,11 @@ describe Chef::ResourceReporter do
 
       it "includes the error inspector output in the event data" do
         @report["data"]["exception"].should have_key("description")
-        @report["data"]["exception"]["description"].should include({"title"=>"Error expanding the run_list:", "sections"=>[{"Unexpected Error:" => "RSpec::Mocks::Mock: Object not found"}]})
+        @report["data"]["exception"]["description"].should include({"title"=>"Error expanding the run_list:", "sections"=>[["Unexpected Error:", "RSpec::Mocks::Mock: Object not found"]]})
       end
 
     end
 
-    context "when new_resource does not have a cookbook_name" do
-      before do
-        @bad_resource = Chef::Resource::File.new("/tmp/a-file.txt")
-        @bad_resource.cookbook_name = nil
-
-        @resource_reporter.resource_action_start(@bad_resource, :create)
-        @resource_reporter.resource_current_state_loaded(@bad_resource, :create, @current_resource)
-        @resource_reporter.resource_updated(@bad_resource, :create)
-        @resource_reporter.resource_completed(@bad_resource)
-        @run_status.stop_clock
-        @report = @resource_reporter.prepare_run_data
-        @first_update_report = @report["resources"].first
-      end
-
-      it "includes an updated resource's initial state" do
-        @first_update_report["before"].should == @current_resource.state
-      end
-
-      it "includes an updated resource's final state" do
-        @first_update_report["after"].should == @new_resource.state
-      end
-
-      it "includes the resource's name" do
-        @first_update_report["name"].should == @new_resource.name
-      end
-
-      it "includes the resource's id attribute" do
-        @first_update_report["id"].should == @new_resource.identity
-      end
-
-      it "includes the elapsed time for the resource to converge" do
-        # TODO: API takes integer number of milliseconds as a string. This
-        # should be an int.
-        @first_update_report.should have_key("duration")
-        @first_update_report["duration"].to_i.should be_within(100).of(0)
-      end
-
-      it "includes the action executed by the resource" do
-        # TODO: rename as "action"
-        @first_update_report["result"].should == "create"
-      end
-
-      it "does not include a cookbook name for the resource" do
-        @first_update_report.should_not have_key("cookbook_name")
-      end
-
-      it "does not include a cookbook version for the resource" do
-        @first_update_report.should_not have_key("cookbook_version")
-      end
-    end
-
   end
 
   describe "when updating resource history on the server" do

data/spec/unit/scan_access_control_spec.rb

@@ -21,8 +21,7 @@ require 'chef/scan_access_control'
 describe Chef::ScanAccessControl do
 
   before do
-    @new_resource = Chef::Resource::File.new("/tmp/foo/bar/baz/link")
-    @real_file = "/tmp/foo/bar/real/file"
+    @new_resource = Chef::Resource::File.new("/tmp/foo/bar/baz/qux")
     @current_resource = Chef::Resource::File.new(@new_resource.path)
     @scanner = Chef::ScanAccessControl.new(@new_resource, @current_resource)
   end
@@ -50,8 +49,7 @@ describe Chef::ScanAccessControl do
 
     before do
       @stat = mock("File::Stat for #{@new_resource.path}", :uid => 0, :gid => 0, :mode => 00100644)
-      File.should_receive(:realpath).with(@new_resource.path).and_return(@real_file)
-      File.should_receive(:stat).with(@real_file).and_return(@stat)
+      File.should_receive(:stat).with(@new_resource.path).and_return(@stat)
       File.should_receive(:exist?).with(@new_resource.path).and_return(true)
     end
 

data/spec/unit/util/diff_spec.rb

@@ -34,12 +34,6 @@ describe Chef::Util::Diff, :uses_diff => true do
   let!(:old_file) { old_tempfile.path }
   let!(:new_file) { new_tempfile.path }
 
-  let(:plain_ascii) { "This is a text file.\nWith more than one line.\nAnd a \tTab.\nAnd lets make sure that other printable chars work too: ~!@\#$%^&*()`:\"<>?{}|_+,./;'[]\\-=\n" }
-  # these are all byte sequences that are illegal in the other encodings... (but they may legally transcode)
-  let(:utf_8) { "testing utf-8 unicode...\n\n\non a new line: \xE2\x80\x93\n" }  # unicode em-dash
-  let(:latin_1) { "It is more metal.\nif you have an \xFDmlaut.\n" } # NB: changed to y-with-diaresis, but i'm American so I don't know the difference
-  let(:shift_jis) { "I have no idea what this character is:\n \x83\x80.\n" } # seriously, no clue, but \x80 is nice and illegal in other encodings
-
   let(:differ) do  # subject
     differ = Chef::Util::Diff.new
     differ.diff(old_file, new_file)
@@ -120,200 +114,6 @@ describe Chef::Util::Diff, :uses_diff => true do
     end
   end
 
-  describe "when the default external encoding is UTF-8", :ruby_gte_19_only  do
-
-    before do
-      @saved_default_external = Encoding.default_external
-      Encoding.default_external = Encoding::UTF_8
-    end
-
-    after do
-      Encoding.default_external = @saved_default_external
-    end
-
-    describe "when a file has ASCII text" do
-      before do
-        new_tempfile.write(plain_ascii)
-        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)
-      end
-      it "calling for_reporting should return a utf-8 string" do
-        expect(differ.for_reporting.encoding).to equal(Encoding::UTF_8)
-      end
-    end
-
-    describe "when a file has UTF-8 text" do
-      before do
-        new_tempfile.write(utf_8)
-        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)
-      end
-      it "calling for_reporting should return a utf-8 string" do
-        expect(differ.for_reporting.encoding).to equal(Encoding::UTF_8)
-      end
-    end
-
-    describe "when a file has Latin-1 text" do
-      before do
-        new_tempfile.write(latin_1)
-        new_tempfile.close
-      end
-      it "calling for_output should complain that the content is binary" do
-        expect(differ.for_output).to eql( [ "(new content is binary, diff output suppressed)" ])
-      end
-      it "calling for_reporting should be nil" do
-        expect(differ.for_reporting).to be_nil
-      end
-    end
-
-    describe "when a file has Shift-JIS text" do
-      before do
-        new_tempfile.write(shift_jis)
-        new_tempfile.close
-      end
-      it "calling for_output should complain that the content is binary" do
-        expect(differ.for_output).to eql( [ "(new content is binary, diff output suppressed)" ])
-      end
-      it "calling for_reporting should be nil" do
-        expect(differ.for_reporting).to be_nil
-      end
-    end
-
-  end
-
-  describe "when the default external encoding is Latin-1", :ruby_gte_19_only  do
-
-    before do
-      @saved_default_external = Encoding.default_external
-      Encoding.default_external = Encoding::ISO_8859_1
-    end
-
-    after do
-      Encoding.default_external = @saved_default_external
-    end
-
-    describe "when a file has ASCII text" do
-      before do
-        new_tempfile.write(plain_ascii)
-        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)
-      end
-      it "calling for_reporting should return a utf-8 string" do
-        expect(differ.for_reporting.encoding).to equal(Encoding::UTF_8)
-      end
-    end
-
-    describe "when a file has UTF-8 text" do
-      before do
-        new_tempfile.write(utf_8)
-        new_tempfile.close
-      end
-      it "calling for_output should complain that the content is binary" do
-        expect(differ.for_output).to eql( [ "(new content is binary, diff output suppressed)" ])
-      end
-      it "calling for_reporting should be nil" do
-        expect(differ.for_reporting).to be_nil
-      end
-    end
-
-    describe "when a file has Latin-1 text" do
-      before do
-        new_tempfile.write(latin_1)
-        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)
-      end
-      it "calling for_reporting should return a utf-8 string" do
-        expect(differ.for_reporting.encoding).to equal(Encoding::UTF_8)
-      end
-    end
-
-    describe "when a file has Shift-JIS text" do
-      before do
-        new_tempfile.write(shift_jis)
-        new_tempfile.close
-      end
-      it "calling for_output should complain that the content is binary" do
-        expect(differ.for_output).to eql( [ "(new content is binary, diff output suppressed)" ])
-      end
-      it "calling for_reporting should be nil" do
-        expect(differ.for_reporting).to be_nil
-      end
-    end
-
-  end
-  describe "when the default external encoding is Shift_JIS", :ruby_gte_19_only  do
-
-    before do
-      @saved_default_external = Encoding.default_external
-      Encoding.default_external = Encoding::Shift_JIS
-    end
-
-    after do
-      Encoding.default_external = @saved_default_external
-    end
-
-    describe "when a file has ASCII text" do
-      before do
-        new_tempfile.write(plain_ascii)
-        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)
-      end
-      it "calling for_reporting should return a utf-8 string" do
-        expect(differ.for_reporting.encoding).to equal(Encoding::UTF_8)
-      end
-    end
-
-    describe "when a file has UTF-8 text" do
-      before do
-        new_tempfile.write(utf_8)
-        new_tempfile.close
-      end
-      it "calling for_output should complain that the content is binary" do
-        expect(differ.for_output).to eql( [ "(new content is binary, diff output suppressed)" ])
-      end
-      it "calling for_reporting should be nil" do
-        expect(differ.for_reporting).to be_nil
-      end
-    end
-
-    describe "when a file has Latin-1 text" do
-      before do
-        new_tempfile.write(latin_1)
-        new_tempfile.close
-      end
-      it "calling for_output should complain that the content is binary" do
-        expect(differ.for_output).to eql( [ "(new content is binary, diff output suppressed)" ])
-      end
-      it "calling for_reporting should be nil" do
-        expect(differ.for_reporting).to be_nil
-      end
-    end
-
-    describe "when a file has Shift-JIS text" do
-      before do
-        new_tempfile.write(shift_jis)
-        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)
-      end
-      it "calling for_reporting should return a utf-8 string" do
-        expect(differ.for_reporting.encoding).to equal(Encoding::UTF_8)
-      end
-    end
-
-  end
-
   describe "when testing the diff_filesize_threshold" do
     before do
       @diff_filesize_threshold_saved = Chef::Config[:diff_filesize_threshold]
@@ -365,11 +165,11 @@ describe Chef::Util::Diff, :uses_diff => true do
 
     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)
+      differ.for_output.join("\\n").should match(/^--- .*\\n\+\+\+ .*\\n@@ .* @@\\n-foo\\n\+bar$/)
     end
 
     it "calling for_reporting should return a unified diff" do
-      differ.for_reporting.should match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
+      differ.for_reporting.should match(/^--- .*\\n\+\+\+ .*\\n@@ .* @@\\n-foo\\n\+bar$/)
     end
 
     describe "when the diff output is too long" do
@@ -427,170 +227,30 @@ describe Chef::Util::Diff, :uses_diff => true do
   describe "when checking if files are binary or text" 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
+      Tempfile.new("chef-util-diff-spec") do |file|
+        differ.is_binary?(file.path).should be_false
       end
     end
 
     it "should identify text files as text" do
-      Tempfile.open("chef-util-diff-spec") do |file|
-        file.write(plain_ascii)
+      Tempfile.new("chef-util-diff-spec") do |file|
+        file.write("This is a text file.")
+        file.write("With more than one line.")
+        file.write("And lets make sure that other printable chars work too: ~!@\#$%^&*()`:\"<>?{}|_+,./;'[]\\-=")
         file.close
-        differ.send(:is_binary?, file.path).should be_false
+        differ.is_binary?(file.path).should be_false
       end
     end
 
     it "should identify a null-terminated string files as binary" do
-      Tempfile.open("chef-util-diff-spec") do |file|
+      Tempfile.new("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
-      end
-    end
-
-    it "should identify null-teriminated multi-line string files as binary" 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
-      end
-    end
-
-    describe "when the default external encoding is UTF-8", :ruby_gte_19_only  do
-
-      before do
-        @saved_default_external = Encoding.default_external
-        Encoding.default_external = Encoding::UTF_8
-      end
-
-      after do
-        Encoding.default_external = @saved_default_external
-      end
-
-      it "should identify normal ASCII as text" do
-        Tempfile.open("chef-util-diff-spec") do |file|
-          file.write(plain_ascii)
-          file.close
-          differ.send(:is_binary?, file.path).should be_false
-        end
-      end
-
-      it "should identify UTF-8 as text" do
-        Tempfile.open("chef-util-diff-spec") do |file|
-          file.write(utf_8)
-          file.close
-          differ.send(:is_binary?, file.path).should be_false
-        end
-      end
-
-      it "should identify Latin-1 that is invalid UTF-8 as binary" do
-        Tempfile.open("chef-util-diff-spec") do |file|
-          file.write(latin_1)
-          file.close
-          differ.send(:is_binary?, file.path).should be_true
-        end
-      end
-
-      it "should identify Shift-JIS that is invalid UTF-8 as binary" do
-        Tempfile.open("chef-util-diff-spec") do |file|
-          file.write(shift_jis)
-          file.close
-          differ.send(:is_binary?, file.path).should be_true
-        end
-      end
-
-    end
-
-    describe "when the default external encoding is Latin-1", :ruby_gte_19_only do
-
-      before do
-        @saved_default_external = Encoding.default_external
-        Encoding.default_external = Encoding::ISO_8859_1
-      end
-
-      after do
-        Encoding.default_external = @saved_default_external
-      end
-
-      it "should identify normal ASCII as text" do
-        Tempfile.open("chef-util-diff-spec") do |file|
-          file.write(plain_ascii)
-          file.close
-          differ.send(:is_binary?, file.path).should be_false
-        end
-      end
-
-      it "should identify UTF-8 that is invalid Latin-1 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
-        end
-      end
-
-      it "should identify Latin-1 as text" do
-        Tempfile.open("chef-util-diff-spec") do |file|
-          file.write(latin_1)
-          file.close
-          differ.send(:is_binary?, file.path).should be_false
-        end
-      end
-
-      it "should identify Shift-JIS that is invalid Latin-1 as binary" do
-        Tempfile.open("chef-util-diff-spec") do |file|
-          file.write(shift_jis)
-          file.close
-          differ.send(:is_binary?, file.path).should be_true
-        end
+        differ.is_binary?(file.path).should be_false
       end
     end
 
-    describe "when the default external encoding is Shift-JIS", :ruby_gte_19_only do
-
-      before do
-        @saved_default_external = Encoding.default_external
-        Encoding.default_external = Encoding::Shift_JIS
-      end
-
-      after do
-        Encoding.default_external = @saved_default_external
-      end
-
-      it "should identify normal ASCII as text" do
-        Tempfile.open("chef-util-diff-spec") do |file|
-          file.write(plain_ascii)
-          file.close
-          differ.send(:is_binary?, file.path).should be_false
-        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
-        end
-      end
-
-      it "should identify Latin-1 that is invalid Shift-JIS as binary" do
-        Tempfile.open("chef-util-diff-spec") do |file|
-          file.write(latin_1)
-          file.close
-          differ.send(:is_binary?, file.path).should be_true
-        end
-      end
-
-      it "should identify Shift-JIS as text" do
-        Tempfile.open("chef-util-diff-spec") do |file|
-          file.write(shift_jis)
-          file.close
-          differ.send(:is_binary?, file.path).should be_false
-        end
-      end
-
-    end
   end
 
 end
 
-