diff options
author | James Lopez <james@gitlab.com> | 2019-07-02 11:59:29 +0300 |
---|---|---|
committer | James Lopez <james@gitlab.com> | 2019-07-02 11:59:29 +0300 |
commit | 29b8830bf8ab7cfe37bc0f41066400509fff519f (patch) | |
tree | 37620eca2f221a0ac1b7f2026f5a6f09bf52fb18 /spec/lib/gitlab | |
parent | bc226cf083c5e2681763955ac1d825bb4542f7d6 (diff) | |
parent | 3d701a7ccc8380ef230357363069d9fb0f5fe574 (diff) |
Merge branch '58808-fix-image-diff-on-text' into 'master'
Don't show image diff note on text file
See merge request gitlab-org/gitlab-ce!30221
Diffstat (limited to 'spec/lib/gitlab')
-rw-r--r-- | spec/lib/gitlab/diff/lines_unfolder_spec.rb | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/spec/lib/gitlab/diff/lines_unfolder_spec.rb b/spec/lib/gitlab/diff/lines_unfolder_spec.rb index 8a470e12d04..3134ff3d817 100644 --- a/spec/lib/gitlab/diff/lines_unfolder_spec.rb +++ b/spec/lib/gitlab/diff/lines_unfolder_spec.rb @@ -842,4 +842,37 @@ describe Gitlab::Diff::LinesUnfolder do end end end + + context 'positioned on an image' do + let(:position) do + Gitlab::Diff::Position.new( + base_sha: '1c59dfa64afbea8c721bb09a06a9d326c952ea19', + start_sha: '1c59dfa64afbea8c721bb09a06a9d326c952ea19', + head_sha: '1487062132228de836236c522fe52fed4980a46c', + old_path: 'image.jpg', + new_path: 'image.jpg', + position_type: 'image' + ) + end + + before do + allow(old_blob).to receive(:binary?).and_return(binary?) + end + + context 'diff file is not text' do + let(:binary?) { true } + + it 'returns nil' do + expect(subject.unfolded_diff_lines).to be_nil + end + end + + context 'diff file is text' do + let(:binary?) { false } + + it 'returns nil' do + expect(subject.unfolded_diff_lines).to be_nil + end + end + end end |