summaryrefslogtreecommitdiff
path: root/spec/lib
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-03-19 12:17:14 +0000
committerDouwe Maan <douwe@gitlab.com>2018-03-19 12:17:14 +0000
commit8b1facefb6540ede683bbbf5f1cd69c8d46ee009 (patch)
tree40c1f1529a121fe1fd8e10e18285e3f954f97319 /spec/lib
parent532dd0f819e649dccde753a673bbe3ef4507ff9c (diff)
parentbb226a294b12bc0430fe506bef5baea01a26de99 (diff)
downloadgitlab-ce-8b1facefb6540ede683bbbf5f1cd69c8d46ee009.tar.gz
Merge branch '44257-viewing-a-particular-commit-gives-500-error-error-undefined-method-binary' into 'master'
Resolve "Viewing a particular commit gives 500 error ~ Error (undefined method `binary?')" Closes #44257 See merge request gitlab-org/gitlab-ce!17805
Diffstat (limited to 'spec/lib')
-rw-r--r--spec/lib/gitlab/diff/file_spec.rb12
1 files changed, 12 insertions, 0 deletions
diff --git a/spec/lib/gitlab/diff/file_spec.rb b/spec/lib/gitlab/diff/file_spec.rb
index 9204ea37963..0c2e18c268a 100644
--- a/spec/lib/gitlab/diff/file_spec.rb
+++ b/spec/lib/gitlab/diff/file_spec.rb
@@ -455,5 +455,17 @@ describe Gitlab::Diff::File do
expect(diff_file.size).to be_zero
end
end
+
+ describe '#different_type?' do
+ it 'returns false' do
+ expect(diff_file).not_to be_different_type
+ end
+ end
+
+ describe '#content_changed?' do
+ it 'returns false' do
+ expect(diff_file).not_to be_content_changed
+ end
+ end
end
end