diff --git a/spec/fixtures/ldiff/output.diff.chef2-u b/spec/fixtures/ldiff/output.diff.chef2-u new file mode 100644 index 0000000..ef025c7 --- /dev/null +++ b/spec/fixtures/ldiff/output.diff.chef2-u @@ -0,0 +1,16 @@ +--- spec/fixtures/old-chef2 2020-06-30 09:43:35.000000000 -0400 ++++ spec/fixtures/new-chef2 2020-06-30 09:44:32.000000000 -0400 +@@ -1,5 +1,4 @@ + recipe[a::default] +-recipe[b::default] + recipe[c::default] + recipe[d::default] + recipe[e::default] +@@ -12,3 +11,7 @@ + recipe[l::default] + recipe[m::default] + recipe[n::default] ++recipe[o::new] ++recipe[p::new] ++recipe[q::new] ++recipe[r::new] diff --git a/spec/fixtures/new-chef2 b/spec/fixtures/new-chef2 new file mode 100644 index 0000000..8213c73 --- /dev/null +++ b/spec/fixtures/new-chef2 @@ -0,0 +1,17 @@ +recipe[a::default] +recipe[c::default] +recipe[d::default] +recipe[e::default] +recipe[f::default] +recipe[g::default] +recipe[h::default] +recipe[i::default] +recipe[j::default] +recipe[k::default] +recipe[l::default] +recipe[m::default] +recipe[n::default] +recipe[o::new] +recipe[p::new] +recipe[q::new] +recipe[r::new] diff --git a/spec/fixtures/old-chef2 b/spec/fixtures/old-chef2 new file mode 100644 index 0000000..4a23407 --- /dev/null +++ b/spec/fixtures/old-chef2 @@ -0,0 +1,14 @@ +recipe[a::default] +recipe[b::default] +recipe[c::default] +recipe[d::default] +recipe[e::default] +recipe[f::default] +recipe[g::default] +recipe[h::default] +recipe[i::default] +recipe[j::default] +recipe[k::default] +recipe[l::default] +recipe[m::default] +recipe[n::default] diff --git a/spec/ldiff_spec.rb b/spec/ldiff_spec.rb index 2f4c235..2c5ae7b 100644 --- a/spec/ldiff_spec.rb +++ b/spec/ldiff_spec.rb @@ -11,10 +11,7 @@ let(:output_diff_f) { read_fixture('-f') } let(:output_diff_u) { read_fixture('-u') } let(:output_diff_chef) { read_fixture('-u', :base => 'output.diff.chef') } - - specify do - expect(run_ldiff('-u', :left => 'old-chef', :right => 'new-chef')).to eq(output_diff_chef) - end + let(:output_diff_chef2) { read_fixture('-u', :base => 'output.diff.chef2') } specify do expect(run_ldiff).to eq(output_diff) @@ -36,6 +33,14 @@ expect(run_ldiff('-u')).to eq(output_diff_u) end + specify do + expect(run_ldiff('-u', :left => 'old-chef', :right => 'new-chef')).to eq(output_diff_chef) + end + + specify do + expect(run_ldiff('-u', :left => 'old-chef2', :right => 'new-chef2')).to eq(output_diff_chef2) + end + def read_fixture(flag = nil, options = {}) base = options.fetch(:base, 'output.diff') name = "spec/fixtures/ldiff/#{base}#{flag}"