Skip to content
This repository was archived by the owner on Nov 30, 2024. It is now read-only.

Commit a18b46d

Browse files
committed
Add helper to support other libraries expecting diffs
1 parent 1e818a1 commit a18b46d

File tree

3 files changed

+31
-10
lines changed

3 files changed

+31
-10
lines changed

lib/rspec/support/spec.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
require 'rspec/support/spec/in_sub_process'
33

44
RSpec::Support.require_rspec_support "spec/deprecation_helpers"
5+
RSpec::Support.require_rspec_support "spec/diff_helpers"
56
RSpec::Support.require_rspec_support "spec/with_isolated_stderr"
67
RSpec::Support.require_rspec_support "spec/stderr_splitter"
78
RSpec::Support.require_rspec_support "spec/formatting_support"
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
require 'diff/lcs'
2+
3+
module RSpec
4+
module Support
5+
module Spec
6+
module DiffHelpers
7+
# In the updated version of diff-lcs several diff headers change format slightly
8+
# compensate for this and change minimum version in RSpec 4
9+
if ::Diff::LCS::VERSION.to_f < 1.4
10+
def one_line_header(line_number=2)
11+
"-1,#{line_number} +1,#{line_number}"
12+
end
13+
14+
def removing_two_line_header
15+
"-1,3 +1"
16+
end
17+
else
18+
def one_line_header(_=2)
19+
"-1 +1"
20+
end
21+
22+
def removing_two_line_header
23+
"-1,3 +1,5"
24+
end
25+
end
26+
end
27+
end
28+
end
29+
end

spec/rspec/support/differ_spec.rb

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,7 @@
77
module RSpec
88
module Support
99
RSpec.describe Differ do
10-
11-
# In the updated version of diff-lcs several diff headers change format slightly
12-
# compensate for this and change minimum version in RSpec 4
13-
if Diff::LCS::VERSION.to_f < 1.4
14-
one_line_header = "-1,2 +1,2"
15-
removing_two_line_header = "-1,3 +1"
16-
else
17-
one_line_header = "-1 +1"
18-
removing_two_line_header = "-1,3 +1,5"
19-
end
10+
include Spec::DiffHelpers
2011

2112
describe '#diff' do
2213
let(:differ) { RSpec::Support::Differ.new }

0 commit comments

Comments
 (0)