diff options
author | Claire McQuin <claire@opscode.com> | 2013-07-16 16:02:09 -0700 |
---|---|---|
committer | Claire McQuin <claire@opscode.com> | 2013-07-16 16:02:09 -0700 |
commit | f07fc696f59128d02d5b34d95e1bc208ef622860 (patch) | |
tree | 2ab83e232c8a5333cd320cf8f9499da4df14d830 /spec/unit | |
parent | 33168dad90d29dd183d65902abdcce33303ffc7e (diff) | |
download | chef-f07fc696f59128d02d5b34d95e1bc208ef622860.tar.gz |
shell_out to diff => diff-lcs, cleaned up tests, updated gem versions
Diffstat (limited to 'spec/unit')
-rw-r--r-- | spec/unit/util/diff_spec.rb | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/spec/unit/util/diff_spec.rb b/spec/unit/util/diff_spec.rb index 2dadb5be56..ad1166f9fc 100644 --- a/spec/unit/util/diff_spec.rb +++ b/spec/unit/util/diff_spec.rb @@ -393,37 +393,6 @@ describe Chef::Util::Diff, :uses_diff => true do end end - describe "when errors are thrown from shell_out" do - before do - differ.stub!(:shell_out).and_raise('boom') - differ.diff(old_file, new_file) - end - - it "calling for_output should return the error message" do - expect(differ.for_output).to eql(["Could not determine diff. Error: boom"]) - end - - it "calling for_reporting should be nil" do - expect(differ.for_reporting).to be_nil - end - end - - describe "when shell_out returns stderr output" do - before do - @result = mock('result', :stdout => "", :stderr => "boom") - differ.stub!(:shell_out).and_return(@result) - differ.diff(old_file, new_file) - end - - it "calling for_output should return the error message" do - expect(differ.for_output).to eql(["Could not determine diff. Error: boom"]) - end - - it "calling for_reporting should be nil" do - expect(differ.for_reporting).to be_nil - end - end - describe "when checking if files are binary or text" do it "should identify zero-length files as text" do |