diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-12-02 15:43:26 +0000 |
|---|---|---|
| committer | Alejandro Rodríguez <alejorro70@gmail.com> | 2016-12-02 13:37:22 -0300 |
| commit | 5c4306e78f5dfc0b9982d6ca35f1711e2d953442 (patch) | |
| tree | 5d223237f5d31f89e6c327b87964234f808ac06d /spec | |
| parent | f087b999a71eb0b48794b54cea26638bf128104f (diff) | |
| download | gitlab-ce-5c4306e78f5dfc0b9982d6ca35f1711e2d953442.tar.gz | |
Merge branch '25251-actionview-template-error-undefined-method-text-for-nil-nilclass' into 'master'
Fixes ActionView::Template::Error: undefined method `text?` for nil:NilClass
Closes #25251
See merge request !7893
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/lib/gitlab/diff/file_collection/merge_request_diff_spec.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/spec/lib/gitlab/diff/file_collection/merge_request_diff_spec.rb b/spec/lib/gitlab/diff/file_collection/merge_request_diff_spec.rb index c863a5f04cc..2a680f03476 100644 --- a/spec/lib/gitlab/diff/file_collection/merge_request_diff_spec.rb +++ b/spec/lib/gitlab/diff/file_collection/merge_request_diff_spec.rb @@ -10,4 +10,12 @@ describe Gitlab::Diff::FileCollection::MergeRequestDiff do described_class.new(merge_request.merge_request_diff, diff_options: nil).diff_files end + + it 'does not hightlight file if blob is not accessable' do + allow_any_instance_of(Gitlab::Diff::File).to receive(:blob).and_return(nil) + + expect_any_instance_of(Gitlab::Diff::File).not_to receive(:highlighted_diff_lines) + + described_class.new(merge_request.merge_request_diff, diff_options: nil).diff_files + end end |