Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to diff-lcs 1.2.2 #239

Merged
merged 7 commits into from
Apr 12, 2013
Merged

Upgrade to diff-lcs 1.2.2 #239

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ba482a5
Fixes some weird travis failures noted on master and in #236
Apr 10, 2013
f2b15a3
force diff-lcs 122 and remove workaround
JonRowe Apr 11, 2013
ebf6b96
encoding diff now works thanks to diff-lcs 122
JonRowe Apr 11, 2013
1c6b10d
@samphippens workaround for no data being present changes the output …
JonRowe Apr 11, 2013
11cc974
pend specs with older versions of diff lcs
JonRowe Apr 11, 2013
e6c6a44
Revert "force diff-lcs 122 and remove workaround"
JonRowe Apr 11, 2013
2f9dea2
Update to diff-lcs 1.2.3 and remove workarounds.
JonRowe Apr 12, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions spec/rspec/expectations/differ_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,17 @@ module Expectations

end
if RUBY_VERSION.to_f > 1.9
it 'copes with encoded strings' do
pending "awaiting patch on diff-lcs"
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(<<-EOD.encode('UTF-16LE'))

@@ -1,2 +1,2 @@
-Tu avec carté {count} itém has
+Tu avec carte {count} item has
-Tu avec carte {count} item has
+Tu avec carté {count} itém has
EOD
end
it 'copes with encoded strings' do
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)'
Expand Down