Skip to content

Commit e70556c

Browse files
committed
Fixed the spec failures because of the diff-lcs bump
Signed-off-by: Ashique Saidalavi <Ashique.saidalavi@progress.com>
1 parent 4801826 commit e70556c

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

chef-cli.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Gem::Specification.new do |gem|
4747
gem.add_dependency "solve", "> 2.0", "< 5.0"
4848
gem.add_dependency "addressable", ">= 2.3.5", "< 2.9"
4949
gem.add_dependency "cookbook-omnifetch", "~> 0.5"
50-
gem.add_dependency "diff-lcs", "> 1.4.0", "< 2.0" # 1.4 breaks output. Newer verions of chef-client require diff-lcs ~> 1.6
50+
gem.add_dependency "diff-lcs", "~> 1.6" # Newer verions of chef-client require diff-lcs ~> 1.6
5151
gem.add_dependency "pastel", "~> 0.7" # used for policyfile differ
5252
gem.add_dependency "license-acceptance", ">= 1.0.11", "< 3"
5353
gem.add_dependency "chef-licensing", "~> 1.0"

spec/unit/policyfile/differ_spec.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ def output
325325
RUN LIST CHANGED
326326
================
327327
328-
@@ -1,5 +1,7 @@
328+
@@ -1,4 +1,6 @@
329329
recipe[java::default]
330330
recipe[jenkins::master]
331331
-recipe[policyfile_demo::whatever]
@@ -382,7 +382,7 @@ def output
382382
recipe[c::default]
383383
recipe[d::default]
384384
recipe[e::default]
385-
@@ -12,4 +11,8 @@
385+
@@ -12,3 +11,7 @@
386386
recipe[l::default]
387387
recipe[m::default]
388388
recipe[n::default]
@@ -438,7 +438,7 @@ def output
438438
apt
439439
---
440440
441-
@@ -1,12 +1 @@
441+
@@ -1,11 +0,0 @@
442442
-{
443443
- "version": "2.7.0",
444444
- "identifier": "16c57abbd056543f7d5a15dabbb03261024a9c5e",
@@ -511,7 +511,7 @@ def output
511511
bluepill
512512
--------
513513
514-
@@ -1,11 +1,22 @@
514+
@@ -0,0 +1,11 @@
515515
+{
516516
+ "version": "2.3.2",
517517
+ "identifier": "9c6990944d9a347dec8bd375e707ba0aecdc17cd",
@@ -623,7 +623,7 @@ def output
623623
DEFAULT ATTRIBUTES CHANGED
624624
==========================
625625
626-
@@ -1,4 +1,5 @@
626+
@@ -1,3 +1,4 @@
627627
{
628628
- "greeting": "Attributes, f*** yeah"
629629
+ "greeting": "Attributes, f*** yeah",
@@ -669,7 +669,7 @@ def output
669669
OVERRIDE ATTRIBUTES CHANGED
670670
===========================
671671
672-
@@ -1,4 +1,5 @@
672+
@@ -1,3 +1,4 @@
673673
{
674674
- "attr_only_updating": "use -a"
675675
+ "attr_only_updating": "use -a",

0 commit comments

Comments
 (0)