diff options
author | Valery Sizov <valery@gitlab.com> | 2017-05-30 23:38:06 +0300 |
---|---|---|
committer | Valery Sizov <valery@gitlab.com> | 2017-05-31 18:38:10 +0300 |
commit | 563c1ca01cf94e125a5d01669e6e8455da257246 (patch) | |
tree | fc2c4dd7f85aee83c5574be87a3387afba959da5 /spec | |
parent | 52a3d4372c6e45e4ffb792a9fe7bfca84f3573a3 (diff) |
Fix: A diff comment on a change at last line of a file shows as two comments in discussion
Diffstat (limited to 'spec')
-rw-r--r-- | spec/helpers/diff_helper_spec.rb | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/spec/helpers/diff_helper_spec.rb b/spec/helpers/diff_helper_spec.rb index dd6566d25bb..85093f799e9 100644 --- a/spec/helpers/diff_helper_spec.rb +++ b/spec/helpers/diff_helper_spec.rb @@ -129,6 +129,32 @@ describe DiffHelper do end end + describe '#parallel_diff_discussions' do + it 'does not put comments on nonewline lines' do + discussion = {'abc_3_3' => 'comment'} + helper.instance_variable_set(:@grouped_diff_discussions, discussion) + diff_file = double(line_code: 'abc_3_3') + left = Gitlab::Diff::Line.new('\\nonewline', 'old-nonewline', 3, 3, 3) + right = Gitlab::Diff::Line.new('\\nonewline', 'new-nonewline', 3, 3, 3) + + result = helper.parallel_diff_discussions(left, right, diff_file) + + expect(result).to eq([nil, nil]) + end + + it 'puts comments on added lines' do + discussion = {'abc_3_3' => 'comment'} + helper.instance_variable_set(:@grouped_diff_discussions, discussion) + diff_file = double(line_code: 'abc_3_3') + left = Gitlab::Diff::Line.new('\\nonewline', 'old-nonewline', 3, 3, 3) + right = Gitlab::Diff::Line.new('new line', 'add', 3, 3, 3) + + result = helper.parallel_diff_discussions(left, right, diff_file) + + expect(result).to eq([nil, 'comment']) + end + end + describe "#diff_match_line" do let(:old_pos) { 40 } let(:new_pos) { 50 } |