Merge pull request #424 from rspec/fix-up-fix-diff-lcs-144

Restore diff for >= 1.4 < 1.4.4
rspec · Aug 29, 2020 · 8a705fc · 8a705fc
1 parent 4d1fd43
commit 8a705fc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -40,6 +40,8 @@ matrix:
       env: JRUBY_OPTS='--dev --1.8'
     - rvm: 2.7.1
       env: DIFF_LCS_VERSION="~> 1.3.0"
+    - rvm: 2.7.1
+      env: DIFF_LCS_VERSION="1.4.3"
   allow_failures:
     - rvm: jruby-head
     - rvm: ruby-head

diff --git a/spec/rspec/support/differ_spec.rb b/spec/rspec/support/differ_spec.rb
@@ -40,7 +40,7 @@ module Support
             expected_diff = dedent(<<-'EOD')
               |
               |
-              |@@ -1,6 +1,6 @@
+              |@@ -1,4 +1,6 @@
               | foo
               |-zap
               | bar
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,7 +40,7 @@ module Support @@
                 expected_diff = dedent(<<-'EOD')
                   |
                   |
-                  |@@ -1,6 +1,6 @@
+                  |@@ -1,4 +1,6 @@
                   | foo
                   |-zap
                   | bar
@@ Expand Down @@