update dependency for higher version of Diff:LCS

lib/rspec/expectations/diff_presenter.rb

@@ -62,13 +62,7 @@ def add_to_output(output, string)
       end
 
       def add_old_hunk_to_hunk(hunk, oldhunk)
-        if hunk.respond_to?(:merge)
-          # diff-lcs 1.2.x
-          hunk.merge(oldhunk)
-        else
-          # diff-lcs 1.1.3
-          hunk.unshift(oldhunk)
-        end
+        hunk.merge(oldhunk)
       end
 
       def format

rspec-expectations.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
     # pin to major/minor ignoring patch
     s.add_runtime_dependency "rspec-support", "~> #{RSpec::Expectations::Version::STRING.split('.')[0..1].concat(['0']).join('.')}"
   end
-  s.add_runtime_dependency     'diff-lcs', '>= 1.1.3', '< 2.0'
+  s.add_runtime_dependency     'diff-lcs', '>= 1.2.0', '< 2.0'
 
   s.add_development_dependency 'rake',     '~> 10.0.0'
   s.add_development_dependency 'cucumber', '~> 1.1.9'

spec/rspec/expectations/diff_presenter_spec.rb

@@ -36,7 +36,7 @@ module Expectations
 
         end
         if RUBY_VERSION.to_f > 1.9
-          it 'copes with encoded strings', :pending => (Diff::LCS::VERSION < '1.2.2') do
+          it 'copes with encoded strings' do
             @expected="Tu avec carté {count} itém has".encode('UTF-16LE')
             @actual="Tu avec carte {count} item has".encode('UTF-16LE')
             expect(subject).to eql(<<-EOD.encode('UTF-16LE'))
@@ -47,12 +47,6 @@ module Expectations
 EOD
           end
 
-          it 'copes with encoded strings', :pending => (Diff::LCS::VERSION >= '1.2.2') do
-            @expected="Tu avec carté {count} itém has".encode('UTF-16LE')
-            @actual="Tu avec carte {count} item has".encode('UTF-16LE')
-            expect(subject).to eql 'Could not produce a diff because of the encoding of the string (UTF-16LE)'
-          end
-
           it 'handles differently encoded strings that are compatible' do
             @expected = "강인철".encode('UTF-8')
             @actual   = "abc".encode('us-ascii')